aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-10-10 01:16:34 -0400
committerTeravus Ovares (Dan Olivares)2009-10-10 01:16:34 -0400
commit798bce592f7c467bbfdf2be8820d626520f378dc (patch)
tree95b633352bffb3b8cc8525c8d44b897c8ae71023
parentSlight variation on the locking scheme: now locking always, except the ForEac... (diff)
downloadopensim-SC_OLD-798bce592f7c467bbfdf2be8820d626520f378dc.zip
opensim-SC_OLD-798bce592f7c467bbfdf2be8820d626520f378dc.tar.gz
opensim-SC_OLD-798bce592f7c467bbfdf2be8820d626520f378dc.tar.bz2
opensim-SC_OLD-798bce592f7c467bbfdf2be8820d626520f378dc.tar.xz
* Move the 'On Collision Update Movement Animation' routine to above the 'm_invulnerable' test. It doesn't fix anything but it should really be there anyway.
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs11
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)