Merge branch 'master' into bigmerge

1 files changed, 7 insertions, 10 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index 092b76e..2c3084c 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);
                     }
                 }
             }