2 files changed, 68 insertions, 11 deletions

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
index 87a7e51..5db4f17 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
@@ -194,8 +194,10 @@ namespace OpenSim.Region.Physics.OdePlugin
         public int givefakeori = 0;

         private Quaternion fakeori;

 

-        public int m_eventsubscription;

-        private CollisionEventUpdate CollisionEventsThisFrame = new CollisionEventUpdate();

+        private int m_eventsubscription;

+        private int m_cureventsubscription;

+        private CollisionEventUpdate CollisionEventsThisFrame = null;

+        private bool SentEmptyCollisionsEvent;

 

         public volatile bool childPrim;

 

@@ -931,12 +933,21 @@ namespace OpenSim.Region.Physics.OdePlugin
         public override void SubscribeEvents(int ms)

         {

             m_eventsubscription = ms;

+            m_cureventsubscription = 0;

+            if (CollisionEventsThisFrame == null)

+                CollisionEventsThisFrame = new CollisionEventUpdate();

+            SentEmptyCollisionsEvent = false;

             _parent_scene.AddCollisionEventReporting(this);

         }

 

         public override void UnSubscribeEvents()

         {

             _parent_scene.RemoveCollisionEventReporting(this);

+            if (CollisionEventsThisFrame != null)

+            {

+                CollisionEventsThisFrame.Clear();

+                CollisionEventsThisFrame = null;

+            }

             m_eventsubscription = 0;

         }

 

@@ -944,7 +955,6 @@ namespace OpenSim.Region.Physics.OdePlugin
         {

             if (CollisionEventsThisFrame == null)

                 CollisionEventsThisFrame = new CollisionEventUpdate();

-

             CollisionEventsThisFrame.AddCollider(CollidedWith, contact);

         }

 

@@ -953,14 +963,34 @@ namespace OpenSim.Region.Physics.OdePlugin
             if (CollisionEventsThisFrame == null)

                 return;

 

-            base.SendCollisionUpdate(CollisionEventsThisFrame);

+            if (m_cureventsubscription < m_eventsubscription)

+                return;

 

-            if (CollisionEventsThisFrame.m_objCollisionList.Count == 0)

-                CollisionEventsThisFrame = null;

-            else

-                CollisionEventsThisFrame = new CollisionEventUpdate();

+            m_cureventsubscription = 0;

+

+            int ncolisions = CollisionEventsThisFrame.m_objCollisionList.Count;

+

+            if (!SentEmptyCollisionsEvent || ncolisions > 0)

+            {

+                base.SendCollisionUpdate(CollisionEventsThisFrame);

+

+                if (ncolisions == 0)

+                    SentEmptyCollisionsEvent = true;

+                else

+                {

+                    SentEmptyCollisionsEvent = false;

+                    CollisionEventsThisFrame.Clear();

+                }

+            }           

         }

 

+        internal void AddCollisionFrameTime(int t)

+        {

+            // protect it from overflow crashing

+            if (m_cureventsubscription + t >= int.MaxValue)

+                m_cureventsubscription = 0;

+            m_cureventsubscription += t;

+        }

         public override bool SubscribedEvents()

         {

             if (m_eventsubscription > 0)

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index 7367719..ddfdea4 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -620,8 +620,6 @@ namespace OpenSim.Region.Physics.OdePlugin
             return d.JointCreateContactPtr(world, contactgroup, contact);
         }
 
-
-
         private bool GetCurContactGeom(int index, ref d.ContactGeom newcontactgeom)
         {
             if (ContactgeomsArray == IntPtr.Zero || index >= contactsPerCollision)
@@ -1153,6 +1151,31 @@ namespace OpenSim.Region.Physics.OdePlugin
                             }
                         }
                     break;
+                case ActorTypes.Ground:
+                case ActorTypes.Unknown:
+                default:
+                        switch ((ActorTypes)p2.PhysicsActorType)
+                        {
+                            case ActorTypes.Agent:
+                                if (p2 is OdeCharacter)
+                                {
+                                    cc2 = (OdeCharacter)p2;
+                                    obj2LocalID = cc2.m_localID;
+                                    if (p2events)
+                                        cc2.AddCollisionEvent(0, contact);
+                                }
+                                break;
+                            case ActorTypes.Prim:
+                                if (p2 is OdePrim)
+                                {
+                                    cp2 = (OdePrim)p2;
+                                    obj2LocalID = cp2.m_localID;
+                                    if (p2events)
+                                        cp2.AddCollisionEvent(0, contact);
+                                }
+                                break;
+                        }
+                        break;
                 }
             }
 
@@ -1875,7 +1898,11 @@ namespace OpenSim.Region.Physics.OdePlugin
 
                                     case ActorTypes.Prim:
                                         OdePrim pobj = (OdePrim)obj;
-                                        pobj.SendCollisions();
+                                        if (pobj.Body == IntPtr.Zero || (d.BodyIsEnabled(pobj.Body) && !pobj.m_outbounds))
+                                        {
+                                            pobj.AddCollisionFrameTime((int)(ODE_STEPSIZE * 1000.0f));
+                                            pobj.SendCollisions();
+                                        }
                                         break;
                                 }
                             }