From e3885625a069e5d6a59ad0300215c13c89ea00f8 Mon Sep 17 00:00:00 2001
From: nebadon
Date: Sat, 5 Nov 2011 02:26:25 -0700
Subject: Don't rotate child prims, if only the root prim is rotated.

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 4d6c4cb..3f4e112 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2926,8 +2926,8 @@ namespace OpenSim.Region.Framework.Scenes
                     axPos *= Quaternion.Inverse(axRot);
                     prim.OffsetPosition = axPos;
                     Quaternion primsRot = prim.RotationOffset;
-                    Quaternion newRot = primsRot * oldParentRot;
-                    newRot *= Quaternion.Inverse(axRot);
+                    Quaternion newRot = oldParentRot * primsRot;
+                    newRot = Quaternion.Inverse(axRot) * newRot;
                     prim.RotationOffset = newRot;
                     prim.ScheduleTerseUpdate();
                     prim.IgnoreUndoUpdate = false;
-- 
cgit v1.1