Merge branch 'master' into careminster

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 3884a5d..192bcb5 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -126,9 +126,9 @@ public sealed class BSCharacter : BSPhysObject
         DetailLog("{0},BSCharacter.Destroy", LocalID);
         PhysicsScene.TaintedObject("BSCharacter.destroy", delegate()
         {
-            PhysicsScene.Shapes.DereferenceBody(PhysBody, true /* inTaintTime */, null /* bodyCallback */);
+            PhysicsScene.Shapes.DereferenceBody(PhysBody, null /* bodyCallback */);
             PhysBody.Clear();
-            PhysicsScene.Shapes.DereferenceShape(PhysShape, true /* inTaintTime */, null /* bodyCallback */);
+            PhysicsScene.Shapes.DereferenceShape(PhysShape, null /* bodyCallback */);
             PhysShape.Clear();
         });
     }
@@ -557,11 +557,12 @@ public sealed class BSCharacter : BSPhysObject
     {
         get
         {
-            return _velocityMotor.TargetValue;
+            return m_targetVelocity;
         }
         set
         {
             DetailLog("{0},BSCharacter.setTargetVelocity,call,vel={1}", LocalID, value);
+            m_targetVelocity = value;
             OMV.Vector3 targetVel = value;
             if (_setAlwaysRun)
                 targetVel *= BSParam.AvatarAlwaysRunFactor;
@@ -591,7 +592,6 @@ public sealed class BSCharacter : BSPhysObject
                 _velocityMotor.Reset();
                 _velocityMotor.SetCurrent(_velocity);
                 _velocityMotor.SetTarget(_velocity);
-                // Even though the motor is initialized, it's not used and the velocity goes straight into the avatar.
                 _velocityMotor.Enabled = false;
 
                 DetailLog("{0},BSCharacter.setVelocity,taint,vel={1}", LocalID, _velocity);