diff options
| author | Kitto Flora | 2010-11-11 04:49:47 +0000 |
|---|---|---|
| committer | Kitto Flora | 2010-11-11 04:49:47 +0000 |
| commit | 9462a1861b3a10467370380d11cf2e82a91c4ab7 (patch) | |
| tree | 8097f1162c8ee9ba2df54b3a18e63c4a69e3ff78 /OpenSim/Region/Framework/Scenes/Animation | |
| parent | Remove "OpenSimulator" from startup message (diff) | |
| download | opensim-SC_OLD-9462a1861b3a10467370380d11cf2e82a91c4ab7.zip opensim-SC_OLD-9462a1861b3a10467370380d11cf2e82a91c4ab7.tar.gz opensim-SC_OLD-9462a1861b3a10467370380d11cf2e82a91c4ab7.tar.bz2 opensim-SC_OLD-9462a1861b3a10467370380d11cf2e82a91c4ab7.tar.xz | |
Fix excessive forward motion and flailing while descending a slope, prevent adding motion while falling from flying.
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 9658e11..9c103cb 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
| @@ -248,7 +248,7 @@ TrySetMovementAnimation("STAND"); | |||
| 248 | m_animTickFall = Environment.TickCount; | 248 | m_animTickFall = Environment.TickCount; |
| 249 | } | 249 | } |
| 250 | // else if (!jumping && fallElapsed > FALL_DELAY) | 250 | // else if (!jumping && fallElapsed > FALL_DELAY) |
| 251 | else if (!m_jumping && (fallElapsed > FALL_DELAY) && (fallVelocity < -3.0f) ) // add for falling and jumping | 251 | else if (!m_jumping && (fallElapsed > FALL_DELAY) && (fallVelocity < -3.0f) && (m_scenePresence.m_wasFlying)) // add for falling and jumping |
| 252 | { | 252 | { |
| 253 | // Falling long enough to trigger the animation | 253 | // Falling long enough to trigger the animation |
| 254 | //Console.WriteLine("FALLDOWN"); //## | 254 | //Console.WriteLine("FALLDOWN"); //## |