diff options
| author | Melanie | 2009-11-26 17:05:48 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-26 17:05:48 +0000 |
| commit | 41226dc99146d358861882f67bc6cfef5ec125e7 (patch) | |
| tree | 484c77cec655830e8cd85fad508289c25360eb7c /OpenSim/Region/Framework | |
| parent | Remove the old (Remoting) region crossing code. Fix the new code to (diff) | |
| parent | minor: reduce region ready logging verbosity (diff) | |
| download | opensim-SC_OLD-41226dc99146d358861882f67bc6cfef5ec125e7.zip opensim-SC_OLD-41226dc99146d358861882f67bc6cfef5ec125e7.tar.gz opensim-SC_OLD-41226dc99146d358861882f67bc6cfef5ec125e7.tar.bz2 opensim-SC_OLD-41226dc99146d358861882f67bc6cfef5ec125e7.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index 2e4c260..b37249d 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
| @@ -247,8 +247,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
| 247 | else if (m_movementAnimation == "LAND") | 247 | else if (m_movementAnimation == "LAND") |
| 248 | { | 248 | { |
| 249 | float landElapsed = (float)(Environment.TickCount - m_animTickFall) / 1000f; | 249 | float landElapsed = (float)(Environment.TickCount - m_animTickFall) / 1000f; |
| 250 | 250 | if ((m_animTickFall != 0) && (landElapsed <= FALL_DELAY)) | |
| 251 | if (landElapsed <= FALL_DELAY) | ||
| 252 | return "LAND"; | 251 | return "LAND"; |
| 253 | } | 252 | } |
| 254 | 253 | ||