aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 1b7ff23..03ad8c5 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -443,7 +443,7 @@ namespace OpenSim.Region.Environment.Scenes
443 axPos = parentRot.Inverse() * axPos; 443 axPos = parentRot.Inverse() * axPos;
444 linkPart.OffsetPosition = new LLVector3(axPos.x, axPos.y, axPos.z); 444 linkPart.OffsetPosition = new LLVector3(axPos.x, axPos.y, axPos.z);
445 Quaternion oldRot = new Quaternion(linkPart.RotationOffset.W, linkPart.RotationOffset.X, linkPart.RotationOffset.Y, linkPart.RotationOffset.Z); 445 Quaternion oldRot = new Quaternion(linkPart.RotationOffset.W, linkPart.RotationOffset.X, linkPart.RotationOffset.Y, linkPart.RotationOffset.Z);
446 Quaternion newRot = parentRot * oldRot; 446 Quaternion newRot = parentRot.Inverse() * oldRot;
447 linkPart.RotationOffset = new LLQuaternion(newRot.x, newRot.y, newRot.z, newRot.w); 447 linkPart.RotationOffset = new LLQuaternion(newRot.x, newRot.y, newRot.z, newRot.w);
448 linkPart.ParentID = this.m_rootPart.LocalID; 448 linkPart.ParentID = this.m_rootPart.LocalID;
449 this.m_parts.Add(linkPart.UUID, linkPart); 449 this.m_parts.Add(linkPart.UUID, linkPart);
@@ -464,6 +464,7 @@ namespace OpenSim.Region.Environment.Scenes
464 this.ScheduleGroupForFullUpdate(); 464 this.ScheduleGroupForFullUpdate();
465 } 465 }
466 466
467
467 private void LinkNonRootPart(SceneObjectPart part, Vector3 oldGroupPosition, Quaternion oldGroupRotation) 468 private void LinkNonRootPart(SceneObjectPart part, Vector3 oldGroupPosition, Quaternion oldGroupRotation)
468 { 469 {
469 part.SetParent(this); 470 part.SetParent(this);