diff options
| author | Diva Canto | 2013-05-06 09:18:17 -0700 |
|---|---|---|
| committer | Diva Canto | 2013-05-06 09:18:17 -0700 |
| commit | a81ddf3d7097a2e0959080ae7291357435b0bd5b (patch) | |
| tree | 688ceb63aa41d8eb9d3af27bd57d39cbd38ca250 /OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs | |
| parent | Minor reordering of operations on NewUserConnection. The agent circuit needs ... (diff) | |
| parent | Merge branch 'master' into bulletsim4 (diff) | |
| download | opensim-SC-a81ddf3d7097a2e0959080ae7291357435b0bd5b.zip opensim-SC-a81ddf3d7097a2e0959080ae7291357435b0bd5b.tar.gz opensim-SC-a81ddf3d7097a2e0959080ae7291357435b0bd5b.tar.bz2 opensim-SC-a81ddf3d7097a2e0959080ae7291357435b0bd5b.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs index 7714a03..ed89f63 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs | |||
| @@ -45,7 +45,7 @@ public sealed class BSConstraintHinge : BSConstraint | |||
| 45 | m_body1 = obj1; | 45 | m_body1 = obj1; |
| 46 | m_body2 = obj2; | 46 | m_body2 = obj2; |
| 47 | m_constraint = PhysicsScene.PE.CreateHingeConstraint(world, obj1, obj2, | 47 | m_constraint = PhysicsScene.PE.CreateHingeConstraint(world, obj1, obj2, |
| 48 | pivotInA, pivotInB, axisInA, axisInB, | 48 | pivotInA, pivotInB, axisInA, axisInB, |
| 49 | useLinearReferenceFrameA, disableCollisionsBetweenLinkedBodies); | 49 | useLinearReferenceFrameA, disableCollisionsBetweenLinkedBodies); |
| 50 | m_enabled = true; | 50 | m_enabled = true; |
| 51 | } | 51 | } |