OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

viewer-2-initial-appearance
Diva Canto 2011-01-17 17:40:48 -08:00
parent 37837850d3
commit c98d1cffe2
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -928,10 +928,6 @@ namespace OpenSim.Region.Framework.Scenes
//else //else
// m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid); // 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; m_isChildAgent = false;
// send the animations of the other presences to me // 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) if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0)
ControllingClient.SetChildAgentThrottle(cAgentData.Throttles); 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; //cAgentData.AVHeight;
m_rootRegionHandle = cAgentData.RegionHandle; m_rootRegionHandle = cAgentData.RegionHandle;
//m_velocity = cAgentData.Velocity; //m_velocity = cAgentData.Velocity;