aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-06-03 08:17:33 +0000
committerJustin Clarke Casey2008-06-03 08:17:33 +0000
commit512c0c67a625390c1010fed6bad1ebe9f9a13043 (patch)
treed5c7403fb7f1c84f67648fe184a109e0b29de351 /OpenSim/Region/Environment/Scenes
parent* Remove what should be unnecessary locking of GetScenePresences() (diff)
downloadopensim-SC_OLD-512c0c67a625390c1010fed6bad1ebe9f9a13043.zip
opensim-SC_OLD-512c0c67a625390c1010fed6bad1ebe9f9a13043.tar.gz
opensim-SC_OLD-512c0c67a625390c1010fed6bad1ebe9f9a13043.tar.bz2
opensim-SC_OLD-512c0c67a625390c1010fed6bad1ebe9f9a13043.tar.xz
* Remove what should be unnecessary locking in InnerScene.GetEntitites()
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs9
1 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index b6ba706..f96eafb 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -825,14 +825,7 @@ namespace OpenSim.Region.Environment.Scenes
825 /// <returns></returns> 825 /// <returns></returns>
826 protected internal List<EntityBase> GetEntities() 826 protected internal List<EntityBase> GetEntities()
827 { 827 {
828 List<EntityBase> result; 828 return new List<EntityBase>(Entities.Values);
829
830 lock (Entities)
831 {
832 result = new List<EntityBase>(Entities.Values);
833 }
834
835 return result;
836 } 829 }
837 830
838 protected internal Dictionary<uint, float> GetTopScripts() 831 protected internal Dictionary<uint, float> GetTopScripts()