From 22ea2ef9a0bc45b54ecad3ccfe450dcaae5b9648 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 25 Apr 2012 17:11:32 +0100 Subject: [PATCH] set PIDHoverTau and not PIDTau since all physics need that --- .../Region/Framework/Scenes/SceneObjectGroup.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index b0f0a5d874..ba353c4469 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -2339,7 +2339,7 @@ namespace OpenSim.Region.Framework.Scenes { pa.PIDHoverHeight = height; pa.PIDHoverType = hoverType; - pa.PIDTau = tau; + pa.PIDHoverTau = tau; pa.PIDHoverActive = true; } else @@ -2660,19 +2660,21 @@ namespace OpenSim.Region.Framework.Scenes Quaternion oldRootRotation = linkPart.RotationOffset; linkPart.OffsetPosition = linkPart.GroupPosition - AbsolutePosition; - linkPart.ParentID = m_rootPart.LocalId; - linkPart.GroupPosition = AbsolutePosition; - Vector3 axPos = linkPart.OffsetPosition; + linkPart.ParentID = m_rootPart.LocalId; + + linkPart.GroupPosition = AbsolutePosition; + + Vector3 axPos = linkPart.OffsetPosition; Quaternion parentRot = m_rootPart.RotationOffset; axPos *= Quaternion.Inverse(parentRot); - linkPart.OffsetPosition = axPos; + Quaternion oldRot = linkPart.RotationOffset; Quaternion newRot = Quaternion.Inverse(parentRot) * oldRot; linkPart.RotationOffset = newRot; - linkPart.ParentID = m_rootPart.LocalId; +// linkPart.ParentID = m_rootPart.LocalId; done above if (m_rootPart.LinkNum == 0) m_rootPart.LinkNum = 1;