aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorUbitUmarov2014-09-21 23:02:02 +0100
committerUbitUmarov2014-09-21 23:02:02 +0100
commitf95bb533719bd80cfecb5f82e735230a0317bbc6 (patch)
tree38d39b75984e2783238d6c7242cbed42d980d41c /OpenSim/Region/ScriptEngine
parent protect getting the item (diff)
downloadopensim-SC-f95bb533719bd80cfecb5f82e735230a0317bbc6.zip
opensim-SC-f95bb533719bd80cfecb5f82e735230a0317bbc6.tar.gz
opensim-SC-f95bb533719bd80cfecb5f82e735230a0317bbc6.tar.bz2
opensim-SC-f95bb533719bd80cfecb5f82e735230a0317bbc6.tar.xz
remove LockItemsForRead(false) without previus call with true
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
2 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index ca682d3..eb6cf23 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5283,7 +5283,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5283 { 5283 {
5284 return item.AssetID.ToString(); 5284 return item.AssetID.ToString();
5285 } 5285 }
5286 m_host.TaskInventory.LockItemsForRead(false);
5287 5286
5288 return UUID.Zero.ToString(); 5287 return UUID.Zero.ToString();
5289 } 5288 }
@@ -10203,7 +10202,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
10203 case 4: 10202 case 4:
10204 return (int)item.NextPermissions; 10203 return (int)item.NextPermissions;
10205 } 10204 }
10206 m_host.TaskInventory.LockItemsForRead(false);
10207 10205
10208 return -1; 10206 return -1;
10209 } 10207 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 7081416..d2a5980 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -991,7 +991,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
991 else 991 else
992 animID = UUID.Zero; 992 animID = UUID.Zero;
993 } 993 }
994 m_host.TaskInventory.LockItemsForRead(false); 994
995 995
996 if (animID == UUID.Zero) 996 if (animID == UUID.Zero)
997 target.Animator.RemoveAnimation(animation); 997 target.Animator.RemoveAnimation(animation);