still issues with volume detectors and sleeping bodies

1 files changed, 8 insertions, 6 deletions

diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
index 98bea09..f8ee6c0 100644
--- a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
+++ b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs
@@ -1210,14 +1210,17 @@ namespace OpenSim.Region.PhysicsModule.ubOde
             if (m_cureventsubscription < 50000)
                 m_cureventsubscription += timestep;
 
+            if(CollisionVDTCEventsThisFrame != null && CollisionVDTCEventsThisFrame.Count >0 && (Body == IntPtr.Zero || d.BodyIsEnabled(Body)))
+                CollisionVDTCEventsThisFrame.Clear();
+
+            if (m_cureventsubscription < m_eventsubscription)
+                return;
+
             if (CollisionEventsThisFrame == null)
                 return;
 
             int ncolisions = CollisionEventsThisFrame.m_objCollisionList.Count;
 
-            if (m_cureventsubscription < m_eventsubscription)
-                return;
-
             if (!SentEmptyCollisionsEvent || ncolisions > 0)
             {
                 base.SendCollisionUpdate(CollisionEventsThisFrame);
@@ -1234,8 +1237,6 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                     CollisionEventsThisFrame.Clear();
                 }
             }
-            if(CollisionVDTCEventsThisFrame != null && (Body == IntPtr.Zero || d.BodyIsEnabled(Body)))
-                CollisionVDTCEventsThisFrame.Clear();
         }
 
         public override bool SubscribedEvents()
@@ -2938,7 +2939,8 @@ namespace OpenSim.Region.PhysicsModule.ubOde
                     {
                         d.GeomSetPosition(prim_geom, newPos.X, newPos.Y, newPos.Z);
                         _position = newPos;
-                        m_bodyMoveCoolDown = -5;
+                        if (Body != IntPtr.Zero && !m_disabled)
+                            m_bodyMoveCoolDown = -5;
                     }
                     if (Body != IntPtr.Zero && !d.BodyIsEnabled(Body))
                     {