diff options
author | Melanie | 2011-11-02 23:51:48 +0000 |
---|---|---|
committer | Melanie | 2011-11-02 23:51:48 +0000 |
commit | e746840226ca56a87d597c899f7c0bd8cf2980b2 (patch) | |
tree | 3eb405e222426a8d51dd9274275673ef34780a48 /OpenSim/Region/Framework/Scenes/UndoState.cs | |
parent | Port the Avination offline messaging system to Core (diff) | |
parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
download | opensim-SC-e746840226ca56a87d597c899f7c0bd8cf2980b2.zip opensim-SC-e746840226ca56a87d597c899f7c0bd8cf2980b2.tar.gz opensim-SC-e746840226ca56a87d597c899f7c0bd8cf2980b2.tar.bz2 opensim-SC-e746840226ca56a87d597c899f7c0bd8cf2980b2.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/UndoState.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/UndoState.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/UndoState.cs b/OpenSim/Region/Framework/Scenes/UndoState.cs index d34d8e5..860172c 100644 --- a/OpenSim/Region/Framework/Scenes/UndoState.cs +++ b/OpenSim/Region/Framework/Scenes/UndoState.cs | |||
@@ -158,6 +158,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
158 | } | 158 | } |
159 | else | 159 | else |
160 | { | 160 | { |
161 | // Note: Updating these properties on sop automatically schedules an update if needed | ||
161 | if (Position != Vector3.Zero) | 162 | if (Position != Vector3.Zero) |
162 | { | 163 | { |
163 | // m_log.DebugFormat( | 164 | // m_log.DebugFormat( |
@@ -181,8 +182,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
181 | 182 | ||
182 | part.Resize(Scale); | 183 | part.Resize(Scale); |
183 | } | 184 | } |
184 | |||
185 | part.ScheduleTerseUpdate(); | ||
186 | } | 185 | } |
187 | 186 | ||
188 | part.Undoing = false; | 187 | part.Undoing = false; |
@@ -212,6 +211,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
212 | } | 211 | } |
213 | else | 212 | else |
214 | { | 213 | { |
214 | // Note: Updating these properties on sop automatically schedules an update if needed | ||
215 | if (Position != Vector3.Zero) | 215 | if (Position != Vector3.Zero) |
216 | part.OffsetPosition = Position; | 216 | part.OffsetPosition = Position; |
217 | 217 | ||
@@ -220,8 +220,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
220 | 220 | ||
221 | if (Scale != Vector3.Zero) | 221 | if (Scale != Vector3.Zero) |
222 | part.Resize(Scale); | 222 | part.Resize(Scale); |
223 | |||
224 | part.ScheduleTerseUpdate(); | ||
225 | } | 223 | } |
226 | 224 | ||
227 | part.Undoing = false; | 225 | part.Undoing = false; |