aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorAdam Frisby2008-11-24 15:14:33 +0000
committerAdam Frisby2008-11-24 15:14:33 +0000
commit2a8ff937d513abbd84a96cbfdbe74bc710b60e6a (patch)
treede115ac9c9ebc6266d44f8de673a1fde6f1b9848 /OpenSim/Region/ScriptEngine
parent* Refactored a number of locks into EntityManager to limit the scope of the l... (diff)
downloadopensim-SC_OLD-2a8ff937d513abbd84a96cbfdbe74bc710b60e6a.zip
opensim-SC_OLD-2a8ff937d513abbd84a96cbfdbe74bc710b60e6a.tar.gz
opensim-SC_OLD-2a8ff937d513abbd84a96cbfdbe74bc710b60e6a.tar.bz2
opensim-SC_OLD-2a8ff937d513abbd84a96cbfdbe74bc710b60e6a.tar.xz
* Removed more locks on Entities
* Entities should now in theory be lock-free externally. * Other properties may cause blocking however[?]. * ScenePresence maintains separate locks so isn't fixed by this commit.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs5
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 7ccd71c..17dca98 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -788,10 +788,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
788 } 788 }
789 789
790 EntityBase SensedObject; 790 EntityBase SensedObject;
791 lock (World.Entities) 791 World.Entities.TryGetValue(objecUUID, out SensedObject);
792 {
793 World.Entities.TryGetValue(objecUUID, out SensedObject);
794 }
795 792
796 if (SensedObject == null) 793 if (SensedObject == null)
797 return String.Empty; 794 return String.Empty;