diff options
| author | UbitUmarov | 2014-09-30 00:13:52 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-09-30 00:13:52 +0100 |
| commit | 2af7205813b2171b5da92c4e17e9a575ac049087 (patch) | |
| tree | 5b6a64a7e94aa6cb557c4db8903307dd68bde909 /OpenSim/Region | |
| parent | remove check of other prim top height on steps climb code (diff) | |
| download | opensim-SC_OLD-2af7205813b2171b5da92c4e17e9a575ac049087.zip opensim-SC_OLD-2af7205813b2171b5da92c4e17e9a575ac049087.tar.gz opensim-SC_OLD-2af7205813b2171b5da92c4e17e9a575ac049087.tar.bz2 opensim-SC_OLD-2af7205813b2171b5da92c4e17e9a575ac049087.tar.xz | |
keep same animation if in transit
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index 6003e92..1017c1d 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
| @@ -282,6 +282,9 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
| 282 | const int JUMP_PERIOD = 800; | 282 | const int JUMP_PERIOD = 800; |
| 283 | #region Inputs | 283 | #region Inputs |
| 284 | 284 | ||
| 285 | if (m_scenePresence.IsInTransit) | ||
| 286 | return CurrentMovementAnimation; | ||
| 287 | |||
| 285 | if (m_scenePresence.SitGround) | 288 | if (m_scenePresence.SitGround) |
| 286 | { | 289 | { |
| 287 | currentControlState = motionControlStates.sitted; | 290 | currentControlState = motionControlStates.sitted; |