aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-11-29 01:13:48 +0000
committerJustin Clark-Casey (justincc)2014-11-29 01:13:48 +0000
commit79e37e5eccc8e356bde2d998e7da388d92d662d8 (patch)
treecede53ea7a9221365022d4a793544e49d0ed1de8 /OpenSim/Region/Physics
parentminor: Remove a few indenting problems introduced to recent 265fe349 and conv... (diff)
downloadopensim-SC_OLD-79e37e5eccc8e356bde2d998e7da388d92d662d8.zip
opensim-SC_OLD-79e37e5eccc8e356bde2d998e7da388d92d662d8.tar.gz
opensim-SC_OLD-79e37e5eccc8e356bde2d998e7da388d92d662d8.tar.bz2
opensim-SC_OLD-79e37e5eccc8e356bde2d998e7da388d92d662d8.tar.xz
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.
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs2
1 files changed, 1 insertions, 1 deletions
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
146 { 146 {
147 PhysScene.PE.RemoveObjectFromWorld(PhysScene.World, PhysBody); 147 PhysScene.PE.RemoveObjectFromWorld(PhysScene.World, PhysBody);
148 148
149 ZeroMotion(true);
150 ForcePosition = RawPosition; 149 ForcePosition = RawPosition;
151 150
152 // Set the velocity 151 // Set the velocity
@@ -269,6 +268,7 @@ public sealed class BSCharacter : BSPhysObject
269 // Called at taint time! 268 // Called at taint time!
270 public override void ZeroMotion(bool inTaintTime) 269 public override void ZeroMotion(bool inTaintTime)
271 { 270 {
271 RawVelocity = OMV.Vector3.Zero;
272 _acceleration = OMV.Vector3.Zero; 272 _acceleration = OMV.Vector3.Zero;
273 _rotationalVelocity = OMV.Vector3.Zero; 273 _rotationalVelocity = OMV.Vector3.Zero;
274 274