From c5c079f6aa731ae6505299c11792f4d1d6ea3e88 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Sat, 7 Jan 2012 00:17:40 +0000
Subject: [PATCH] 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
---
 .../Scenes/Animation/ScenePresenceAnimator.cs       | 13 ++++++-------
 OpenSim/Region/Framework/Scenes/ScenePresence.cs    |  6 ++++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index eda085f47f..ff5f7318ce 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -223,7 +223,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                 m_animTickFall = 0;
                 m_animTickJump = 0;
                 m_jumping = false;
-                m_falling = true;
+                m_falling = false;
                 m_jumpVelocity = 0f;
                 actor.Selected = false;
                 m_fallHeight = actor.Position.Z;    // save latest flying height
@@ -238,10 +238,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                 }
                 else if (move.Z < 0f)
                 {
-                    if (actor != null && actor.IsColliding) 
-                    {
+                    if (actor != null && actor.IsColliding)
                         return "LAND";
-                }
                     else
                         return "HOVER_DOWN";
                 }
@@ -260,7 +258,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                 float fallElapsed = (float)(Environment.TickCount - m_animTickFall);
                 float fallVelocity = (actor != null) ? actor.Velocity.Z : 0.0f;
 
-                if (!m_jumping && (fallVelocity < -3.0f) ) m_falling = true;
+                if (!m_jumping && (fallVelocity < -3.0f))
+                    m_falling = true;
 
                 if (m_animTickFall == 0 || (fallVelocity >= 0.0f))
                 {
@@ -297,9 +296,9 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                 return "PREJUMP";
             }
 
-            if(m_jumping)
+            if (m_jumping)
             {
-                if ( (jumptime > (JUMP_PERIOD * 1.5f)) && actor.IsColliding)
+                if ((jumptime > (JUMP_PERIOD * 1.5f)) && actor.IsColliding)
                 {
                     // end jumping
                     m_jumping = false;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 42cd4be1e4..8ebb7a6bdc 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1274,8 +1274,8 @@ namespace OpenSim.Region.Framework.Scenes
         public void HandleAgentUpdate(IClientAPI remoteClient, AgentUpdateArgs agentData)
         {
 //            m_log.DebugFormat(
-//                "[SCENE PRESENCE]: In {0} received agent update from {1}",
-//                Scene.RegionInfo.RegionName, remoteClient.Name);
+//                "[SCENE PRESENCE]: In {0} received agent update from {1}, flags {2}",
+//                Scene.RegionInfo.RegionName, remoteClient.Name, agentData.ControlFlags);
 
             if (IsChildAgent)
             {
@@ -2312,6 +2312,8 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="vec">The vector in which to move.  This is relative to the rotation argument</param>
         public void AddNewMovement(Vector3 vec)
         {
+//            m_log.DebugFormat("[SCENE PRESENCE]: Adding new movement {0} for {1}", vec, Name);
+
             Vector3 direc = vec * Rotation;
             direc.Normalize();