From 47829849d99e1ec6e11ac26e1f892cbaf94d5503 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Mon, 24 Nov 2008 14:45:05 +0000
Subject: * Swaps Scene.Entities Dictionary for EntityManager. * Important
 Changes: Scene.Entities is now IEnumerable directly. You do not need to use
 Entities.Values, you can Enumerate on .Entities directly. (So 'foreach
 Scene.Entities' vs 'foreach Scene.Entities.Values'). * Locks: Entities
 maintains it's own internal locking states. This means you do not need to
 lock entities anymore. I'll be going through and removing locks on it
 systematically.

---
 OpenSim/Region/Environment/Scenes/SceneGraph.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/SceneGraph.cs')

diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Environment/Scenes/SceneGraph.cs
index 05ad996..2c75867 100644
--- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneGraph.cs
@@ -59,7 +59,8 @@ namespace OpenSim.Region.Environment.Scenes
         protected internal Dictionary<UUID, ScenePresence> ScenePresences = new Dictionary<UUID, ScenePresence>();
         // SceneObjects is not currently populated or used.
         //public Dictionary<UUID, SceneObjectGroup> SceneObjects;
-        protected internal Dictionary<UUID, EntityBase> Entities = new Dictionary<UUID, EntityBase>();
+        protected internal EntityManager Entities = new EntityManager();
+//        protected internal Dictionary<UUID, EntityBase> Entities = new Dictionary<UUID, EntityBase>();
         protected internal Dictionary<UUID, ScenePresence> RestorePresences = new Dictionary<UUID, ScenePresence>();
 
         protected internal BasicQuadTreeNode QuadTree;
@@ -972,10 +973,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <returns></returns>
         protected internal List<EntityBase> GetEntities()
         {
-            lock (Entities)
-            {
-                return new List<EntityBase>(Entities.Values);
-            }
+            return Entities.GetEntities();
         }
 
         protected internal Dictionary<uint, float> GetTopScripts()
-- 
cgit v1.1