Merge branch 'master' into bigmerge

2011-11-02 00:07:59 +00:00 · 2011-11-02 00:07:59 +00:00 · 9a8715ec9a
parent b69f679122 3bead3eb50
commit 9a8715ec9a
1 changed files with 7 additions and 10 deletions
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@ -83,8 +83,6 @@ namespace OpenSim.Region.Framework.Scenes
        public void SendPrimUpdates()
        {
            if (m_pendingObjects == null)
-            {
-                if (!m_presence.IsChildAgent)
            {
                m_pendingObjects = new Queue<SceneObjectGroup>();

@ -98,7 +96,6 @@ namespace OpenSim.Region.Framework.Scenes
                    }
                }
            }
-            }

            lock (m_pendingObjects)
            {