From 5f71ee57c44f277e9e78392c616509498459c027 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 25 Dec 2012 23:54:10 -0800
Subject: BulletSim: stop avatar from sliding VERY slowly after walking by only
 zeroing the movement motor in the UpdateProperties routine.

---
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Physics')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index bf0545a..9f0d5af 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -260,7 +260,6 @@ public sealed class BSCharacter : BSPhysObject
     public override void ZeroMotion(bool inTaintTime)
     {
         _velocity = OMV.Vector3.Zero;
-        _velocityMotor.Zero();
         _acceleration = OMV.Vector3.Zero;
         _rotationalVelocity = OMV.Vector3.Zero;
 
@@ -772,9 +771,9 @@ public sealed class BSCharacter : BSPhysObject
             //     the motor can be turned off. Set the velocity to zero so the zero motion is sent to the viewer.
             if (_velocityMotor.TargetValue.ApproxEquals(OMV.Vector3.Zero, 0.01f) && _velocityMotor.ErrorIsZero)
             {
-                _velocityMotor.Enabled = false;
-                stepVelocity = OMV.Vector3.Zero;
                 ZeroMotion(true);
+                stepVelocity = OMV.Vector3.Zero;
+                _velocityMotor.Enabled = false;
                 DetailLog("{0},BSCharacter.UpdateProperties,taint,disableVelocityMotor,m={1}", LocalID, _velocityMotor);
             }
 
-- 
cgit v1.1