Merge branch 'avination' into careminster

Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

1 files changed, 35 insertions, 19 deletions

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
index 7848b35..2928257 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs
@@ -713,8 +713,18 @@ namespace OpenSim.Region.Physics.OdePlugin
 
                 if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact))
                     return;
-
-                count = d.CollidePtr(g1, g2, (contactsPerCollision & 0xffff), ContactgeomsArray, d.ContactGeom.unmanagedSizeOf);
+                if(d.GeomGetCategoryBits(g1) == (uint)CollisionCategories.VolumeDtc ||
+                    d.GeomGetCategoryBits(g1) == (uint)CollisionCategories.VolumeDtc)
+                {
+                    int cflags;
+                    unchecked
+                    {
+                        cflags = (int)(1 | d.CONTACTS_UNIMPORTANT);
+                    }
+                    count = d.CollidePtr(g1, g2, cflags, ContactgeomsArray, d.ContactGeom.unmanagedSizeOf);
+                }
+                else
+                    count = d.CollidePtr(g1, g2, (contactsPerCollision & 0xffff), ContactgeomsArray, d.ContactGeom.unmanagedSizeOf);
             }
             catch (SEHException)
             {
@@ -1161,6 +1171,8 @@ namespace OpenSim.Region.Physics.OdePlugin
             OdePrim cp1;
             OdeCharacter cc2;
             OdePrim cp2;
+            OdePrim cp1Parent;
+            OdePrim cp2Parent;
 
             uint obj2LocalID = 0;
             bool p1events = p1.SubscribedEvents();
@@ -1197,18 +1209,19 @@ namespace OpenSim.Region.Physics.OdePlugin
                         {
                         case ActorTypes.Agent:
                             cc2 = (OdeCharacter)p2;
-                            obj2LocalID = cc2.m_localID;
+                            obj2LocalID = cc2.LocalID;
                             if (p2events)
-                                cc2.AddCollisionEvent(cc1.m_localID, contact);
+                                cc2.AddCollisionEvent(cc1.LocalID, contact);
                             break;
 
                         case ActorTypes.Prim:
                             if (p2 is OdePrim)
                                 {
                                 cp2 = (OdePrim)p2;
-                                obj2LocalID = cp2.m_localID;
                                 if (p2events)
-                                    cp2.AddCollisionEvent(cc1.m_localID, contact);
+                                    cp2.AddCollisionEvent(cc1.LocalID, contact);
+                                cp2 = cp2.Parent;
+                                obj2LocalID = cp2.LocalID;
                                 }
                             break;
 
@@ -1230,17 +1243,16 @@ namespace OpenSim.Region.Physics.OdePlugin
                     if (p1 is OdePrim)
                         {
                         cp1 = (OdePrim)p1;
-
-                        // obj1LocalID = cp2.m_localID;
+                        cp1Parent = cp1.Parent;
                         switch ((ActorTypes)p2.PhysicsActorType)
                             {
                             case ActorTypes.Agent:
                                 if (p2 is OdeCharacter)
                                     {
                                     cc2 = (OdeCharacter)p2;
-                                    obj2LocalID = cc2.m_localID;
+                                    obj2LocalID = cc2.LocalID;
                                     if (p2events)
-                                        cc2.AddCollisionEvent(cp1.m_localID, contact);
+                                        cc2.AddCollisionEvent(cp1Parent.LocalID, contact);
                                     }
                                 break;
                             case ActorTypes.Prim:
@@ -1248,9 +1260,10 @@ namespace OpenSim.Region.Physics.OdePlugin
                                 if (p2 is OdePrim)
                                     {
                                     cp2 = (OdePrim)p2;
-                                    obj2LocalID = cp2.m_localID;
                                     if (p2events)
-                                        cp2.AddCollisionEvent(cp1.m_localID, contact);
+                                        cp2.AddCollisionEvent(cp1Parent.LocalID, contact);
+                                    cp2 = cp2.Parent;
+                                    obj2LocalID = cp2.LocalID;
                                     }
                                 break;
 
@@ -1276,7 +1289,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                                 if (p2 is OdeCharacter)
                                 {
                                     cc2 = (OdeCharacter)p2;
-                                    obj2LocalID = cc2.m_localID;
+                                    obj2LocalID = cc2.LocalID;
                                     if (p2events)
                                         cc2.AddCollisionEvent(0, contact);
                                 }
@@ -1285,7 +1298,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                                 if (p2 is OdePrim)
                                 {
                                     cp2 = (OdePrim)p2;
-                                    obj2LocalID = cp2.m_localID;
+                                    obj2LocalID = cp2.LocalID;
                                     if (p2events)
                                         cp2.AddCollisionEvent(0, contact);
                                 }
@@ -1340,8 +1353,11 @@ namespace OpenSim.Region.Physics.OdePlugin
                 {
                     foreach (OdePrim prm in _activegroups)
                     {
-                        if (d.BodyIsEnabled(prm.Body) && !prm.m_outbounds)
-                            d.SpaceCollide2(StaticSpace, prm.collide_geom, IntPtr.Zero, nearCallback);
+                        if (!prm.m_outbounds)
+                        {
+                            if (d.BodyIsEnabled(prm.Body))
+                                d.SpaceCollide2(StaticSpace, prm.collide_geom, IntPtr.Zero, nearCallback);
+                        }
                     }
                 }
                 catch (AccessViolationException)
@@ -1594,7 +1610,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             //Console.WriteLine("RemovePrimThreadLocked " +  prim.m_primName);
             lock (prim)
             {
-                RemoveCollisionEventReporting(prim);
+//                RemoveCollisionEventReporting(prim);
                 lock (_prims)
                     _prims.Remove(prim);
             }
@@ -2002,6 +2018,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                                 case ActorTypes.Prim:
                                     OdePrim pobj = (OdePrim)obj;
                                     if (pobj.Body == IntPtr.Zero || (d.BodyIsEnabled(pobj.Body) && !pobj.m_outbounds))
+                                    if (!pobj.m_outbounds)
                                     {
                                         pobj.AddCollisionFrameTime((int)(odetimestepMS));
                                         pobj.SendCollisions();
@@ -2718,7 +2735,6 @@ namespace OpenSim.Region.Physics.OdePlugin
                         WaterMapHandler.Free();
                 }
 
-
                 if (ContactgeomsArray != IntPtr.Zero)
                     Marshal.FreeHGlobal(ContactgeomsArray);
                 if (GlobalContactsArray != IntPtr.Zero)
@@ -2741,7 +2757,7 @@ namespace OpenSim.Region.Physics.OdePlugin
                 {
                     if (prm.CollisionScore > 0)
                     {
-                        returncolliders.Add(prm.m_localID, prm.CollisionScore);
+                        returncolliders.Add(prm.LocalID, prm.CollisionScore);
                         cnt++;
                         prm.CollisionScore = 0f;
                         if (cnt > 25)