diff options
author | Robert Adams | 2016-01-18 07:02:48 -0800 |
---|---|---|
committer | Robert Adams | 2016-01-18 07:02:48 -0800 |
commit | 35d4298be698d9eb02974a4210c5ace867b0db35 (patch) | |
tree | ad3cb41a236cfceaac1629eaec919b522205b00a /OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs | |
parent | BulletSim: revert avatar stationary testing for having slight velocity. (diff) | |
download | opensim-SC_OLD-35d4298be698d9eb02974a4210c5ace867b0db35.zip opensim-SC_OLD-35d4298be698d9eb02974a4210c5ace867b0db35.tar.gz opensim-SC_OLD-35d4298be698d9eb02974a4210c5ace867b0db35.tar.bz2 opensim-SC_OLD-35d4298be698d9eb02974a4210c5ace867b0db35.tar.xz |
BulletSim: change method signatures for internal AddForce methods to remove
confusion about push forces. The latter is an external, physics engine interface
feature (the force parameter has a different unit if pushing vs adding force)
and that distinction is not used internally.
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs')
-rwxr-xr-x | OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs index 3db8f2c..87cf972 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs | |||
@@ -211,7 +211,7 @@ public class BSActorMoveToTarget : BSActor | |||
211 | // Add enough force to overcome the mass of the object | 211 | // Add enough force to overcome the mass of the object |
212 | addedForce *= m_controllingPrim.Mass; | 212 | addedForce *= m_controllingPrim.Mass; |
213 | 213 | ||
214 | m_controllingPrim.AddForce(addedForce, false /* pushForce */, true /* inTaintTime */); | 214 | m_controllingPrim.AddForce(true /* inTaintTime */, addedForce); |
215 | } | 215 | } |
216 | m_physicsScene.DetailLog("{0},BSActorMoveToTarget.Mover3,move,fromPos={1},addedForce={2}", | 216 | m_physicsScene.DetailLog("{0},BSActorMoveToTarget.Mover3,move,fromPos={1},addedForce={2}", |
217 | m_controllingPrim.LocalID, origPosition, addedForce); | 217 | m_controllingPrim.LocalID, origPosition, addedForce); |