1 files changed, 29 insertions, 20 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 09c945b..3327b1e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -358,7 +358,7 @@ namespace OpenSim.Region.Framework.Scenes
             UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition, 
             Quaternion rotationOffset, Vector3 offsetPosition)
         {
-            m_name = "Primitive";
+            m_name = "Object";
 
             Rezzed = DateTime.UtcNow;
             _creationDate = (int)Utils.DateTimeToUnixTime(Rezzed);
@@ -697,7 +697,7 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_offsetPosition; }
             set
             {
-                StoreUndoState();
+                StoreUndoState(UndoType.STATE_PRIM_POSITION);
                 m_offsetPosition = value;
 
                 if (ParentGroup != null && !ParentGroup.IsDeleted)
@@ -759,7 +759,7 @@ namespace OpenSim.Region.Framework.Scenes
             
             set
             {
-                StoreUndoState();
+                StoreUndoState(UndoType.STATE_PRIM_ROTATION);
                 m_rotationOffset = value;
 
                 PhysicsActor actor = PhysActor;
@@ -958,7 +958,7 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_shape.Scale; }
             set
             {
-                StoreUndoState();
+                StoreUndoState(UndoType.STATE_PRIM_SCALE);
                 if (m_shape != null)
                 {
                     m_shape.Scale = value;
@@ -1522,7 +1522,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 m_redo.Clear();
             }
-            StoreUndoState();
+            StoreUndoState(UndoType.STATE_ALL);
         }
 
         public byte ConvertScriptUintToByte(uint indata)
@@ -1625,7 +1625,7 @@ namespace OpenSim.Region.Framework.Scenes
             PrimitiveBaseShape shape = PrimitiveBaseShape.Create();
             part.Shape = shape;
 
-            part.Name = "Primitive";
+            part.Name = "Object";
             part._ownerID = UUID.Random();
 
             return part;
@@ -2721,7 +2721,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="scale"></param>
         public void Resize(Vector3 scale)
         {
-            StoreUndoState();
+            StoreUndoState(UndoType.STATE_PRIM_SCALE);
             m_shape.Scale = scale;
 
             ParentGroup.HasGroupChanged = true;
@@ -3504,10 +3504,9 @@ namespace OpenSim.Region.Framework.Scenes
             m_parentGroup.ScheduleGroupForTerseUpdate();
             //m_parentGroup.ScheduleGroupForFullUpdate();
         }
-
-        public void StoreUndoState()
+        public void StoreUndoState(UndoType type)
         {
-            if (!Undoing)
+            if (!Undoing && (m_parentGroup == null || m_parentGroup.RootPart == null || !m_parentGroup.RootPart.Undoing))
             {
                 if (!IgnoreUndoUpdate)
                 {
@@ -3518,17 +3517,25 @@ namespace OpenSim.Region.Framework.Scenes
                             if (m_undo.Count > 0)
                             {
                                 UndoState last = m_undo.Peek();
-                                if (last != null)
-                                {
-                                    if (last.Compare(this))
-                                        return;
-                                }
+                                
                             }
 
                             if (m_parentGroup.GetSceneMaxUndo() > 0)
                             {
-                                UndoState nUndo = new UndoState(this);
+                                UndoState lastUndo = m_undo.Peek();
+
+                                UndoState nUndo = new UndoState(this, type);
 
+                                if (lastUndo != null)
+                                {
+                                    TimeSpan ts = DateTime.Now.Subtract(lastUndo.LastUpdated);
+                                    if (ts.TotalMilliseconds < 500)
+                                    {
+                                        //Delete the last entry since it was less than 500 milliseconds ago
+                                        nUndo.Merge(lastUndo);
+                                        m_undo.Pop();
+                                    }
+                                }
                                 m_undo.Push(nUndo);
                             }
 
@@ -4005,11 +4012,13 @@ namespace OpenSim.Region.Framework.Scenes
                 if (m_undo.Count > 0)
                 {
                     UndoState nUndo = null;
+                    UndoState goback = m_undo.Pop();
                     if (m_parentGroup.GetSceneMaxUndo() > 0)
                     {
-                        nUndo = new UndoState(this);
+                        nUndo = new UndoState(this, goback.Type);
                     }
-                    UndoState goback = m_undo.Pop();
+
+                    
                     if (goback != null)
                     {
                         goback.PlaybackState(this);
@@ -4024,13 +4033,13 @@ namespace OpenSim.Region.Framework.Scenes
         {
             lock (m_redo)
             {
+                UndoState gofwd = m_redo.Pop();
                 if (m_parentGroup.GetSceneMaxUndo() > 0)
                 {
-                    UndoState nUndo = new UndoState(this);
+                    UndoState nUndo = new UndoState(this, gofwd.Type);
 
                     m_undo.Push(nUndo);
                 }
-                UndoState gofwd = m_redo.Pop();
                 if (gofwd != null)
                     gofwd.PlayfwdState(this);
             }