diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index b51d41b..c4b75bd 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -753,7 +753,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
753 | if (m_movementAnimationUpdateCounter >= 2) | 753 | if (m_movementAnimationUpdateCounter >= 2) |
754 | { | 754 | { |
755 | m_movementAnimationUpdateCounter = 0; | 755 | m_movementAnimationUpdateCounter = 0; |
756 | if (Animator != null) | 756 | if (Animator != null && ParentID == 0) // don't do it sitting |
757 | { | 757 | { |
758 | Animator.UpdateMovementAnimations(); | 758 | Animator.UpdateMovementAnimations(); |
759 | } | 759 | } |
@@ -1077,11 +1077,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1077 | public void TeleportWithMomentum(Vector3 pos) | 1077 | public void TeleportWithMomentum(Vector3 pos) |
1078 | { | 1078 | { |
1079 | bool isFlying = Flying; | 1079 | bool isFlying = Flying; |
1080 | Vector3 vel = Velocity; | ||
1080 | RemoveFromPhysicalScene(); | 1081 | RemoveFromPhysicalScene(); |
1081 | CheckLandingPoint(ref pos); | 1082 | CheckLandingPoint(ref pos); |
1082 | AbsolutePosition = pos; | 1083 | AbsolutePosition = pos; |
1083 | AddToPhysicalScene(isFlying); | 1084 | AddToPhysicalScene(isFlying); |
1084 | 1085 | Velocity = vel; | |
1085 | SendTerseUpdateToAllClients(); | 1086 | SendTerseUpdateToAllClients(); |
1086 | } | 1087 | } |
1087 | 1088 | ||