Merge branch 'master' into careminster-presence-refactor

1 files changed, 29 insertions, 29 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1e530e1..5c54616 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2598,35 +2598,33 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos);
 
             List<Vector3> CoarseLocations = new List<Vector3>();
             List<UUID> AvatarUUIDs = new List<UUID>();
-            List<ScenePresence> avatars = m_scene.GetAvatars();
-            for (int i = 0; i < avatars.Count; i++)
+            m_scene.ForEachScenePresence(delegate(ScenePresence sp)
             {
-                // Requested by LibOMV.   Send Course Location on self.
-                //if (avatars[i] != this)
-                //{
-                    if (avatars[i].ParentID != 0)
+                if (sp.IsChildAgent)
+                    return;
+
+                if (sp.ParentID != 0)
+                {
+                    // sitting avatar
+                    SceneObjectPart sop = m_scene.GetSceneObjectPart(sp.ParentID);
+                    if (sop != null)
                     {
-                        // sitting avatar
-                        SceneObjectPart sop = m_scene.GetSceneObjectPart(avatars[i].ParentID);
-                        if (sop != null)
-                        {
-                            CoarseLocations.Add(sop.AbsolutePosition + avatars[i].m_pos);
-                            AvatarUUIDs.Add(avatars[i].UUID);
-                        }
-                        else
-                        {
-                            // we can't find the parent..  ! arg!
-                            CoarseLocations.Add(avatars[i].m_pos);
-                            AvatarUUIDs.Add(avatars[i].UUID);
-                        }
+                        CoarseLocations.Add(sop.AbsolutePosition + sp.m_pos);
+                        AvatarUUIDs.Add(sp.UUID);
                     }
                     else
                     {
-                        CoarseLocations.Add(avatars[i].m_pos);
-                        AvatarUUIDs.Add(avatars[i].UUID);
+                        // we can't find the parent..  ! arg!
+                        CoarseLocations.Add(sp.m_pos);
+                        AvatarUUIDs.Add(sp.UUID);
                     }
-                //}
-            }
+                }
+                else
+                {
+                    CoarseLocations.Add(sp.m_pos);
+                    AvatarUUIDs.Add(sp.UUID);
+                }
+            });
 
             m_controllingClient.SendCoarseLocationUpdate(AvatarUUIDs, CoarseLocations);
 
@@ -2700,13 +2698,15 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos);
             m_perfMonMS = Util.EnvironmentTickCount();
 
             // only send update from root agents to other clients; children are only "listening posts"
-            List<ScenePresence> avatars = m_scene.GetAvatars();
-            foreach (ScenePresence avatar in avatars)
+            int count = 0;
+            m_scene.ForEachScenePresence(delegate(ScenePresence sp)
             {
-                SendFullUpdateToOtherClient(avatar);
-
-            }
-            m_scene.StatsReporter.AddAgentUpdates(avatars.Count);
+                if (sp.IsChildAgent)
+                    return;
+                SendFullUpdateToOtherClient(sp);
+                ++count;
+            });
+            m_scene.StatsReporter.AddAgentUpdates(count);
             m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
 
             Animator.SendAnimPack();