From add47befacb0397f2a0b5c9455ed1e658616aba4 Mon Sep 17 00:00:00 2001
From: Kitto Flora
Date: Fri, 19 Mar 2010 18:53:16 -0400
Subject: Update acceleration to 0 on no tphysical.

---
 OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics')

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()
-- 
cgit v1.1