Merge branch 'avination' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

1 files changed, 9 insertions, 4 deletions

diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
index 5109a6a..9a40ab5 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
@@ -1621,12 +1621,13 @@ namespace OpenSim.Region.Physics.OdePlugin
 

             if (Body != IntPtr.Zero)

             {

-                d.BodyDestroy(Body);

-                Body = IntPtr.Zero;

+//                d.BodyDestroy(Body);

+//                Body = IntPtr.Zero;

+                // do a more complet destruction

+                DestroyBody();

                 m_log.Warn("[PHYSICS]: MakeBody called having a body");

             }

 

-

             if (d.GeomGetBody(prim_geom) != IntPtr.Zero)

             {

                 d.GeomSetBody(prim_geom, IntPtr.Zero);

@@ -3320,6 +3321,10 @@ namespace OpenSim.Region.Physics.OdePlugin
 

         protected void changeBuilding(bool newbuilding)

         {

+            // Check if we need to do anything

+            if (newbuilding == m_building)

+                return;

+

             if ((bool)newbuilding)

             {

                 m_building = true;

@@ -4066,4 +4071,4 @@ namespace OpenSim.Region.Physics.OdePlugin
             public Vector3 value;

         }

     }

-}
\ No newline at end of file
+}