aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-01-07 00:17:40 +0000
committerJustin Clark-Casey (justincc)2012-01-07 00:17:40 +0000
commitc5c079f6aa731ae6505299c11792f4d1d6ea3e88 (patch)
tree152ea0d7cfc5b4800ae675bb2ef0cf76de12a0ed /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentFix some syntax issues (diff)
downloadopensim-SC-c5c079f6aa731ae6505299c11792f4d1d6ea3e88.zip
opensim-SC-c5c079f6aa731ae6505299c11792f4d1d6ea3e88.tar.gz
opensim-SC-c5c079f6aa731ae6505299c11792f4d1d6ea3e88.tar.bz2
opensim-SC-c5c079f6aa731ae6505299c11792f4d1d6ea3e88.tar.xz
Fix bug where tapping home to stop falling would stop any avatar movement other than falling again.
Addresses http://opensimulator.org/mantis/view.php?id=5839
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 42cd4be..8ebb7a6 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1274,8 +1274,8 @@ namespace OpenSim.Region.Framework.Scenes
1274 public void HandleAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData) 1274 public void HandleAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
1275 { 1275 {
1276// m_log.DebugFormat( 1276// m_log.DebugFormat(
1277// "[SCENE PRESENCE]: In {0} received agent update from {1}", 1277// "[SCENE PRESENCE]: In {0} received agent update from {1}, flags {2}",
1278// Scene.RegionInfo.RegionName, remoteClient.Name); 1278// Scene.RegionInfo.RegionName, remoteClient.Name, agentData.ControlFlags);
1279 1279
1280 if (IsChildAgent) 1280 if (IsChildAgent)
1281 { 1281 {
@@ -2312,6 +2312,8 @@ namespace OpenSim.Region.Framework.Scenes
2312 /// <param name="vec">The vector in which to move. This is relative to the rotation argument</param> 2312 /// <param name="vec">The vector in which to move. This is relative to the rotation argument</param>
2313 public void AddNewMovement(Vector3 vec) 2313 public void AddNewMovement(Vector3 vec)
2314 { 2314 {
2315// m_log.DebugFormat("[SCENE PRESENCE]: Adding new movement {0} for {1}", vec, Name);
2316
2315 Vector3 direc = vec * Rotation; 2317 Vector3 direc = vec * Rotation;
2316 direc.Normalize(); 2318 direc.Normalize();
2317 2319