Fix undo for rotation of the root prim in a linkset on its own.

The only obviously broken things right now are the undo of the position of just a root prim (stays in place) and the fact that resizes need two undoes.

2 files changed, 15 insertions, 8 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 9076d73..d653e66 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3013,11 +3013,11 @@ namespace OpenSim.Region.Framework.Scenes
         ///
         /// </summary>
         /// <param name="rot"></param>
-        private void UpdateRootRotation(Quaternion rot)
+        public void UpdateRootRotation(Quaternion rot)
         {
-//            m_log.DebugFormat(
-//                "[SCENE OBJECT GROUP]: Updating root rotation of {0} {1} to {2}",
-//                Name, LocalId, rot);
+            m_log.DebugFormat(
+                "[SCENE OBJECT GROUP]: Updating root rotation of {0} {1} to {2}",
+                Name, LocalId, rot);
 
             Quaternion axRot = rot;
             Quaternion oldParentRot = m_rootPart.RotationOffset;
@@ -3046,6 +3046,7 @@ namespace OpenSim.Region.Framework.Scenes
                     newRot *= Quaternion.Inverse(axRot);
                     prim.RotationOffset = newRot;
                     prim.ScheduleTerseUpdate();
+                    prim.IgnoreUndoUpdate = false;
                 }
             }
 
@@ -3054,12 +3055,16 @@ namespace OpenSim.Region.Framework.Scenes
                 SceneObjectPart childpart = parts[i];
                 if (childpart != m_rootPart)
                 {
-                    childpart.IgnoreUndoUpdate = false;
-                    childpart.StoreUndoState();
+//                    childpart.IgnoreUndoUpdate = false;
+//                    childpart.StoreUndoState();
                 }
             }
 
             m_rootPart.ScheduleTerseUpdate();
+
+            m_log.DebugFormat(
+                "[SCENE OBJECT GROUP]: Updated root rotation of {0} {1} to {2}",
+                Name, LocalId, rot);
         }
 
         #endregion
diff --git a/OpenSim/Region/Framework/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index 68d4cb4..dc509d9 100644
--- a/OpenSim/Region/Framework/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -150,8 +150,10 @@ namespace OpenSim.Region.Framework.Scenes
                         "[UNDO STATE]: Undoing rotation {0} to {1} for root part {2} {3}",
                         part.RotationOffset, Rotation, part.Name, part.LocalId);
 
-                    part.UpdateRotation(Rotation);
-                    //part.RotationOffset = Rotation;
+                    if (ForGroup)
+                        part.UpdateRotation(Rotation);
+                    else
+                        part.ParentGroup.UpdateRootRotation(Rotation);
 
                     if (Scale != Vector3.Zero)
                     {