* Makes EntityManager IEnumerable - meaning we should be good to go to enable this.

1 files changed, 16 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/EntityManager.cs b/OpenSim/Region/Environment/Scenes/EntityManager.cs
index f515cba..43bf090 100644
--- a/OpenSim/Region/Environment/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityManager.cs
@@ -1,10 +1,11 @@
 using System;

+using System.Collections;

 using System.Collections.Generic;

 using OpenMetaverse;

 

 namespace OpenSim.Region.Environment.Scenes

 {

-    public class EntityManager

+    public class EntityManager : IEnumerable<EntityBase>

     {

         private readonly Dictionary<UUID,EntityBase> m_eb_uuid = new Dictionary<UUID, EntityBase>();

         private readonly Dictionary<uint, EntityBase> m_eb_localID = new Dictionary<uint, EntityBase>();

@@ -106,7 +107,6 @@ namespace OpenSim.Region.Environment.Scenes
             return tmp;

         }

 

-        [Obsolete("Please used indexed access to this instead. Indexes can be accessed via EntitiesManager[index]. LocalID and UUID are supported.")]

         public List<EntityBase> GetEntities()

         {

             lock (m_lock)

@@ -144,5 +144,19 @@ namespace OpenSim.Region.Environment.Scenes
                 InsertOrReplace(value);

             }

         }

+

+        /// <summary>

+        /// This could be optimised to work on the list 'live' rather than making a safe copy and iterating that.

+        /// </summary>

+        /// <returns></returns>

+        public IEnumerator<EntityBase> GetEnumerator()

+        {

+            return GetEntities().GetEnumerator();

+        }

+

+        IEnumerator IEnumerable.GetEnumerator()

+        {

+            return GetEnumerator();

+        }

     }

 }