aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2011-10-12 07:46:13 +0200
committerMelanie2011-10-12 07:46:13 +0200
commit1d379a9c7b59f95ccca1149fad6e5e0107040f6e (patch)
treeb612bf61a2c065af2288dd78801d879c770e866e /OpenSim/Region/Framework
parentMerge branch 'master' into bigmerge (diff)
downloadopensim-SC_OLD-1d379a9c7b59f95ccca1149fad6e5e0107040f6e.zip
opensim-SC_OLD-1d379a9c7b59f95ccca1149fad6e5e0107040f6e.tar.gz
opensim-SC_OLD-1d379a9c7b59f95ccca1149fad6e5e0107040f6e.tar.bz2
opensim-SC_OLD-1d379a9c7b59f95ccca1149fad6e5e0107040f6e.tar.xz
Make WALK animation state work again. TURNLEFT and TURNRIGHT are now rebroken
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs18
1 files changed, 6 insertions, 12 deletions
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");
404 else if (m_scenePresence.SetAlwaysRun) 404 else if (m_scenePresence.SetAlwaysRun)
405 return "RUN"; 405 return "RUN";
406 else 406 else
407 { 407 return "WALK";
408 // Not walking
409 if (move.Z < 0)
410 return "CROUCH";
411 else if (heldTurnLeft)
412 return "TURNLEFT";
413 else if (heldTurnRight)
414 return "TURNRIGHT";
415 else
416 return "WALK";
417 }
418 } 408 }
419// rm for jumping else 409// rm for jumping else
420 else if (!m_jumping) // add for jumping 410 else if (!m_jumping) // add for jumping
421 { 411 {
422 m_falling = false; // Add for falling 412 m_falling = false; // Add for falling
423 // Not walking 413 // Not walking
424 if (move.Z < 0f) 414 if (move.Z < 0)
425 return "CROUCH"; 415 return "CROUCH";
416 else if (heldTurnLeft)
417 return "TURNLEFT";
418 else if (heldTurnRight)
419 return "TURNRIGHT";
426 else 420 else
427 return "STAND"; 421 return "STAND";
428 } 422 }