Part 2 of see_into_this_sim_from_neighbor configuration option removal

remove-scene-viewer
Dan Lake 2011-11-01 17:11:43 -07:00
parent 4b58d4ff95
commit 3bead3eb50
1 changed files with 7 additions and 10 deletions

View File

@ -84,18 +84,15 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (m_pendingObjects == null) 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(); if (e != null && e is SceneObjectGroup)
foreach (EntityBase e in entities) m_pendingObjects.Enqueue((SceneObjectGroup)e);
{
if (e != null && e is SceneObjectGroup)
m_pendingObjects.Enqueue((SceneObjectGroup)e);
}
} }
} }
} }