ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

change ossl link sound functions to search for sound both on script host and target prims

Browse Source
This commit is contained in:
UbitUmarov
2018-11-14 19:02:00 +00:00
parent afb1d6cdd7
commit fad6295398
2 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Region/Framework/Scenes/Scripting/ScriptUtils.cs
View File

@@ -93,15 +93,33 @@ namespace OpenSim.Region.Framework.Scenes.Scripting
public static UUID GetAssetIdFromKeyOrItemName(SceneObjectPart part, string identifier, AssetType type)
{
UUID key;
if (UUID.TryParse(identifier, out key))
return key;
if (!UUID.TryParse(identifier, out key))
TaskInventoryItem item = part.Inventory.GetInventoryItem(identifier);
if (item != null && item.Type == (int)type)
return item.AssetID;
return UUID.Zero;
}
public static UUID GetAssetIdFromKeyOrItemName(SceneObjectPart part, SceneObjectPart host, string identifier, AssetType type)
{
UUID key;
if (UUID.TryParse(identifier, out key))
return key;
TaskInventoryItem item = part.Inventory.GetInventoryItem(identifier);
if (item != null && item.Type == (int)type)
return item.AssetID;
if (part.LocalId != host.LocalId)
{
TaskInventoryItem item = part.Inventory.GetInventoryItem(identifier);
item = host.Inventory.GetInventoryItem(identifier);
if (item != null && item.Type == (int)type)
key = item.AssetID;
return item.AssetID;
}
return key;
return UUID.Zero;
}
}
}