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/Physics | |
| 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/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
| 308 | } | 308 | } |
| 309 | if (m_wascolliding != m_iscolliding) | 309 | if (m_wascolliding != m_iscolliding) |
| 310 | { | 310 | { |
| 311 | base.SendCollisionUpdate(new CollisionEventUpdate()); | 311 | //base.SendCollisionUpdate(new CollisionEventUpdate()); |
| 312 | } | 312 | } |
| 313 | m_wascolliding = m_iscolliding; | 313 | m_wascolliding = m_iscolliding; |
| 314 | } | 314 | } |
| @@ -362,7 +362,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 362 | } | 362 | } |
| 363 | if (m_wascollidingGround != m_iscollidingGround) | 363 | if (m_wascollidingGround != m_iscollidingGround) |
| 364 | { | 364 | { |
| 365 | base.SendCollisionUpdate(new CollisionEventUpdate()); | 365 | //base.SendCollisionUpdate(new CollisionEventUpdate()); |
| 366 | } | 366 | } |
| 367 | m_wascollidingGround = m_iscollidingGround; | 367 | m_wascollidingGround = m_iscollidingGround; |
| 368 | } | 368 | } |