From b41164b620c9de49baee933728807376838123c5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 13 Dec 2010 21:35:40 -0800
Subject: This seems to get rid of the stuck PREJUMP animation, as reported by
 Justin in -dev. Also in this commit, a slight adjustment to the Velocity of
 SP -- this makes the avie walking feel less jerky for me. Will wait reports
 from others.

---
 .../Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs   | 9 ++++++++-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs                 | 7 +++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index b8cdfc4..4865481 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -233,6 +233,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     // Falling long enough to trigger the animation
                     return "FALLDOWN";
                 }
+                else if (m_animTickJump == -1)
+                {
+                    m_animTickJump = 0; 
+                    return "STAND";
+                }
 
                 return m_movementAnimation;
             }
@@ -279,6 +284,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                     m_animTickJump = -1;
                     return "JUMP";
                 }
+                else
+                    return "JUMP";
             }
             else
             {
@@ -307,7 +314,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
 
             #endregion Ground Movement
 
-            return m_movementAnimation;
+            //return m_movementAnimation;
         }
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 30c9365..221f3bc 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3203,8 +3203,11 @@ namespace OpenSim.Region.Framework.Scenes
                 Vector3 force = m_forceToApply.Value;
 
                 m_updateflag = true;
-//                movementvector = force;
-                Velocity = force;
+
+                // The magic constant 0.855f seems to make walking feel less jerky,
+                // probably because it hackishly accounts for the overall latency of
+                // these Velocity updates -- Diva
+                Velocity = force * .855F;
 
                 m_forceToApply = null;
             }
-- 
cgit v1.1