ubOde a few changes to collisions reporting

1 files changed, 5 insertions, 8 deletions

diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
index 49020e9..cef7063 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
@@ -1578,6 +1578,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                 }
             }
             m_eventsubscription = 0;
+            _parent_scene.RemoveCollisionEventReporting(this);
         }
 
         public override void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
@@ -1591,8 +1592,11 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             }
         }
 
-        public void SendCollisions()
+        public void SendCollisions(int timestep)
         {
+            if (m_cureventsubscription < 50000)
+                m_cureventsubscription += timestep;
+
             if (CollisionEventsThisFrame == null)
                 return;
 
@@ -1623,13 +1627,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             }           
         }
 
-        internal void AddCollisionFrameTime(int t)
-        {
-            // protect it from overflow crashing
-            if (m_cureventsubscription < 50000)
-                m_cureventsubscription += t;
-        }
-
         public override bool SubscribedEvents()
         {
             if (m_eventsubscription > 0)