1 files changed, 8 insertions, 4 deletions

diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
index 0179240..6e6b44f 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
@@ -2296,11 +2296,15 @@ Console.WriteLine(" JointCreateFixed");
         public override bool IsPhysical
         {
             get { return m_isphysical; }
-            set { 
+            set 
+            { 
                   m_isphysical = value;
-                  if (!m_isphysical) // Zero the remembered last velocity
-                      m_lastVelocity = Vector3.Zero;
-                }
+                  if (!m_isphysical)
+                  {             // Zero the remembered last velocity
+                                m_lastVelocity = Vector3.Zero;
+                            if (m_vehicle.Type != Vehicle.TYPE_NONE) m_vehicle.Halt();
+                  }
+            }
         }
 
         public void setPrimForRemoval()