diff options
| author | Justin Clark-Casey (justincc) | 2013-04-02 00:46:53 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-04-02 00:46:53 +0100 |
| commit | 600087ab49e9489e37471ccfb7360ac14d31b7f2 (patch) | |
| tree | 7fd908e81185346da6d0bd3561c2712519942117 /OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs | |
| parent | Change recent MSSQL migrations to drop COLUMN from ALTER TABLE which is eithe... (diff) | |
| parent | BulletSim: stop an avatar from moving if standing on a stationary (diff) | |
| download | opensim-SC_OLD-600087ab49e9489e37471ccfb7360ac14d31b7f2.zip opensim-SC_OLD-600087ab49e9489e37471ccfb7360ac14d31b7f2.tar.gz opensim-SC_OLD-600087ab49e9489e37471ccfb7360ac14d31b7f2.tar.bz2 opensim-SC_OLD-600087ab49e9489e37471ccfb7360ac14d31b7f2.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs')
| -rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs index 476a0e5..d0949f5 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint6Dof.cs | |||
| @@ -97,14 +97,14 @@ public sealed class BSConstraint6Dof : BSConstraint | |||
| 97 | 97 | ||
| 98 | // A 6 Dof constraint that is fixed in the world and constrained to a on-the-fly created static object | 98 | // A 6 Dof constraint that is fixed in the world and constrained to a on-the-fly created static object |
| 99 | public BSConstraint6Dof(BulletWorld world, BulletBody obj1, Vector3 frameInBloc, Quaternion frameInBrot, | 99 | public BSConstraint6Dof(BulletWorld world, BulletBody obj1, Vector3 frameInBloc, Quaternion frameInBrot, |
| 100 | bool useLinearReferenceFrameA, bool disableCollisionsBetweenLinkedBodies) | 100 | bool useLinearReferenceFrameB, bool disableCollisionsBetweenLinkedBodies) |
| 101 | : base(world) | 101 | : base(world) |
| 102 | { | 102 | { |
| 103 | m_body1 = obj1; | 103 | m_body1 = obj1; |
| 104 | m_body2 = obj1; // Look out for confusion down the road | 104 | m_body2 = obj1; // Look out for confusion down the road |
| 105 | m_constraint = PhysicsScene.PE.Create6DofConstraintFixed(m_world, m_body1, | 105 | m_constraint = PhysicsScene.PE.Create6DofConstraintFixed(m_world, m_body1, |
| 106 | frameInBloc, frameInBrot, | 106 | frameInBloc, frameInBrot, |
| 107 | useLinearReferenceFrameA, disableCollisionsBetweenLinkedBodies); | 107 | useLinearReferenceFrameB, disableCollisionsBetweenLinkedBodies); |
| 108 | m_enabled = true; | 108 | m_enabled = true; |
| 109 | world.physicsScene.DetailLog("{0},BS6DofConstraint,createFixed,wID={1},rID={2},rBody={3}", | 109 | world.physicsScene.DetailLog("{0},BS6DofConstraint,createFixed,wID={1},rID={2},rBody={3}", |
| 110 | BSScene.DetailLogZero, world.worldID, obj1.ID, obj1.AddrString); | 110 | BSScene.DetailLogZero, world.worldID, obj1.ID, obj1.AddrString); |