From 68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Tue, 2 Apr 2013 06:40:12 -0700
Subject: BulletSim: create axis lock constraint with proper orientation and
 enable axis lock functionality.

---
 OpenSim/Region/Physics/BulletSPlugin/BSActorLockAxis.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'OpenSim')

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
 {
 public class BSActorLockAxis : BSActor
 {
-    bool TryExperimentalLockAxisCode = false;
+    bool TryExperimentalLockAxisCode = true;
     BSConstraint LockAxisConstraint = null;
 
     public BSActorLockAxis(BSScene physicsScene, BSPhysObject pObj, string actorName)
@@ -117,9 +117,7 @@ public class BSActorLockAxis : BSActor
         RemoveAxisLockConstraint();
 
         BSConstraint6Dof axisConstrainer = new BSConstraint6Dof(m_physicsScene.World, m_controllingPrim.PhysBody, 
-                            // OMV.Vector3.Zero, OMV.Quaternion.Identity,
-                            OMV.Vector3.Zero, OMV.Quaternion.Inverse(m_controllingPrim.RawOrientation),
-                            // OMV.Vector3.Zero, m_controllingPrim.RawOrientation,
+                            OMV.Vector3.Zero, OMV.Quaternion.Identity,
                             false /* useLinearReferenceFrameB */, true /* disableCollisionsBetweenLinkedBodies */);
         LockAxisConstraint = axisConstrainer;
         m_physicsScene.Constraints.AddConstraint(LockAxisConstraint);
-- 
cgit v1.1