aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneViewer.cs17
1 files 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
84 { 84 {
85 if (m_pendingObjects == null) 85 if (m_pendingObjects == null)
86 { 86 {
87 if (!m_presence.IsChildAgent) 87 m_pendingObjects = new Queue<SceneObjectGroup>();
88 {
89 m_pendingObjects = new Queue<SceneObjectGroup>();
90 88
91 lock (m_pendingObjects) 89 lock (m_pendingObjects)
90 {
91 EntityBase[] entities = m_presence.Scene.Entities.GetEntities();
92 foreach (EntityBase e in entities)
92 { 93 {
93 EntityBase[] entities = m_presence.Scene.Entities.GetEntities(); 94 if (e != null && e is SceneObjectGroup)
94 foreach (EntityBase e in entities) 95 m_pendingObjects.Enqueue((SceneObjectGroup)e);
95 {
96 if (e != null && e is SceneObjectGroup)
97 m_pendingObjects.Enqueue((SceneObjectGroup)e);
98 }
99 } 96 }
100 } 97 }
101 } 98 }