diff options
| author | Diva Canto | 2010-12-11 17:06:17 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-12-11 17:06:17 -0800 |
| commit | 797ca8d0e787b20fdd0794f2017268f6e5b175e6 (patch) | |
| tree | fb528297ffdc57154775cca19b47b06bdbaae5b0 /OpenSim/Region/Framework/Scenes/Animation | |
| parent | Revert "Another stab at mantis #5256" (diff) | |
| download | opensim-SC_OLD-797ca8d0e787b20fdd0794f2017268f6e5b175e6.zip opensim-SC_OLD-797ca8d0e787b20fdd0794f2017268f6e5b175e6.tar.gz opensim-SC_OLD-797ca8d0e787b20fdd0794f2017268f6e5b175e6.tar.bz2 opensim-SC_OLD-797ca8d0e787b20fdd0794f2017268f6e5b175e6.tar.xz | |
Fixes the nudge movements!
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index a90e0f3..b8cdfc4 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
| @@ -316,16 +316,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
| 316 | public void UpdateMovementAnimations() | 316 | public void UpdateMovementAnimations() |
| 317 | { | 317 | { |
| 318 | m_movementAnimation = GetMovementAnimation(); | 318 | m_movementAnimation = GetMovementAnimation(); |
| 319 | 319 | TrySetMovementAnimation(m_movementAnimation); | |
| 320 | if (m_movementAnimation == "PREJUMP" && !m_scenePresence.Scene.m_usePreJump) | ||
| 321 | { | ||
| 322 | // This was the previous behavior before PREJUMP | ||
| 323 | TrySetMovementAnimation("JUMP"); | ||
| 324 | } | ||
| 325 | else | ||
| 326 | { | ||
| 327 | TrySetMovementAnimation(m_movementAnimation); | ||
| 328 | } | ||
| 329 | } | 320 | } |
| 330 | 321 | ||
| 331 | public UUID[] GetAnimationArray() | 322 | public UUID[] GetAnimationArray() |