From b98613091cd6dc2f914fb5ab38ca33cdff21fc24 Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Thu, 27 Oct 2011 00:42:21 -0700
Subject: Added new ForEachRootScenePresence to Scene since almost every
 delegate passed to ForEachScenePresence checks for !IsChildAgent first. It
 consolidates child and root handling for coming refactors.

---
 OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'OpenSim/Region/RegionCombinerModule')

diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 4a24c7d..92cbbc6 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -711,10 +711,8 @@ namespace OpenSim.Region.RegionCombinerModule
 
             List<Vector3> CoarseLocations = new List<Vector3>();
             List<UUID> AvatarUUIDs = new List<UUID>();
-            connectiondata.RegionScene.ForEachScenePresence(delegate(ScenePresence sp)
+            connectiondata.RegionScene.ForEachRootScenePresence(delegate(ScenePresence sp)
             {
-                if (sp.IsChildAgent)
-                    return;
                 if (sp.UUID != presence.UUID)
                 {
                     if (sp.ParentID != 0)
-- 
cgit v1.1