diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs | |
parent | Add a build script. (diff) | |
download | opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to '')
-rwxr-xr-x[-rw-r--r--] | OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs b/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs index 3db8f2c..f2019ae 100644..100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSActorMoveToTarget.cs | |||
@@ -205,13 +205,13 @@ public class BSActorMoveToTarget : BSActor | |||
205 | addedForce = correctionVector / timeStep; | 205 | addedForce = correctionVector / timeStep; |
206 | // Remove the existing velocity (only the moveToTarget force counts) | 206 | // Remove the existing velocity (only the moveToTarget force counts) |
207 | addedForce -= m_controllingPrim.RawVelocity; | 207 | addedForce -= m_controllingPrim.RawVelocity; |
208 | // Overcome gravity. | 208 | // Overcome gravity. |
209 | addedForce -= m_controllingPrim.Gravity; | 209 | addedForce -= m_controllingPrim.Gravity; |
210 | 210 | ||
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); |