diff options
| author | Melanie | 2012-03-09 02:11:25 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-09 02:11:25 +0100 |
| commit | e1be1c5263e1a758fa96ecd62209413bc4d1ee86 (patch) | |
| tree | 8efe359172acc45e69d10a966eda1b116e3d90de /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
| parent | Fix a merge artefact (diff) | |
| parent | more changes on undo/redo group scaling seems to work better (diff) | |
| download | opensim-SC-e1be1c5263e1a758fa96ecd62209413bc4d1ee86.zip opensim-SC-e1be1c5263e1a758fa96ecd62209413bc4d1ee86.tar.gz opensim-SC-e1be1c5263e1a758fa96ecd62209413bc4d1ee86.tar.bz2 opensim-SC-e1be1c5263e1a758fa96ecd62209413bc4d1ee86.tar.xz | |
Merge branch 'ubitwork'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index cce606a..6622495 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -828,7 +828,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 828 | 828 | ||
| 829 | set | 829 | set |
| 830 | { | 830 | { |
| 831 | StoreUndoState(); | 831 | // StoreUndoState(); |
| 832 | m_rotationOffset = value; | 832 | m_rotationOffset = value; |
| 833 | 833 | ||
| 834 | PhysicsActor actor = PhysActor; | 834 | PhysicsActor actor = PhysActor; |
| @@ -1007,7 +1007,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1007 | { | 1007 | { |
| 1008 | if (m_shape != null) | 1008 | if (m_shape != null) |
| 1009 | { | 1009 | { |
| 1010 | StoreUndoState(); | 1010 | // StoreUndoState(); |
| 1011 | 1011 | ||
| 1012 | m_shape.Scale = value; | 1012 | m_shape.Scale = value; |
| 1013 | 1013 | ||