diff options
Diffstat (limited to 'OpenSim')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs index aa75663..7219617 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs | |||
@@ -36,7 +36,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
36 | { | 36 | { |
37 | public class BSActorLockAxis : BSActor | 37 | public class BSActorLockAxis : BSActor |
38 | { | 38 | { |
39 | bool TryExperimentalLockAxisCode = false; | 39 | bool TryExperimentalLockAxisCode = true; |
40 | BSConstraint LockAxisConstraint = null; | 40 | BSConstraint LockAxisConstraint = null; |
41 | 41 | ||
42 | public BSActorLockAxis(BSScene physicsScene, BSPhysObject pObj, string actorName) | 42 | public BSActorLockAxis(BSScene physicsScene, BSPhysObject pObj, string actorName) |
@@ -117,9 +117,7 @@ public class BSActorLockAxis : BSActor | |||
117 | RemoveAxisLockConstraint(); | 117 | RemoveAxisLockConstraint(); |
118 | 118 | ||
119 | BSConstraint6Dof axisConstrainer = new BSConstraint6Dof(m_physicsScene.World, m_controllingPrim.PhysBody, | 119 | BSConstraint6Dof axisConstrainer = new BSConstraint6Dof(m_physicsScene.World, m_controllingPrim.PhysBody, |
120 | // OMV.Vector3.Zero, OMV.Quaternion.Identity, | 120 | OMV.Vector3.Zero, OMV.Quaternion.Identity, |
121 | OMV.Vector3.Zero, OMV.Quaternion.Inverse(m_controllingPrim.RawOrientation), | ||
122 | // OMV.Vector3.Zero, m_controllingPrim.RawOrientation, | ||
123 | false /* useLinearReferenceFrameB */, true /* disableCollisionsBetweenLinkedBodies */); | 121 | false /* useLinearReferenceFrameB */, true /* disableCollisionsBetweenLinkedBodies */); |
124 | LockAxisConstraint = axisConstrainer; | 122 | LockAxisConstraint = axisConstrainer; |
125 | m_physicsScene.Constraints.AddConstraint(LockAxisConstraint); | 123 | m_physicsScene.Constraints.AddConstraint(LockAxisConstraint); |