Merge branch 'SledjChisl'

1 files changed, 9 insertions, 2 deletions

diff --git a/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs b/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs
index 8f8e2bd..7e95d7f 100644
--- a/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs
+++ b/OpenSim/Region/PhysicsModules/Ode/ODEDynamics.cs
@@ -44,10 +44,10 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using log4net;
 using OpenMetaverse;
-using Ode.NET;
 using OpenSim.Framework;
 using OpenSim.Region.PhysicsModules.SharedBase;
 
+
 namespace OpenSim.Region.PhysicsModule.ODE
 {
     public class ODEDynamics
@@ -607,6 +607,13 @@ namespace OpenSim.Region.PhysicsModule.ODE
             m_body = pBody;
         }
 
+        internal void Stop()
+        {
+            m_lastLinearVelocityVector = Vector3.Zero;
+            m_lastAngularVelocity = Vector3.Zero;
+            m_lastPositionVector = d.BodyGetPosition(Body);
+        }
+
         internal void Step(float pTimestep,  OdeScene pParentScene)
         {
             if (m_body == IntPtr.Zero || m_type == Vehicle.TYPE_NONE)
@@ -907,7 +914,7 @@ namespace OpenSim.Region.PhysicsModule.ODE
 
             // Sum velocities
             m_lastAngularVelocity = m_angularMotorVelocity + vertattr; // + bank + deflection
-            
+
             if ((m_flags & (VehicleFlag.NO_DEFLECTION_UP)) != 0)
             {
                 m_lastAngularVelocity.X = 0;