diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 654f168..dc22017 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -137,6 +137,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
137 | internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; | 137 | internal ThreatLevel m_MaxThreatLevel = ThreatLevel.VeryLow; |
138 | internal float m_ScriptDelayFactor = 1.0f; | 138 | internal float m_ScriptDelayFactor = 1.0f; |
139 | internal float m_ScriptDistanceFactor = 1.0f; | 139 | internal float m_ScriptDistanceFactor = 1.0f; |
140 | internal bool m_debuggerSafe = false; | ||
140 | internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); | 141 | internal Dictionary<string, FunctionPerms > m_FunctionPerms = new Dictionary<string, FunctionPerms >(); |
141 | 142 | ||
142 | public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) | 143 | public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID) |
@@ -145,6 +146,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
145 | m_host = host; | 146 | m_host = host; |
146 | m_localID = localID; | 147 | m_localID = localID; |
147 | m_itemID = itemID; | 148 | m_itemID = itemID; |
149 | m_debuggerSafe = m_ScriptEngine.Config.GetBoolean("DebuggerSafe", false); | ||
148 | 150 | ||
149 | if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) | 151 | if (m_ScriptEngine.Config.GetBoolean("AllowOSFunctions", false)) |
150 | m_OSFunctionsEnabled = true; | 152 | m_OSFunctionsEnabled = true; |
@@ -203,7 +205,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
203 | 205 | ||
204 | internal void OSSLError(string msg) | 206 | internal void OSSLError(string msg) |
205 | { | 207 | { |
206 | throw new Exception("OSSL Runtime Error: " + msg); | 208 | if (m_debuggerSafe) |
209 | { | ||
210 | OSSLShoutError(msg); | ||
211 | } | ||
212 | else | ||
213 | { | ||
214 | throw new Exception("OSSL Runtime Error: " + msg); | ||
215 | } | ||
207 | } | 216 | } |
208 | 217 | ||
209 | private void InitLSL() | 218 | private void InitLSL() |
@@ -894,18 +903,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
894 | if (target != null) | 903 | if (target != null) |
895 | { | 904 | { |
896 | UUID animID=UUID.Zero; | 905 | UUID animID=UUID.Zero; |
897 | lock (m_host.TaskInventory) | 906 | m_host.TaskInventory.LockItemsForRead(true); |
907 | foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) | ||
898 | { | 908 | { |
899 | foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) | 909 | if (inv.Value.Name == animation) |
900 | { | 910 | { |
901 | if (inv.Value.Name == animation) | 911 | if (inv.Value.Type == (int)AssetType.Animation) |
902 | { | 912 | animID = inv.Value.AssetID; |
903 | if (inv.Value.Type == (int)AssetType.Animation) | 913 | continue; |
904 | animID = inv.Value.AssetID; | ||
905 | continue; | ||
906 | } | ||
907 | } | 914 | } |
908 | } | 915 | } |
916 | m_host.TaskInventory.LockItemsForRead(false); | ||
909 | if (animID == UUID.Zero) | 917 | if (animID == UUID.Zero) |
910 | target.Animator.AddAnimation(animation, m_host.UUID); | 918 | target.Animator.AddAnimation(animation, m_host.UUID); |
911 | else | 919 | else |
@@ -927,18 +935,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
927 | if (target != null) | 935 | if (target != null) |
928 | { | 936 | { |
929 | UUID animID = UUID.Zero; | 937 | UUID animID = UUID.Zero; |
930 | lock (m_host.TaskInventory) | 938 | m_host.TaskInventory.LockItemsForRead(true); |
939 | foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) | ||
931 | { | 940 | { |
932 | foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) | 941 | if (inv.Value.Name == animation) |
933 | { | 942 | { |
934 | if (inv.Value.Name == animation) | 943 | if (inv.Value.Type == (int)AssetType.Animation) |
935 | { | 944 | animID = inv.Value.AssetID; |
936 | if (inv.Value.Type == (int)AssetType.Animation) | 945 | continue; |
937 | animID = inv.Value.AssetID; | ||
938 | continue; | ||
939 | } | ||
940 | } | 946 | } |
941 | } | 947 | } |
948 | m_host.TaskInventory.LockItemsForRead(false); | ||
942 | 949 | ||
943 | if (animID == UUID.Zero) | 950 | if (animID == UUID.Zero) |
944 | target.Animator.RemoveAnimation(animation); | 951 | target.Animator.RemoveAnimation(animation); |
@@ -1895,6 +1902,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1895 | 1902 | ||
1896 | if (!UUID.TryParse(notecardNameOrUuid, out assetID)) | 1903 | if (!UUID.TryParse(notecardNameOrUuid, out assetID)) |
1897 | { | 1904 | { |
1905 | m_host.TaskInventory.LockItemsForRead(true); | ||
1898 | foreach (TaskInventoryItem item in m_host.TaskInventory.Values) | 1906 | foreach (TaskInventoryItem item in m_host.TaskInventory.Values) |
1899 | { | 1907 | { |
1900 | if (item.Type == 7 && item.Name == notecardNameOrUuid) | 1908 | if (item.Type == 7 && item.Name == notecardNameOrUuid) |
@@ -1902,6 +1910,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1902 | assetID = item.AssetID; | 1910 | assetID = item.AssetID; |
1903 | } | 1911 | } |
1904 | } | 1912 | } |
1913 | m_host.TaskInventory.LockItemsForRead(false); | ||
1905 | } | 1914 | } |
1906 | 1915 | ||
1907 | if (assetID == UUID.Zero) | 1916 | if (assetID == UUID.Zero) |
@@ -2225,8 +2234,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2225 | UUID x = module.CreateNPC(firstname, | 2234 | UUID x = module.CreateNPC(firstname, |
2226 | lastname, | 2235 | lastname, |
2227 | new Vector3((float) position.x, (float) position.y, (float) position.z), | 2236 | new Vector3((float) position.x, (float) position.y, (float) position.z), |
2228 | World, | 2237 | World,appearance); |
2229 | appearance); | ||
2230 | 2238 | ||
2231 | return new LSL_Key(x.ToString()); | 2239 | return new LSL_Key(x.ToString()); |
2232 | } | 2240 | } |