Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>).

1 files changed, 21 insertions, 17 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index b040ca77..3ccbb3a 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5092,7 +5092,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Integer llGetRegionAgentCount()
         {
             m_host.AddScriptLPS(1);
-            return new LSL_Integer(World.GetAvatars().Count);
+            return new LSL_Integer(World.GetRootAgentCount());
         }
 
         public LSL_Vector llGetRegionCorner()
@@ -8771,17 +8771,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     landObject.SetMediaUrl(url);
 
                     // now send to all (non-child) agents
-                    List<ScenePresence> agents = World.GetAvatars();
-                    foreach (ScenePresence agent in agents)
+                    World.ForEachScenePresence(delegate(ScenePresence sp)
                     {
-                        agent.ControllingClient.SendParcelMediaUpdate(landData.MediaURL,
-                                                                      landData.MediaID,
-                                                                      landData.MediaAutoScale,
-                                                                      mediaType,
-                                                                      description,
-                                                                      width, height,
-                                                                      loop);
-                    }
+                        if (!sp.IsChildAgent)
+                        {
+                            sp.ControllingClient.SendParcelMediaUpdate(landData.MediaURL,
+                                                                          landData.MediaID,
+                                                                          landData.MediaAutoScale,
+                                                                          mediaType,
+                                                                          description,
+                                                                          width, height,
+                                                                          loop);
+                        }
+                    });
                 }
                 else if (!presence.IsChildAgent)
                 {
@@ -8802,13 +8804,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 if (presence == null)
                 {
                     // send to all (non-child) agents
-                    List<ScenePresence> agents = World.GetAvatars();
-                    foreach (ScenePresence agent in agents)
+                    World.ForEachScenePresence(delegate(ScenePresence sp)
                     {
-                        agent.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this?
-                                                                       (ParcelMediaCommandEnum)commandToSend,
-                                                                       time);
-                    }
+                        if (!sp.IsChildAgent)
+                        {
+                            sp.ControllingClient.SendParcelMediaCommand(0x4, // TODO what is this?
+                                                                           (ParcelMediaCommandEnum)commandToSend,
+                                                                           time);
+                        }
+                    });
                 }
                 else if (!presence.IsChildAgent)
                 {