From 1d379a9c7b59f95ccca1149fad6e5e0107040f6e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 12 Oct 2011 07:46:13 +0200
Subject: Make WALK animation state work again. TURNLEFT and TURNRIGHT are now
 rebroken

---
 .../Scenes/Animation/ScenePresenceAnimator.cs          | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 904a657..f54b071 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -404,25 +404,19 @@ TrySetMovementAnimation("STAND");
                 else if (m_scenePresence.SetAlwaysRun)
                     return "RUN";
                 else
-                {
-                    // Not walking
-                    if (move.Z < 0)
-                        return "CROUCH";
-                    else if (heldTurnLeft)
-                        return "TURNLEFT";
-                    else if (heldTurnRight)
-                        return "TURNRIGHT";
-                    else
-                        return "WALK";
-                }
+                    return "WALK";
             }
 // rm for jumping            else
             else if (!m_jumping)    // add for jumping
             {
                 m_falling = false;      // Add for falling
                 // Not walking
-                if (move.Z < 0f)
+                if (move.Z < 0)
                     return "CROUCH";
+                else if (heldTurnLeft)
+                    return "TURNLEFT";
+                else if (heldTurnRight)
+                    return "TURNRIGHT";
                 else
                     return "STAND";
             }
-- 
cgit v1.1