aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorDiva Canto2011-01-17 17:41:06 -0800
committerDiva Canto2011-01-17 17:41:06 -0800
commita07375a7ae187b57371a508300ffcacbabf5a4df (patch)
tree3ee2ea5ff91a65c6b96d185c1352d37e9c3dffa9 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentRemoved the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, bec... (diff)
parentforce objectId to UUID.Zero for non-overridden animations in AvatarAnimation ... (diff)
downloadopensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.zip
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.gz
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.bz2
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f811f3e..fa2c7b5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1104,7 +1104,7 @@ namespace OpenSim.Region.Framework.Scenes
1104 /// </summary> 1104 /// </summary>
1105 public void CompleteMovement(IClientAPI client) 1105 public void CompleteMovement(IClientAPI client)
1106 { 1106 {
1107 DateTime startTime = DateTime.Now; 1107// DateTime startTime = DateTime.Now;
1108 1108
1109 m_log.DebugFormat( 1109 m_log.DebugFormat(
1110 "[SCENE PRESENCE]: Completing movement of {0} into region {1}", 1110 "[SCENE PRESENCE]: Completing movement of {0} into region {1}",
@@ -1157,9 +1157,9 @@ namespace OpenSim.Region.Framework.Scenes
1157 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); 1157 friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
1158 } 1158 }
1159 1159
1160 m_log.DebugFormat( 1160// m_log.DebugFormat(
1161 "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 1161// "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms",
1162 client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); 1162// client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
1163 } 1163 }
1164 1164
1165 /// <summary> 1165 /// <summary>