Merge branch 'careminster' into careminster-presence-refactor

1 files changed, 3 insertions, 1 deletions

diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
index 5e6696e..e8894f7 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
@@ -804,6 +804,7 @@ namespace OpenSim.Region.Physics.OdePlugin
             if (m_isphysical && Body != IntPtr.Zero)
             {
                 d.BodyDisable(Body);
+                Halt();
             }
         }
 
@@ -2972,7 +2973,8 @@ Console.WriteLine(" JointCreateFixed");
                         m_wLinObjectVel = Vector3.Zero;
                         m_angularMotorDirection = Vector3.Zero;         
                         m_lastAngularVelocity = Vector3.Zero;
-                        m_angularMotorDVel = Vector3.Zero;      
+                        m_angularMotorDVel = Vector3.Zero;
+                        _acceleration = Vector3.Zero;   
                 }
                 
                 private void UpdateLinDecay()