diff options
| author | Melanie | 2013-02-22 01:28:54 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-22 01:28:54 +0000 |
| commit | 9534d5f9296979b68550177a5201c2bdba84f14e (patch) | |
| tree | 1d39dee6d1eaed10b1146a9ee59a6deaa062bae2 /OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.zip opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.tar.gz opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.tar.bz2 opensim-SC-9534d5f9296979b68550177a5201c2bdba84f14e.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs index cc814d1..6d252ca 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSLinksetConstraints.cs | |||
| @@ -223,8 +223,8 @@ public sealed class BSLinksetConstraints : BSLinkset | |||
| 223 | constrain.SetAngularLimits(OMV.Vector3.Zero, OMV.Vector3.Zero); | 223 | constrain.SetAngularLimits(OMV.Vector3.Zero, OMV.Vector3.Zero); |
| 224 | 224 | ||
| 225 | // tweek the constraint to increase stability | 225 | // tweek the constraint to increase stability |
| 226 | constrain.UseFrameOffset(BSParam.BoolNumeric(BSParam.LinkConstraintUseFrameOffset)); | 226 | constrain.UseFrameOffset(BSParam.LinkConstraintUseFrameOffset); |
| 227 | constrain.TranslationalLimitMotor(BSParam.BoolNumeric(BSParam.LinkConstraintEnableTransMotor), | 227 | constrain.TranslationalLimitMotor(BSParam.LinkConstraintEnableTransMotor, |
| 228 | BSParam.LinkConstraintTransMotorMaxVel, | 228 | BSParam.LinkConstraintTransMotorMaxVel, |
| 229 | BSParam.LinkConstraintTransMotorMaxForce); | 229 | BSParam.LinkConstraintTransMotorMaxForce); |
| 230 | constrain.SetCFMAndERP(BSParam.LinkConstraintCFM, BSParam.LinkConstraintERP); | 230 | constrain.SetCFMAndERP(BSParam.LinkConstraintCFM, BSParam.LinkConstraintERP); |