4 files changed, 20 insertions, 14 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index a34ad62..00115cc 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -11224,8 +11224,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             if (multipleupdate.AgentData.SessionID != SessionId)
                 return false;
 
-//            m_log.DebugFormat(
-//                "[CLIENT]: Incoming MultipleObjectUpdatePacket contained {0} blocks", multipleupdate.ObjectData.Length);
+            m_log.DebugFormat(
+                "[CLIENT]: Incoming MultipleObjectUpdatePacket contained {0} blocks", multipleupdate.ObjectData.Length);
 
             Scene tScene = (Scene)m_scene;
 
@@ -11247,9 +11247,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     }
                     else
                     {
-//                        m_log.DebugFormat(
-//                            "[CLIENT]: Processing block {0} type {1} for {2} {3}",
-//                            i, block.Type, part.Name, part.LocalId);
+                        m_log.DebugFormat(
+                            "[CLIENT]: Processing block {0} type {1} for {2} {3}",
+                            i, block.Type, part.Name, part.LocalId);
 
 //                        // Do this once since fetch parts creates a new array.
 //                        SceneObjectPart[] parts = part.ParentGroup.Parts;
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 8e174f5..26857c2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1296,7 +1296,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-
         /// <summary>
         ///
         /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 5414cf2..af836f6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -3705,9 +3705,9 @@ namespace OpenSim.Region.Framework.Scenes
 
                                 m_undo.Push(nUndo);
 
-//                                m_log.DebugFormat(
-//                                    "[SCENE OBJECT PART]: Stored undo state for {0} {1}, stack size now {2}",
-//                                    Name, LocalId, m_undo.Count);
+                                m_log.DebugFormat(
+                                    "[SCENE OBJECT PART]: Stored undo state for {0} {1}, stack size now {2}",
+                                    Name, LocalId, m_undo.Count);
                             }
                         }
                     }
@@ -3740,9 +3740,9 @@ namespace OpenSim.Region.Framework.Scenes
         {
             lock (m_undo)
             {
-//                m_log.DebugFormat(
-//                    "[SCENE OBJECT PART]: Handling undo request for {0} {1}, stack size {2}",
-//                    Name, LocalId, m_undo.Count);
+                m_log.DebugFormat(
+                    "[SCENE OBJECT PART]: Handling undo request for {0} {1}, stack size {2}",
+                    Name, LocalId, m_undo.Count);
 
                 if (m_undo.Count > 0)
                 {
diff --git a/OpenSim/Region/Framework/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs
index 1fa8ee2..faa1f9e 100644
--- a/OpenSim/Region/Framework/Scenes/UndoState.cs
+++ b/OpenSim/Region/Framework/Scenes/UndoState.cs
@@ -59,7 +59,11 @@ namespace OpenSim.Region.Framework.Scenes
                 {
 //                    m_log.DebugFormat(
 //                        "[UNDO STATE]: Storing undo position {0} for root part", part.ParentGroup.AbsolutePosition);
-                    Position = part.ParentGroup.AbsolutePosition;
+
+                    if (ForGroup)
+                        Position = part.ParentGroup.AbsolutePosition;
+                    else
+                        Position = part.OffsetPosition;
 
 //                    m_log.DebugFormat(
 //                        "[UNDO STATE]: Storing undo rotation {0} for root part", part.RotationOffset);
@@ -134,7 +138,10 @@ namespace OpenSim.Region.Framework.Scenes
 //                            "[UNDO STATE]: Undoing position {0} to {1} for root part {2} {3}",
 //                            part.ParentGroup.AbsolutePosition, Position, part.Name, part.LocalId);
 
-                        part.ParentGroup.AbsolutePosition = Position;
+                        if (ForGroup)
+                            part.ParentGroup.AbsolutePosition = Position;
+                        else
+                            part.OffsetPosition = Position;
                     }
 
 //                    m_log.DebugFormat(