1 files changed, 13 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 3b5a5bd..5beee73 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -403,11 +403,18 @@ namespace OpenSim.Region.Framework.Scenes.Animation
                 Falling = false;
                 // Walking / crouchwalking / running
                 if (move.Z < 0f)
+                {
                     return "CROUCHWALK";
-                else if (m_scenePresence.SetAlwaysRun)
-                    return "RUN";
-                else
-                    return "WALK";
+                }
+                // We need to prevent these animations if the user tries to make their avatar walk or run whilst
+                // specifying AGENT_CONTROL_STOP (pressing down space on viewers).
+                else if (!m_scenePresence.AgentControlStopActive)
+                {
+                    if (m_scenePresence.SetAlwaysRun)
+                        return "RUN";
+                    else
+                        return "WALK";
+                }
             }
             else if (!m_jumping)
             {
@@ -435,6 +442,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
         /// <returns>'true' if the animation was changed</returns>
         public bool UpdateMovementAnimations()
         {
+//            m_log.DebugFormat("[SCENE PRESENCE ANIMATOR]: Updating movement animations for {0}", m_scenePresence.Name);
+
             bool ret = false;
             lock (m_animations)
             {