diff options
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() |