aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2012-01-16 23:08:47 +0000
committerMelanie2012-01-16 23:08:47 +0000
commitb14a6acd2f7d92a9a0d59b5e6e2ede2d73f5944b (patch)
tree1536dc38dbe3cd4d690cf02eb26d2ae191d1b903 /OpenSim/Region/Framework/Scenes
parentAdd methods to allow the groups modules to query online status and last login (diff)
parentComment out noisy log lines I accidentally included in the nant build target ... (diff)
downloadopensim-SC_OLD-b14a6acd2f7d92a9a0d59b5e6e2ede2d73f5944b.zip
opensim-SC_OLD-b14a6acd2f7d92a9a0d59b5e6e2ede2d73f5944b.tar.gz
opensim-SC_OLD-b14a6acd2f7d92a9a0d59b5e6e2ede2d73f5944b.tar.bz2
opensim-SC_OLD-b14a6acd2f7d92a9a0d59b5e6e2ede2d73f5944b.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 94989de..fdbcbb0 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1216,7 +1216,7 @@ namespace OpenSim.Region.Framework.Scenes
1216 m_callbackURI = null; 1216 m_callbackURI = null;
1217 } 1217 }
1218 1218
1219 //m_log.DebugFormat("[SCENE PRESENCE] Completed movement"); 1219// m_log.DebugFormat("[SCENE PRESENCE] Completed movement");
1220 1220
1221 ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); 1221 ControllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look);
1222 ValidateAndSendAppearanceAndAgentData(); 1222 ValidateAndSendAppearanceAndAgentData();