diff options
| author | Teravus Ovares | 2009-07-16 04:50:49 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2009-07-16 04:50:49 +0000 |
| commit | 8e1ab33ed34524f6f64458c8389220be0804450f (patch) | |
| tree | f5b9f800eb2fd837934537db30574e2d9da04ed8 /OpenSim/Region/Framework/Scenes | |
| parent | There was possible a locking issue in revision 9951 so reverting that revisio... (diff) | |
| download | opensim-SC-8e1ab33ed34524f6f64458c8389220be0804450f.zip opensim-SC-8e1ab33ed34524f6f64458c8389220be0804450f.tar.gz opensim-SC-8e1ab33ed34524f6f64458c8389220be0804450f.tar.bz2 opensim-SC-8e1ab33ed34524f6f64458c8389220be0804450f.tar.xz | |
* Tweaking collision reporting a little more in ScenePresence to not check if the collisions will affect health if the avatar is invulnerable. (saves 3 loops)
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -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; |