diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 5b007e6..72ad281 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -3504,9 +3504,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
3504 | m_parentGroup.ScheduleGroupForTerseUpdate(); | 3504 | m_parentGroup.ScheduleGroupForTerseUpdate(); |
3505 | //m_parentGroup.ScheduleGroupForFullUpdate(); | 3505 | //m_parentGroup.ScheduleGroupForFullUpdate(); |
3506 | } | 3506 | } |
3507 | |||
3508 | public void StoreUndoState() | 3507 | public void StoreUndoState() |
3509 | { | 3508 | { |
3509 | StoreUndoState(false); | ||
3510 | } | ||
3511 | public void StoreUndoState(bool group) | ||
3512 | { | ||
3510 | if (!Undoing) | 3513 | if (!Undoing) |
3511 | { | 3514 | { |
3512 | if (!IgnoreUndoUpdate) | 3515 | if (!IgnoreUndoUpdate) |
@@ -3528,7 +3531,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3528 | if (m_parentGroup.GetSceneMaxUndo() > 0) | 3531 | if (m_parentGroup.GetSceneMaxUndo() > 0) |
3529 | { | 3532 | { |
3530 | UndoState nUndo = new UndoState(this); | 3533 | UndoState nUndo = new UndoState(this); |
3531 | 3534 | nUndo.GroupChange = group; | |
3532 | m_undo.Push(nUndo); | 3535 | m_undo.Push(nUndo); |
3533 | } | 3536 | } |
3534 | 3537 | ||
@@ -4010,6 +4013,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
4010 | nUndo = new UndoState(this); | 4013 | nUndo = new UndoState(this); |
4011 | } | 4014 | } |
4012 | UndoState goback = m_undo.Pop(); | 4015 | UndoState goback = m_undo.Pop(); |
4016 | m_log.Debug("Got goback"); | ||
4017 | if (goback == null) | ||
4018 | { | ||
4019 | m_log.Debug("it's null"); | ||
4020 | } | ||
4021 | else | ||
4022 | { | ||
4023 | m_log.Debug(goback.GroupPosition.ToString()); | ||
4024 | } | ||
4013 | if (goback != null) | 4025 | if (goback != null) |
4014 | { | 4026 | { |
4015 | goback.PlaybackState(this); | 4027 | goback.PlaybackState(this); |