From 79e37e5eccc8e356bde2d998e7da388d92d662d8 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 29 Nov 2014 01:13:48 +0000
Subject: Restore zero'ing RawVelocity in BSCharacter.ZeroMotion() in favour of
 not calling ZeroMotion in SetPhysicalProperties() at all

SetPhysicalProperties is only called when adding a new character so it looks like there is no existing data to reset anyway.
---
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index c7a821b..63b70e4 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -146,7 +146,6 @@ public sealed class BSCharacter : BSPhysObject
     {
         PhysScene.PE.RemoveObjectFromWorld(PhysScene.World, PhysBody);
 
-        ZeroMotion(true);
         ForcePosition = RawPosition;
 
         // Set the velocity
@@ -269,6 +268,7 @@ public sealed class BSCharacter : BSPhysObject
     // Called at taint time!
     public override void ZeroMotion(bool inTaintTime)
     {
+        RawVelocity = OMV.Vector3.Zero;
         _acceleration = OMV.Vector3.Zero;
         _rotationalVelocity = OMV.Vector3.Zero;
 
-- 
cgit v1.1