diff options
| author | Robert Adams | 2013-02-10 09:51:34 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-02-12 15:52:08 -0800 |
| commit | fb903ff49089d5fd7a56aa2401528c3e7cf1800c (patch) | |
| tree | 2e6e28f88e6b7711165a8a315e3796241c4a11d2 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
| parent | Extend TestJsonCreateStore() with a one key input and an input with raw numbe... (diff) | |
| download | opensim-SC-fb903ff49089d5fd7a56aa2401528c3e7cf1800c.zip opensim-SC-fb903ff49089d5fd7a56aa2401528c3e7cf1800c.tar.gz opensim-SC-fb903ff49089d5fd7a56aa2401528c3e7cf1800c.tar.bz2 opensim-SC-fb903ff49089d5fd7a56aa2401528c3e7cf1800c.tar.xz | |
BulletSim: More work on center-of-mass. Remove linksetinfo and rely on simulator to update info.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index cf7aa0f..a76f8b9 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
| @@ -442,7 +442,7 @@ public class BSPrim : BSPhysObject | |||
| 442 | RegisterPreStepAction("BSPrim.setForce", LocalID, | 442 | RegisterPreStepAction("BSPrim.setForce", LocalID, |
| 443 | delegate(float timeStep) | 443 | delegate(float timeStep) |
| 444 | { | 444 | { |
| 445 | if (!IsPhysicallyActive) | 445 | if (!IsPhysicallyActive || _force == OMV.Vector3.Zero) |
| 446 | { | 446 | { |
| 447 | UnRegisterPreStepAction("BSPrim.setForce", LocalID); | 447 | UnRegisterPreStepAction("BSPrim.setForce", LocalID); |
| 448 | return; | 448 | return; |
| @@ -647,7 +647,7 @@ public class BSPrim : BSPhysObject | |||
| 647 | RegisterPreStepAction("BSPrim.setTorque", LocalID, | 647 | RegisterPreStepAction("BSPrim.setTorque", LocalID, |
| 648 | delegate(float timeStep) | 648 | delegate(float timeStep) |
| 649 | { | 649 | { |
| 650 | if (!IsPhysicallyActive) | 650 | if (!IsPhysicallyActive || _torque == OMV.Vector3.Zero) |
| 651 | { | 651 | { |
| 652 | UnRegisterPreStepAction("BSPrim.setTorque", LocalID); | 652 | UnRegisterPreStepAction("BSPrim.setTorque", LocalID); |
| 653 | return; | 653 | return; |