1 files changed, 7 insertions, 1 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index b0e9a91..c27c420 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -743,6 +743,8 @@ namespace OpenSim.Region.Physics.OdePlugin
                         break;
                 }
             }
+            if (returnMass > _parent_scene.maximumMassObject)
+                returnMass = _parent_scene.maximumMassObject;
             return returnMass;
         }// end CalculateMass
 
@@ -753,6 +755,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             if (Body != (IntPtr) 0)
             {
                 float newmass = CalculateMass();
+
                 //m_log.Info("[PHYSICS]: New Mass: " + newmass.ToString());
 
                 d.MassSetBoxTotal(out pMass, newmass, _size.X, _size.Y, _size.Z);
@@ -2158,7 +2161,10 @@ Console.WriteLine(" JointCreateFixed");
                 // Re creates body on size.
                 // EnableBody also does setMass()
                 enableBody();
-                d.BodyEnable(Body);
+                if (Body != IntPtr.Zero)
+                {
+                    d.BodyEnable(Body);
+                }
             }
             _parent_scene.geom_name_map[prim_geom] = oldname;