From 859bc717a4fe4cd5810ad9889cfb9b1e7f5c2046 Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Fri, 19 Mar 2010 05:51:16 -0700
Subject: 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>).

---
 .../RegionCombinerModule/RegionCombinerModule.cs   | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'OpenSim/Region/RegionCombinerModule')

diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 1a99c83..7a43537 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -707,36 +707,37 @@ namespace OpenSim.Region.RegionCombinerModule
                     return;
             }
 
-            List<ScenePresence> avatars = connectiondata.RegionScene.GetAvatars();
             List<Vector3> CoarseLocations = new List<Vector3>();
             List<UUID> AvatarUUIDs = new List<UUID>();
-            for (int i = 0; i < avatars.Count; i++)
+            connectiondata.RegionScene.ForEachScenePresence(delegate(ScenePresence sp)
             {
-                if (avatars[i].UUID != presence.UUID)
+                if (sp.IsChildAgent)
+                    return;
+                if (sp.UUID != presence.UUID)
                 {
-                    if (avatars[i].ParentID != 0)
+                    if (sp.ParentID != 0)
                     {
                         // sitting avatar
-                        SceneObjectPart sop = connectiondata.RegionScene.GetSceneObjectPart(avatars[i].ParentID);
+                        SceneObjectPart sop = connectiondata.RegionScene.GetSceneObjectPart(sp.ParentID);
                         if (sop != null)
                         {
-                            CoarseLocations.Add(sop.AbsolutePosition + avatars[i].AbsolutePosition);
-                            AvatarUUIDs.Add(avatars[i].UUID);
+                            CoarseLocations.Add(sop.AbsolutePosition + sp.AbsolutePosition);
+                            AvatarUUIDs.Add(sp.UUID);
                         }
                         else
                         {
                             // we can't find the parent..  ! arg!
-                            CoarseLocations.Add(avatars[i].AbsolutePosition);
-                            AvatarUUIDs.Add(avatars[i].UUID);
+                            CoarseLocations.Add(sp.AbsolutePosition);
+                            AvatarUUIDs.Add(sp.UUID);
                         }
                     }
                     else
                     {
-                        CoarseLocations.Add(avatars[i].AbsolutePosition);
-                        AvatarUUIDs.Add(avatars[i].UUID);
+                        CoarseLocations.Add(sp.AbsolutePosition);
+                        AvatarUUIDs.Add(sp.UUID);
                     }
                 }
-            }
+            });
             DistributeCourseLocationUpdates(CoarseLocations, AvatarUUIDs, connectiondata, presence);
         }
 
-- 
cgit v1.1