diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index ada81b5..96a3425 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3217,7 +3217,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3217 | // Event called by the physics plugin to tell the avatar about a collision. | 3217 | // Event called by the physics plugin to tell the avatar about a collision. |
3218 | private void PhysicsCollisionUpdate(EventArgs e) | 3218 | private void PhysicsCollisionUpdate(EventArgs e) |
3219 | { | 3219 | { |
3220 | if (e == null) | 3220 | if ((e == null) || m_invulnerable) |
3221 | return; | 3221 | return; |
3222 | CollisionEventUpdate collisionData = (CollisionEventUpdate)e; | 3222 | CollisionEventUpdate collisionData = (CollisionEventUpdate)e; |
3223 | Dictionary<uint, float> coldata = collisionData.m_objCollisionList; | 3223 | Dictionary<uint, float> coldata = collisionData.m_objCollisionList; |