1 files changed, 6 insertions, 0 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 8b00a33..99903f5 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -527,9 +527,15 @@ public sealed class BSPrim : BSPhysObject
 
                 // If an active vehicle, register the vehicle code to be called before each step
                 if (_vehicle.Type == Vehicle.TYPE_NONE)
+                {
                     UnRegisterPreStepAction("BSPrim.Vehicle", LocalID);
+                    PhysicsScene.AfterStep -= _vehicle.PostStep;
+                }
                 else
+                {
                     RegisterPreStepAction("BSPrim.Vehicle", LocalID, _vehicle.Step);
+                    PhysicsScene.AfterStep += _vehicle.PostStep;
+                }
             });
         }
     }