From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 21:24:15 +1000 Subject: Dump OpenSim 0.9.0.1 into it's own branch. --- OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs') diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs old mode 100644 new mode 100755 index 3db8f2c..f2019ae --- a/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs @@ -205,13 +205,13 @@ public class BSActorMoveToTarget : BSActor addedForce = correctionVector / timeStep; // Remove the existing velocity (only the moveToTarget force counts) addedForce -= m_controllingPrim.RawVelocity; - // Overcome gravity. + // Overcome gravity. addedForce -= m_controllingPrim.Gravity; // Add enough force to overcome the mass of the object addedForce *= m_controllingPrim.Mass; - m_controllingPrim.AddForce(addedForce, false /* pushForce */, true /* inTaintTime */); + m_controllingPrim.AddForce(true /* inTaintTime */, addedForce); } m_physicsScene.DetailLog("{0},BSActorMoveToTarget.Mover3,move,fromPos={1},addedForce={2}", m_controllingPrim.LocalID, origPosition, addedForce); -- cgit v1.1