From 8e1ab33ed34524f6f64458c8389220be0804450f Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Thu, 16 Jul 2009 04:50:49 +0000
Subject: * 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)
---
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'OpenSim')
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
// Event called by the physics plugin to tell the avatar about a collision.
private void PhysicsCollisionUpdate(EventArgs e)
{
- if (e == null)
+ if ((e == null) || m_invulnerable)
return;
CollisionEventUpdate collisionData = (CollisionEventUpdate)e;
Dictionary<uint, float> coldata = collisionData.m_objCollisionList;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 9d60cca..e19d589 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -308,7 +308,7 @@ namespace OpenSim.Region.Physics.OdePlugin
}
if (m_wascolliding != m_iscolliding)
{
- base.SendCollisionUpdate(new CollisionEventUpdate());
+ //base.SendCollisionUpdate(new CollisionEventUpdate());
}
m_wascolliding = m_iscolliding;
}
@@ -362,7 +362,7 @@ namespace OpenSim.Region.Physics.OdePlugin
}
if (m_wascollidingGround != m_iscollidingGround)
{
- base.SendCollisionUpdate(new CollisionEventUpdate());
+ //base.SendCollisionUpdate(new CollisionEventUpdate());
}
m_wascollidingGround = m_iscollidingGround;
}
--
cgit v1.1