diff options
| author | Melanie | 2012-12-26 01:16:08 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-26 01:16:08 +0000 |
| commit | 258588d5b5ad4757a793da238a3cc674656ee886 (patch) | |
| tree | 218d854f02254892bc2ecda2fa9a6541f1986883 /OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs | |
| parent | Revert "Whitespace change to trigger ircbot" (diff) | |
| parent | BulletSim: Rename some of the interface structures (BulletWorld, ...) (diff) | |
| download | opensim-SC-258588d5b5ad4757a793da238a3cc674656ee886.zip opensim-SC-258588d5b5ad4757a793da238a3cc674656ee886.tar.gz opensim-SC-258588d5b5ad4757a793da238a3cc674656ee886.tar.bz2 opensim-SC-258588d5b5ad4757a793da238a3cc674656ee886.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs')
| -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 ed3ffa7..a5378b9 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraintHinge.cs | |||
| @@ -36,7 +36,7 @@ public sealed class BSConstraintHinge : BSConstraint | |||
| 36 | { | 36 | { |
| 37 | public override ConstraintType Type { get { return ConstraintType.HINGE_CONSTRAINT_TYPE; } } | 37 | public override ConstraintType Type { get { return ConstraintType.HINGE_CONSTRAINT_TYPE; } } |
| 38 | 38 | ||
| 39 | public BSConstraintHinge(BulletSim world, BulletBody obj1, BulletBody obj2, | 39 | public BSConstraintHinge(BulletWorld world, BulletBody obj1, BulletBody obj2, |
| 40 | Vector3 pivotInA, Vector3 pivotInB, | 40 | Vector3 pivotInA, Vector3 pivotInB, |
| 41 | Vector3 axisInA, Vector3 axisInB, | 41 | Vector3 axisInA, Vector3 axisInB, |
| 42 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies) | 42 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies) |