aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/EntityManager.cs
diff options
context:
space:
mode:
authorJohn Hurliman2010-09-10 12:41:36 -0700
committerJohn Hurliman2010-09-10 12:41:36 -0700
commitb597a295c489cef217b9dca6bd22df1340ca39ce (patch)
treedbd74bb48f962fb7b64cc67db6df890451859782 /OpenSim/Region/Framework/Scenes/EntityManager.cs
parentFirst pass at cleaning up thread safety in EntityManager and SceneGraph (diff)
downloadopensim-SC_OLD-b597a295c489cef217b9dca6bd22df1340ca39ce.zip
opensim-SC_OLD-b597a295c489cef217b9dca6bd22df1340ca39ce.tar.gz
opensim-SC_OLD-b597a295c489cef217b9dca6bd22df1340ca39ce.tar.bz2
opensim-SC_OLD-b597a295c489cef217b9dca6bd22df1340ca39ce.tar.xz
Second pass at cleaning up thread safety in EntityManager and SceneGraph
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EntityManager.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityManager.cs16
1 files changed, 1 insertions, 15 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs
index 85d0a4f..0defa93 100644
--- a/OpenSim/Region/Framework/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs
@@ -34,7 +34,7 @@ using OpenMetaverse;
34 34
35namespace OpenSim.Region.Framework.Scenes 35namespace OpenSim.Region.Framework.Scenes
36{ 36{
37 public class EntityManager //: IEnumerable<EntityBase> 37 public class EntityManager
38 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 private readonly DoubleDictionary<UUID, uint, EntityBase> m_entities = new DoubleDictionary<UUID, uint, EntityBase>(); 40 private readonly DoubleDictionary<UUID, uint, EntityBase> m_entities = new DoubleDictionary<UUID, uint, EntityBase>();
@@ -143,19 +143,5 @@ namespace OpenSim.Region.Framework.Scenes
143 { 143 {
144 return m_entities.TryGetValue(key, out obj); 144 return m_entities.TryGetValue(key, out obj);
145 } 145 }
146
147 /// <summary>
148 /// This could be optimised to work on the list 'live' rather than making a safe copy and iterating that.
149 /// </summary>
150 /// <returns></returns>
151 //public IEnumerator<EntityBase> GetEnumerator()
152 //{
153 // return GetEntities().GetEnumerator();
154 //}
155
156 //IEnumerator IEnumerable.GetEnumerator()
157 //{
158 // return GetEnumerator();
159 //}
160 } 146 }
161} 147}