diff options
| author | Melanie | 2013-04-02 23:47:19 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-02 23:47:19 +0100 |
| commit | 41a652f6bdf7c802859850c943b7a33fdd47fc23 (patch) | |
| tree | c5571f68e6c7113b2ec4a4397aedf91d9a6ef457 /OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Make SOP.UpdateOffset() more consistent by checking against the same o... (diff) | |
| download | opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.zip opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.gz opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.bz2 opensim-SC-41a652f6bdf7c802859850c943b7a33fdd47fc23.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to '')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs index b813974..42b5c49 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs | |||
| @@ -85,7 +85,9 @@ public abstract class BSConstraint : IDisposable | |||
| 85 | { | 85 | { |
| 86 | bool ret = false; | 86 | bool ret = false; |
| 87 | if (m_enabled) | 87 | if (m_enabled) |
| 88 | { | ||
| 88 | ret = PhysicsScene.PE.SetAngularLimits(m_constraint, low, high); | 89 | ret = PhysicsScene.PE.SetAngularLimits(m_constraint, low, high); |
| 90 | } | ||
| 89 | return ret; | 91 | return ret; |
| 90 | } | 92 | } |
| 91 | 93 | ||