diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 3996cdc..0352c64 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3417,7 +3417,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
3417 | // Event called by the physics plugin to tell the avatar about a collision. | 3417 | // Event called by the physics plugin to tell the avatar about a collision. |
3418 | private void PhysicsCollisionUpdate(EventArgs e) | 3418 | private void PhysicsCollisionUpdate(EventArgs e) |
3419 | { | 3419 | { |
3420 | if ((e == null) || m_invulnerable) | 3420 | if (e == null) |
3421 | return; | ||
3422 | |||
3423 | if (Velocity.X > 0 || Velocity.Y > 0) | ||
3424 | UpdateMovementAnimations(); | ||
3425 | |||
3426 | if (m_invulnerable) | ||
3421 | return; | 3427 | return; |
3422 | CollisionEventUpdate collisionData = (CollisionEventUpdate)e; | 3428 | CollisionEventUpdate collisionData = (CollisionEventUpdate)e; |
3423 | Dictionary<uint, float> coldata = collisionData.m_objCollisionList; | 3429 | Dictionary<uint, float> coldata = collisionData.m_objCollisionList; |
@@ -3455,8 +3461,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3455 | m_scene.EventManager.TriggerAvatarKill(killerObj, this); | 3461 | m_scene.EventManager.TriggerAvatarKill(killerObj, this); |
3456 | } | 3462 | } |
3457 | 3463 | ||
3458 | if (Velocity.X > 0 || Velocity.Y > 0) | 3464 | |
3459 | UpdateMovementAnimations(); | ||
3460 | } | 3465 | } |
3461 | 3466 | ||
3462 | public void setHealthWithUpdate(float health) | 3467 | public void setHealthWithUpdate(float health) |