diff options
| author | Justin Clark-Casey (justincc) | 2011-07-19 05:46:17 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-07-19 05:46:17 +0100 |
| commit | bc3679b67dc074a9ef1e0e6ffb07bca844eb93c9 (patch) | |
| tree | 84818e8bf78d0f82d783b9ca94f29e5788198067 /OpenSim/Region/Framework/Scenes/UndoState.cs | |
| parent | refactor: rename UpdatePrimPosition() to UpdatePrimGroupPosition() for consis... (diff) | |
| download | opensim-SC_OLD-bc3679b67dc074a9ef1e0e6ffb07bca844eb93c9.zip opensim-SC_OLD-bc3679b67dc074a9ef1e0e6ffb07bca844eb93c9.tar.gz opensim-SC_OLD-bc3679b67dc074a9ef1e0e6ffb07bca844eb93c9.tar.bz2 opensim-SC_OLD-bc3679b67dc074a9ef1e0e6ffb07bca844eb93c9.tar.xz | |
Fix undo when changing just the root prim's position in a linkset.
I think (ha ha) this largely fixes undo, except for the fact that rotation a set of prims with 'edit linked parts' selected doesn't quite work properly (though this works fine if the checkbox isn't selected).
Also, the double undo bug for resize is still present.
Redo might be incredibly buggy, haven't even looked at that yet.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/UndoState.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs index b013d68..6bf89c5 100644 --- a/OpenSim/Region/Framework/Scenes/UndoState.cs +++ b/OpenSim/Region/Framework/Scenes/UndoState.cs | |||
| @@ -59,10 +59,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 59 | { | 59 | { |
| 60 | ForGroup = forGroup; | 60 | ForGroup = forGroup; |
| 61 | 61 | ||
| 62 | if (ForGroup) | 62 | // if (ForGroup) |
| 63 | Position = part.ParentGroup.AbsolutePosition; | 63 | Position = part.ParentGroup.AbsolutePosition; |
| 64 | else | 64 | // else |
| 65 | Position = part.OffsetPosition; | 65 | // Position = part.OffsetPosition; |
| 66 | 66 | ||
| 67 | // m_log.DebugFormat( | 67 | // m_log.DebugFormat( |
| 68 | // "[UNDO STATE]: Storing undo position {0} for root part", Position); | 68 | // "[UNDO STATE]: Storing undo position {0} for root part", Position); |
| @@ -143,7 +143,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 143 | if (ForGroup) | 143 | if (ForGroup) |
| 144 | part.ParentGroup.AbsolutePosition = Position; | 144 | part.ParentGroup.AbsolutePosition = Position; |
| 145 | else | 145 | else |
| 146 | part.OffsetPosition = Position; | 146 | part.ParentGroup.UpdateRootPosition(Position); |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | // m_log.DebugFormat( | 149 | // m_log.DebugFormat( |