1 files changed, 30 insertions, 3 deletions

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;
                                 }
                             }