From 3bead3eb5070a94623ebb72037ad3b5feedaf659 Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Tue, 1 Nov 2011 17:11:43 -0700
Subject: Part 2 of see_into_this_sim_from_neighbor configuration option
 removal

---
 OpenSim/Region/Framework/Scenes/SceneViewer.cs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index ded90a3..d6bb81c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -84,18 +84,15 @@ namespace OpenSim.Region.Framework.Scenes
         {
             if (m_pendingObjects == null)
             {
-                if (!m_presence.IsChildAgent)
-                {
-                    m_pendingObjects = new Queue<SceneObjectGroup>();
+                m_pendingObjects = new Queue<SceneObjectGroup>();
 
-                    lock (m_pendingObjects)
+                lock (m_pendingObjects)
+                {
+                    EntityBase[] entities = m_presence.Scene.Entities.GetEntities();
+                    foreach (EntityBase e in entities)
                     {
-                        EntityBase[] entities = m_presence.Scene.Entities.GetEntities();
-                        foreach (EntityBase e in entities)
-                        {
-                            if (e != null && e is SceneObjectGroup)
-                                m_pendingObjects.Enqueue((SceneObjectGroup)e);
-                        }
+                        if (e != null && e is SceneObjectGroup)
+                            m_pendingObjects.Enqueue((SceneObjectGroup)e);
                     }
                 }
             }
-- 
cgit v1.1