diff options
author | Melanie | 2011-11-03 00:06:14 +0000 |
---|---|---|
committer | Melanie | 2011-11-03 00:06:14 +0000 |
commit | 243acef917e8e61b9feef4587b440a77737e016e (patch) | |
tree | af80394d32977c53b729a395037dd080c8ffe214 /OpenSim/Region/Framework/Scenes/UndoState.cs | |
parent | Merge branch 'master' into bigmerge (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-243acef917e8e61b9feef4587b440a77737e016e.zip opensim-SC_OLD-243acef917e8e61b9feef4587b440a77737e016e.tar.gz opensim-SC_OLD-243acef917e8e61b9feef4587b440a77737e016e.tar.bz2 opensim-SC_OLD-243acef917e8e61b9feef4587b440a77737e016e.tar.xz |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
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 0a30f4b..5ed3c79 100644 --- a/OpenSim/Region/Framework/Scenes/UndoState.cs +++ b/OpenSim/Region/Framework/Scenes/UndoState.cs | |||
@@ -173,6 +173,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
173 | } | 173 | } |
174 | else | 174 | else |
175 | { | 175 | { |
176 | // Note: Updating these properties on sop automatically schedules an update if needed | ||
176 | if (Position != Vector3.Zero) | 177 | if (Position != Vector3.Zero) |
177 | { | 178 | { |
178 | // m_log.DebugFormat( | 179 | // m_log.DebugFormat( |
@@ -196,8 +197,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
196 | 197 | ||
197 | part.Resize(Scale); | 198 | part.Resize(Scale); |
198 | } | 199 | } |
199 | |||
200 | part.ScheduleTerseUpdate(); | ||
201 | } | 200 | } |
202 | 201 | ||
203 | part.Undoing = false; | 202 | part.Undoing = false; |
@@ -227,6 +226,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
227 | } | 226 | } |
228 | else | 227 | else |
229 | { | 228 | { |
229 | // Note: Updating these properties on sop automatically schedules an update if needed | ||
230 | if (Position != Vector3.Zero) | 230 | if (Position != Vector3.Zero) |
231 | part.OffsetPosition = Position; | 231 | part.OffsetPosition = Position; |
232 | 232 | ||
@@ -235,8 +235,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
235 | 235 | ||
236 | if (Scale != Vector3.Zero) | 236 | if (Scale != Vector3.Zero) |
237 | part.Resize(Scale); | 237 | part.Resize(Scale); |
238 | |||
239 | part.ScheduleTerseUpdate(); | ||
240 | } | 238 | } |
241 | 239 | ||
242 | part.Undoing = false; | 240 | part.Undoing = false; |