* Added smoother handling of interpenetrating physical objects.

* Fixes:
* -- duplicating Active physical object causes objects to explode in opposite directions
* -- Rezzing objects too close to you avatar causes avatar to shoot around in odd directions
* Vanity

1 files changed, 2 insertions, 2 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 04bf9a0..3bdf180 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -174,7 +174,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 }
                 if (m_wascolliding != m_iscolliding)
                 {
-                    base.SendCollisionUpdate(new CollisionEventUpdate());
+                    //base.SendCollisionUpdate(new CollisionEventUpdate());
                     
                 }
                 m_wascolliding = m_iscolliding;
@@ -527,7 +527,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 if (_velocity.Z < -6 && !m_hackSentFall)
                 {
                     m_hackSentFall = true;
-                    base.SendCollisionUpdate(new CollisionEventUpdate());
+                    //base.SendCollisionUpdate(new CollisionEventUpdate());
                     m_pidControllerActive = false;
                 }
                 else if (flying && !m_hackSentFly)