diff options
author | Justin Clark-Casey (justincc) | 2011-07-19 04:40:02 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-19 04:40:02 +0100 |
commit | b2722e984ab99deb01d55cd4c4e9f1a7cb563709 (patch) | |
tree | 15e96b61923cb69b287d3e1eac314fa9dfee3b64 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
parent | Fix undo of prim group rotation. (diff) | |
download | opensim-SC_OLD-b2722e984ab99deb01d55cd4c4e9f1a7cb563709.zip opensim-SC_OLD-b2722e984ab99deb01d55cd4c4e9f1a7cb563709.tar.gz opensim-SC_OLD-b2722e984ab99deb01d55cd4c4e9f1a7cb563709.tar.bz2 opensim-SC_OLD-b2722e984ab99deb01d55cd4c4e9f1a7cb563709.tar.xz |
Fix undo of rotation of single prims in a linkset
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index aa1f7bc..9076d73 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -2991,6 +2991,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2991 | // "[SCENE OBJECT GROUP]: Updating single position and rotation of {0} {1} to {2}", | 2991 | // "[SCENE OBJECT GROUP]: Updating single position and rotation of {0} {1} to {2}", |
2992 | // part.Name, part.LocalId, rot); | 2992 | // part.Name, part.LocalId, rot); |
2993 | 2993 | ||
2994 | part.StoreUndoState(); | ||
2995 | part.IgnoreUndoUpdate = true; | ||
2996 | |||
2994 | if (part.UUID == m_rootPart.UUID) | 2997 | if (part.UUID == m_rootPart.UUID) |
2995 | { | 2998 | { |
2996 | UpdateRootRotation(rot); | 2999 | UpdateRootRotation(rot); |
@@ -2998,12 +3001,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
2998 | } | 3001 | } |
2999 | else | 3002 | else |
3000 | { | 3003 | { |
3001 | part.IgnoreUndoUpdate = true; | ||
3002 | part.UpdateRotation(rot); | 3004 | part.UpdateRotation(rot); |
3003 | part.OffsetPosition = pos; | 3005 | part.OffsetPosition = pos; |
3004 | part.IgnoreUndoUpdate = false; | ||
3005 | part.StoreUndoState(); | ||
3006 | } | 3006 | } |
3007 | |||
3008 | part.IgnoreUndoUpdate = false; | ||
3007 | } | 3009 | } |
3008 | } | 3010 | } |
3009 | 3011 | ||