1 files changed, 42 insertions, 104 deletions

diff --git a/OpenSim/Region/Framework/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index 860172c..38474de 100644
--- a/OpenSim/Region/Framework/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -30,12 +30,27 @@ using System.Reflection;
 using log4net;
 using OpenMetaverse;
 using OpenSim.Region.Framework.Interfaces;
+using System;
 
 namespace OpenSim.Region.Framework.Scenes
 {
+    [Flags]
+    public enum UndoType
+    {
+        STATE_PRIM_POSITION = 1,
+        STATE_PRIM_ROTATION = 2,
+        STATE_PRIM_SCALE = 4,
+        STATE_PRIM_ALL = 7,
+        STATE_GROUP_POSITION = 8,
+        STATE_GROUP_ROTATION = 16,
+        STATE_GROUP_SCALE = 32,
+        STATE_GROUP_ALL = 56,
+        STATE_ALL = 63       
+    }
+
     public class UndoState
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public Vector3 Position = Vector3.Zero;
         public Vector3 Scale = Vector3.Zero;
@@ -51,43 +66,22 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="part"></param>
         /// <param name="forGroup">True if the undo is for an entire group</param>
+        /// only for root parts ????
         public UndoState(SceneObjectPart part, bool forGroup)
         {
             if (part.ParentID == 0)
             {
                 ForGroup = forGroup;
-
-//                    if (ForGroup)
-                    Position = part.ParentGroup.AbsolutePosition;
-//                    else
-//                        Position = part.OffsetPosition;
-
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Storing undo position {0} for root part", Position);
-
+                Position = part.ParentGroup.AbsolutePosition;
                 Rotation = part.RotationOffset;
-
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Storing undo rotation {0} for root part", Rotation);
-
                 Scale = part.Shape.Scale;
-
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Storing undo scale {0} for root part", Scale);
             }
             else
             {
+                ForGroup = false;  // only root parts can undo grp
                 Position = part.OffsetPosition;
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Storing undo position {0} for child part", Position);
-
                 Rotation = part.RotationOffset;
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Storing undo rotation {0} for child part", Rotation);
-
                 Scale = part.Shape.Scale;
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Storing undo scale {0} for child part", Scale);
             }
         }
 
@@ -96,35 +90,40 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         /// <param name="part"></param>
         /// <returns>true if both the part's position, rotation and scale match those in this undo state.  False otherwise.</returns>
-        public bool Compare(SceneObjectPart part)
+        public bool Compare(SceneObjectPart part, bool forgrp)
         {
+            if (ForGroup != forgrp) // if diferent targets, then they are diferent
+                return false;
+
             if (part != null)
             {
                 if (part.ParentID == 0)
-                    return
-                        Position == part.ParentGroup.AbsolutePosition
-                            && Rotation == part.RotationOffset
-                            && Scale == part.Shape.Scale;
+                {
+                    // root part
+                    // grp position is same as part
+                    if (Position != part.ParentGroup.AbsolutePosition)
+                        return false;
+                    if (Rotation != part.RotationOffset)
+                        return false;
+                    return Scale == part.Shape.Scale;
+                }
                 else
-                    return
-                        Position == part.OffsetPosition
+                {
+                    return (Position == part.OffsetPosition
                             && Rotation == part.RotationOffset
-                            && Scale == part.Shape.Scale;
+                            && Scale == part.Shape.Scale);
+                }
             }
 
             return false;
         }
 
-        public void PlaybackState(SceneObjectPart part)
+        public void PlayState(SceneObjectPart part)
         {
             part.Undoing = true;
 
             if (part.ParentID == 0)
             {
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Undoing position to {0} for root part {1} {2}",
-//                        Position, part.Name, part.LocalId);
-
                 if (Position != Vector3.Zero)
                 {
                     if (ForGroup)
@@ -133,10 +132,6 @@ namespace OpenSim.Region.Framework.Scenes
                         part.ParentGroup.UpdateRootPosition(Position);
                 }
 
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Undoing rotation {0} to {1} for root part {2} {3}",
-//                        part.RotationOffset, Rotation, part.Name, part.LocalId);
-
                 if (ForGroup)
                     part.UpdateRotation(Rotation);
                 else
@@ -144,86 +139,29 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (Scale != Vector3.Zero)
                 {
-//                        m_log.DebugFormat(
-//                            "[UNDO STATE]: Undoing scale {0} to {1} for root part {2} {3}",
-//                            part.Shape.Scale, Scale, part.Name, part.LocalId);
-
                     if (ForGroup)
                         part.ParentGroup.GroupResize(Scale);
                     else
                         part.Resize(Scale);
                 }
-
                 part.ParentGroup.ScheduleGroupForTerseUpdate();
             }
             else
             {
-                // Note: Updating these properties on sop automatically schedules an update if needed
-                if (Position != Vector3.Zero)
-                {
-//                        m_log.DebugFormat(
-//                            "[UNDO STATE]: Undoing position {0} to {1} for child part {2} {3}",
-//                            part.OffsetPosition, Position, part.Name, part.LocalId);
-
-                    part.OffsetPosition = Position;
-                }
-
-//                    m_log.DebugFormat(
-//                        "[UNDO STATE]: Undoing rotation {0} to {1} for child part {2} {3}",
-//                        part.RotationOffset, Rotation, part.Name, part.LocalId);
+                if (ForGroup) // trap for group since seems parts can't do it
+                    return;
 
+                // Note: Updating these properties on sop automatically schedules an update if needed
+                part.OffsetPosition = Position;
                 part.UpdateRotation(Rotation);
-
                 if (Scale != Vector3.Zero)
                 {
-//                        m_log.DebugFormat(
-//                            "[UNDO STATE]: Undoing scale {0} to {1} for child part {2} {3}",
-//                            part.Shape.Scale, Scale, part.Name, part.LocalId);
-
                     part.Resize(Scale);
                 }
             }
 
             part.Undoing = false;
         }
-
-        public void PlayfwdState(SceneObjectPart part)
-        {
-            part.Undoing = true;
-
-            if (part.ParentID == 0)
-            {
-                if (Position != Vector3.Zero)
-                    part.ParentGroup.AbsolutePosition = Position;
-
-                if (Rotation != Quaternion.Identity)
-                    part.UpdateRotation(Rotation);
-
-                if (Scale != Vector3.Zero)
-                {
-                    if (ForGroup)
-                        part.ParentGroup.GroupResize(Scale);
-                    else
-                        part.Resize(Scale);
-                }
-
-                part.ParentGroup.ScheduleGroupForTerseUpdate();
-            }
-            else
-            {
-                // Note: Updating these properties on sop automatically schedules an update if needed
-                if (Position != Vector3.Zero)
-                    part.OffsetPosition = Position;
-
-                if (Rotation != Quaternion.Identity)
-                    part.UpdateRotation(Rotation);
-
-                if (Scale != Vector3.Zero)
-                    part.Resize(Scale);
-            }
-
-            part.Undoing = false;
-        }
     }
 
     public class LandUndoState
@@ -247,4 +185,4 @@ namespace OpenSim.Region.Framework.Scenes
             m_terrainModule.UndoTerrain(m_terrainChannel);
         }
     }
-}
\ No newline at end of file
+}