diff options
| author | Melanie | 2011-11-05 21:53:05 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-05 21:53:05 +0000 |
| commit | 9c6025f928302b0242aa1887071e5e3f96bae90e (patch) | |
| tree | a6b9b1a6ca401cf9878f25d0f632c825df2b169c /OpenSim/Region/Framework/Scenes/Animation | |
| parent | Some more changes to catch up with core (diff) | |
| download | opensim-SC_OLD-9c6025f928302b0242aa1887071e5e3f96bae90e.zip opensim-SC_OLD-9c6025f928302b0242aa1887071e5e3f96bae90e.tar.gz opensim-SC_OLD-9c6025f928302b0242aa1887071e5e3f96bae90e.tar.bz2 opensim-SC_OLD-9c6025f928302b0242aa1887071e5e3f96bae90e.tar.xz | |
Adapt to the core SP rework
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index 175e8ed..cc96b24 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
| @@ -262,7 +262,7 @@ TrySetMovementAnimation("STAND"); | |||
| 262 | m_animTickFall = Environment.TickCount; | 262 | m_animTickFall = Environment.TickCount; |
| 263 | } | 263 | } |
| 264 | // else if (!jumping && fallElapsed > FALL_DELAY) | 264 | // else if (!jumping && fallElapsed > FALL_DELAY) |
| 265 | else if (!m_jumping && (fallElapsed > FALL_DELAY) && (fallVelocity < -3.0f) && (m_scenePresence.m_wasFlying)) // add for falling and jumping | 265 | else if (!m_jumping && (fallElapsed > FALL_DELAY) && (fallVelocity < -3.0f) && (m_scenePresence.WasFlying)) // add for falling and jumping |
| 266 | { | 266 | { |
| 267 | // Falling long enough to trigger the animation | 267 | // Falling long enough to trigger the animation |
| 268 | //Console.WriteLine("FALLDOWN"); //## | 268 | //Console.WriteLine("FALLDOWN"); //## |