diff options
| author | Melanie | 2012-12-28 08:32:34 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-28 08:32:34 +0000 |
| commit | 3ab1bd04031ca0bc1039e4e1d267ea19d0017430 (patch) | |
| tree | 3f2417f3b96e151642158d29d1982dee2bd850a8 /OpenSim/Region/Physics/BulletSNPlugin/BSConstraint6Dof.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: correct collision mask definition for linkset children. (diff) | |
| download | opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.zip opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.gz opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.bz2 opensim-SC-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSNPlugin/BSConstraint6Dof.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSNPlugin/BSConstraint6Dof.cs b/OpenSim/Region/Physics/BulletSNPlugin/BSConstraint6Dof.cs index 0181d9d..d1e3f55 100644 --- a/OpenSim/Region/Physics/BulletSNPlugin/BSConstraint6Dof.cs +++ b/OpenSim/Region/Physics/BulletSNPlugin/BSConstraint6Dof.cs | |||
| @@ -39,7 +39,7 @@ public sealed class BSConstraint6Dof : BSConstraint | |||
| 39 | public override ConstraintType Type { get { return ConstraintType.D6_CONSTRAINT_TYPE; } } | 39 | public override ConstraintType Type { get { return ConstraintType.D6_CONSTRAINT_TYPE; } } |
| 40 | 40 | ||
| 41 | // Create a btGeneric6DofConstraint | 41 | // Create a btGeneric6DofConstraint |
| 42 | public BSConstraint6Dof(BulletSim world, BulletBody obj1, BulletBody obj2, | 42 | public BSConstraint6Dof(BulletWorld world, BulletBody obj1, BulletBody obj2, |
| 43 | Vector3 frame1, Quaternion frame1rot, | 43 | Vector3 frame1, Quaternion frame1rot, |
| 44 | Vector3 frame2, Quaternion frame2rot, | 44 | Vector3 frame2, Quaternion frame2rot, |
| 45 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies) | 45 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies) |
| @@ -58,7 +58,7 @@ public sealed class BSConstraint6Dof : BSConstraint | |||
| 58 | obj1.ID, obj1.ptr.ToString(), obj2.ID, obj2.ptr.ToString()); | 58 | obj1.ID, obj1.ptr.ToString(), obj2.ID, obj2.ptr.ToString()); |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | public BSConstraint6Dof(BulletSim world, BulletBody obj1, BulletBody obj2, | 61 | public BSConstraint6Dof(BulletWorld world, BulletBody obj1, BulletBody obj2, |
| 62 | Vector3 joinPoint, | 62 | Vector3 joinPoint, |
| 63 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies) | 63 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies) |
| 64 | { | 64 | { |