aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-01-05 07:37:09 +0100
committerMelanie2012-01-05 07:37:09 +0100
commit32b8fa4a77fb7837b8f583243babca225eac6277 (patch)
treec88b898a58de8182bb3623b6c0def5cf2a76a2c2 /OpenSim
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-32b8fa4a77fb7837b8f583243babca225eac6277.zip
opensim-SC-32b8fa4a77fb7837b8f583243babca225eac6277.tar.gz
opensim-SC-32b8fa4a77fb7837b8f583243babca225eac6277.tar.bz2
opensim-SC-32b8fa4a77fb7837b8f583243babca225eac6277.tar.xz
Prevent spurious "CHANGED_POSITION" during region backup
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 48a870e..3b0d1cd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -481,13 +481,14 @@ namespace OpenSim.Region.Framework.Scenes
481 } 481 }
482 } 482 }
483 SceneObjectPart[] parts = m_parts.GetArray(); 483 SceneObjectPart[] parts = m_parts.GetArray();
484 bool triggerScriptEvent = m_rootPart.GroupPosition != val;
485 if (m_dupeInProgress)
486 triggerScriptEvent = false;
484 foreach (SceneObjectPart part in parts) 487 foreach (SceneObjectPart part in parts)
485 { 488 {
486 part.GroupPosition = val; 489 part.GroupPosition = val;
487 if (!m_dupeInProgress) 490 if (triggerScriptEvent)
488 {
489 part.TriggerScriptChangedEvent(Changed.POSITION); 491 part.TriggerScriptChangedEvent(Changed.POSITION);
490 }
491 } 492 }
492 if (!m_dupeInProgress) 493 if (!m_dupeInProgress)
493 { 494 {