From 6026759406f20cb89cbc62fcfc3af324c61c5ab0 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 7 Jul 2013 05:47:41 -0700
Subject: BulletSim: fix jumping up and down of linksets when center-of-mass
 was enabled. Didn't effect the physical position but the viewer saw the
 linkset jumping between its simulator center and its physical center.

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

(limited to 'OpenSim/Region/Physics')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
index 35d5a08..2eb1440 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrimDisplaced.cs
@@ -23,11 +23,6 @@
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The quotations from http://wiki.secondlife.com/wiki/Linden_Vehicle_Tutorial
- * are Copyright (c) 2009 Linden Research, Inc and are used under their license
- * of Creative Commons Attribution-Share Alike 3.0
- * (http://creativecommons.org/licenses/by-sa/3.0/).
  */
 
 using System;
@@ -115,7 +110,7 @@ public class BSPrimDisplaced : BSPrim
     public override Vector3 ForcePosition
     {
         get {
-            OMV.Vector3 physPosition = base.ForcePosition;
+            OMV.Vector3 physPosition = PhysScene.PE.GetPosition(PhysBody);
             if (PositionDisplacement != OMV.Vector3.Zero)
             {
                 // If there is some displacement, return the physical position (center-of-mass)
@@ -125,6 +120,7 @@ public class BSPrimDisplaced : BSPrim
                                 LocalID, physPosition, displacement, physPosition - displacement);
                 physPosition -= displacement;
             }
+            RawPosition = physPosition;
             return physPosition;
         }
         set
-- 
cgit v1.1