aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs16
1 files changed, 4 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 927f78d..6a3983f 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1054,10 +1054,6 @@ namespace OpenSim.Region.Framework.Scenes
1054 //else 1054 //else
1055 // m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid); 1055 // m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid);
1056 1056
1057 // On the next prim update, all objects will be sent
1058 //
1059 m_sceneViewer.Reset();
1060
1061 m_isChildAgent = false; 1057 m_isChildAgent = false;
1062 1058
1063 // send the animations of the other presences to me 1059 // send the animations of the other presences to me
@@ -1241,7 +1237,7 @@ namespace OpenSim.Region.Framework.Scenes
1241 /// </summary> 1237 /// </summary>
1242 public void CompleteMovement(IClientAPI client) 1238 public void CompleteMovement(IClientAPI client)
1243 { 1239 {
1244 DateTime startTime = DateTime.Now; 1240// DateTime startTime = DateTime.Now;
1245 1241
1246 m_log.DebugFormat( 1242 m_log.DebugFormat(
1247 "[SCENE PRESENCE]: Completing movement of {0} into region {1}", 1243 "[SCENE PRESENCE]: Completing movement of {0} into region {1}",
@@ -1294,9 +1290,9 @@ namespace OpenSim.Region.Framework.Scenes
1294 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); 1290 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
1295 } 1291 }
1296 1292
1297 m_log.DebugFormat( 1293// m_log.DebugFormat(
1298 "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 1294// "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms",
1299 client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); 1295// client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
1300 } 1296 }
1301 1297
1302 /// <summary> 1298 /// <summary>
@@ -3311,10 +3307,6 @@ namespace OpenSim.Region.Framework.Scenes
3311 if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0) 3307 if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0)
3312 ControllingClient.SetChildAgentThrottle(cAgentData.Throttles); 3308 ControllingClient.SetChildAgentThrottle(cAgentData.Throttles);
3313 3309
3314 // Sends out the objects in the user's draw distance if m_sendTasksToChild is true.
3315 if (m_scene.m_seeIntoRegionFromNeighbor)
3316 m_sceneViewer.Reset();
3317
3318 //cAgentData.AVHeight; 3310 //cAgentData.AVHeight;
3319 m_rootRegionHandle = cAgentData.RegionHandle; 3311 m_rootRegionHandle = cAgentData.RegionHandle;
3320 //m_velocity = cAgentData.Velocity; 3312 //m_velocity = cAgentData.Velocity;