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/BSActorSetTorque.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/BSActorSetTorque.cs')
-rwxr-xr-x | OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs index a1cf4db..0261bcb 100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSActorSetTorque.cs | |||
@@ -127,7 +127,7 @@ public class BSActorSetTorque : BSActor | |||
127 | m_physicsScene.DetailLog("{0},BSActorSetTorque,preStep,force={1}", m_controllingPrim.LocalID, m_controllingPrim.RawTorque); | 127 | m_physicsScene.DetailLog("{0},BSActorSetTorque,preStep,force={1}", m_controllingPrim.LocalID, m_controllingPrim.RawTorque); |
128 | if (m_controllingPrim.PhysBody.HasPhysicalBody) | 128 | if (m_controllingPrim.PhysBody.HasPhysicalBody) |
129 | { | 129 | { |
130 | m_controllingPrim.AddAngularForce(m_controllingPrim.RawTorque, false, true); | 130 | m_controllingPrim.AddAngularForce(true /* inTaintTime */, m_controllingPrim.RawTorque); |
131 | m_controllingPrim.ActivateIfPhysical(false); | 131 | m_controllingPrim.ActivateIfPhysical(false); |
132 | } | 132 | } |
133 | 133 | ||