diff options
| author | Justin Clark-Casey (justincc) | 2012-08-01 00:40:31 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-08-01 00:40:31 +0100 |
| commit | 69a5beeabca8471d84312a4f5e2e84f260a9f621 (patch) | |
| tree | 228607e819ef9ad1eccf43ba2d8a99415ad6fdc6 /OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | |
| parent | Look up the NPC module when the SensorRepeat class is created, rather than on... (diff) | |
| parent | BulletSim: fix problem where resizing a primary shape (cube or sphere) would ... (diff) | |
| download | opensim-SC-69a5beeabca8471d84312a4f5e2e84f260a9f621.zip opensim-SC-69a5beeabca8471d84312a4f5e2e84f260a9f621.tar.gz opensim-SC-69a5beeabca8471d84312a4f5e2e84f260a9f621.tar.bz2 opensim-SC-69a5beeabca8471d84312a4f5e2e84f260a9f621.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs index 07f5a21..ea3093a 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | |||
| @@ -86,7 +86,7 @@ public class BSConstraint : IDisposable | |||
| 86 | 86 | ||
| 87 | public bool SetCFMAndERP(float cfm, float erp) | 87 | public bool SetCFMAndERP(float cfm, float erp) |
| 88 | { | 88 | { |
| 89 | bool ret = false; | 89 | bool ret = true; |
| 90 | BulletSimAPI.SetConstraintParam2(m_constraint.Ptr, ConstraintParams.BT_CONSTRAINT_STOP_CFM, cfm, ConstraintParamAxis.AXIS_ALL); | 90 | BulletSimAPI.SetConstraintParam2(m_constraint.Ptr, ConstraintParams.BT_CONSTRAINT_STOP_CFM, cfm, ConstraintParamAxis.AXIS_ALL); |
| 91 | BulletSimAPI.SetConstraintParam2(m_constraint.Ptr, ConstraintParams.BT_CONSTRAINT_STOP_ERP, erp, ConstraintParamAxis.AXIS_ALL); | 91 | BulletSimAPI.SetConstraintParam2(m_constraint.Ptr, ConstraintParams.BT_CONSTRAINT_STOP_ERP, erp, ConstraintParamAxis.AXIS_ALL); |
| 92 | BulletSimAPI.SetConstraintParam2(m_constraint.Ptr, ConstraintParams.BT_CONSTRAINT_CFM, cfm, ConstraintParamAxis.AXIS_ALL); | 92 | BulletSimAPI.SetConstraintParam2(m_constraint.Ptr, ConstraintParams.BT_CONSTRAINT_CFM, cfm, ConstraintParamAxis.AXIS_ALL); |