From c98d1cffe222085378ef8a9935f956882eae4ee9 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 17 Jan 2011 17:40:48 -0800
Subject: Removed the call to sceneViewer.Reset upon MakeRoot and
 ChildAgentUpdate, because Reset hangs for a long time waiting for the lock.
 That is a problem in itself -- that long holding of the lock by some thread
 -- but let's just avoid it altogether.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 3a40196..f811f3e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -928,10 +928,6 @@ namespace OpenSim.Region.Framework.Scenes
             //else
             //    m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid);
             
-            // On the next prim update, all objects will be sent
-            //
-            m_sceneViewer.Reset();
-
             m_isChildAgent = false;
 
             // send the animations of the other presences to me
@@ -2952,10 +2948,6 @@ namespace OpenSim.Region.Framework.Scenes
             if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0)
                 ControllingClient.SetChildAgentThrottle(cAgentData.Throttles);
 
-            // Sends out the objects in the user's draw distance if m_sendTasksToChild is true.
-            if (m_scene.m_seeIntoRegionFromNeighbor)
-                m_sceneViewer.Reset();
-
             //cAgentData.AVHeight;
             m_rootRegionHandle = cAgentData.RegionHandle;
             //m_velocity = cAgentData.Velocity;
-- 
cgit v1.1