diff options
| author | Melanie | 2012-04-03 23:38:12 +0200 |
|---|---|---|
| committer | Melanie | 2012-04-03 23:38:12 +0200 |
| commit | 726915e9ef369a5b4cb7089ec9301c5c927dd862 (patch) | |
| tree | a84bade3783b9f7d49a60a382b921529ed631ebf /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | More artefact (diff) | |
| download | opensim-SC_OLD-726915e9ef369a5b4cb7089ec9301c5c927dd862.zip opensim-SC_OLD-726915e9ef369a5b4cb7089ec9301c5c927dd862.tar.gz opensim-SC_OLD-726915e9ef369a5b4cb7089ec9301c5c927dd862.tar.bz2 opensim-SC_OLD-726915e9ef369a5b4cb7089ec9301c5c927dd862.tar.xz | |
Fix the last merge artefacts
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index fde146c..5f33452 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -3583,7 +3583,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3583 | Quaternion axRot = rot; | 3583 | Quaternion axRot = rot; |
| 3584 | Quaternion oldParentRot = m_rootPart.RotationOffset; | 3584 | Quaternion oldParentRot = m_rootPart.RotationOffset; |
| 3585 | 3585 | ||
| 3586 | m_rootPart.StoreUndoState(); | ||
| 3587 | //Don't use UpdateRotation because it schedules an update prematurely | 3586 | //Don't use UpdateRotation because it schedules an update prematurely |
| 3588 | m_rootPart.RotationOffset = rot; | 3587 | m_rootPart.RotationOffset = rot; |
| 3589 | 3588 | ||