diff options
author | Robert Adams | 2013-06-30 13:39:58 -0700 |
---|---|---|
committer | Robert Adams | 2013-06-30 17:07:49 -0700 |
commit | 23516717e48095011c1c06d64785ef7d91754ff2 (patch) | |
tree | 706e3cb958e94d0989d2546ef07a463dc7858ff9 /OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |
parent | BulletSim: add inTaintTime parameter to collision cache clear function. (diff) | |
download | opensim-SC_OLD-23516717e48095011c1c06d64785ef7d91754ff2.zip opensim-SC_OLD-23516717e48095011c1c06d64785ef7d91754ff2.tar.gz opensim-SC_OLD-23516717e48095011c1c06d64785ef7d91754ff2.tar.bz2 opensim-SC_OLD-23516717e48095011c1c06d64785ef7d91754ff2.tar.xz |
BulletSim: a better version of llMoveToTarget that doesn't go crazy.
There is still some overshoot but mostly fixes Mantis 6693.
Fix bug where moveToTarget was active for non-physical objects
and while selected.
Fix bug where move target was not getting changed if the script
changed the target during a move.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs index 48f842e..5ef6992 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | |||
@@ -626,7 +626,7 @@ public sealed class BSCharacter : BSPhysObject | |||
626 | OMV.Vector3 addForce = force / PhysScene.LastTimeStep; | 626 | OMV.Vector3 addForce = force / PhysScene.LastTimeStep; |
627 | AddForce(addForce, pushforce, false); | 627 | AddForce(addForce, pushforce, false); |
628 | } | 628 | } |
629 | private void AddForce(OMV.Vector3 force, bool pushforce, bool inTaintTime) { | 629 | public override void AddForce(OMV.Vector3 force, bool pushforce, bool inTaintTime) { |
630 | if (force.IsFinite()) | 630 | if (force.IsFinite()) |
631 | { | 631 | { |
632 | OMV.Vector3 addForce = Util.ClampV(force, BSParam.MaxAddForceMagnitude); | 632 | OMV.Vector3 addForce = Util.ClampV(force, BSParam.MaxAddForceMagnitude); |