aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2011-01-17 17:40:48 -0800
committerDiva Canto2011-01-17 17:40:48 -0800
commitc98d1cffe222085378ef8a9935f956882eae4ee9 (patch)
tree13bf35b719a5991846ee5c7f9854b5b5c67b79a0 /OpenSim
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-c98d1cffe222085378ef8a9935f956882eae4ee9.zip
opensim-SC_OLD-c98d1cffe222085378ef8a9935f956882eae4ee9.tar.gz
opensim-SC_OLD-c98d1cffe222085378ef8a9935f956882eae4ee9.tar.bz2
opensim-SC_OLD-c98d1cffe222085378ef8a9935f956882eae4ee9.tar.xz
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.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
1 files changed, 0 insertions, 8 deletions
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
928 //else 928 //else
929 // m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid); 929 // m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid);
930 930
931 // On the next prim update, all objects will be sent
932 //
933 m_sceneViewer.Reset();
934
935 m_isChildAgent = false; 931 m_isChildAgent = false;
936 932
937 // send the animations of the other presences to me 933 // send the animations of the other presences to me
@@ -2952,10 +2948,6 @@ namespace OpenSim.Region.Framework.Scenes
2952 if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0) 2948 if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0)
2953 ControllingClient.SetChildAgentThrottle(cAgentData.Throttles); 2949 ControllingClient.SetChildAgentThrottle(cAgentData.Throttles);
2954 2950
2955 // Sends out the objects in the user's draw distance if m_sendTasksToChild is true.
2956 if (m_scene.m_seeIntoRegionFromNeighbor)
2957 m_sceneViewer.Reset();
2958
2959 //cAgentData.AVHeight; 2951 //cAgentData.AVHeight;
2960 m_rootRegionHandle = cAgentData.RegionHandle; 2952 m_rootRegionHandle = cAgentData.RegionHandle;
2961 //m_velocity = cAgentData.Velocity; 2953 //m_velocity = cAgentData.Velocity;