From bbac8f76faff387756bfa55dea83fa3bd589ef79 Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 16 Aug 2012 01:18:32 +0200 Subject: [PATCH] Remove AreUpdatesSuspended flag because it does nothing --- OpenSim/Region/Framework/Scenes/SceneGraph.cs | 7 ------- .../Region/Framework/Scenes/SceneObjectGroup.cs | 17 ----------------- .../Shared/Api/Implementation/LSL_Api.cs | 12 ------------ 3 files changed, 36 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index a1da5ee39d..e29b2c1543 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs @@ -1793,7 +1793,6 @@ namespace OpenSim.Region.Framework.Scenes try { - parentGroup.AreUpdatesSuspended = true; List childGroups = new List(); @@ -1850,7 +1849,6 @@ namespace OpenSim.Region.Framework.Scenes SceneObjectGroupsByLocalPartID[part.LocalId] = parentGroup; } - parentGroup.AreUpdatesSuspended = false; parentGroup.HasGroupChanged = true; parentGroup.ProcessBackup(m_parentScene.SimulationDataService, true); parentGroup.ScheduleGroupForFullUpdate(); @@ -1896,7 +1894,6 @@ namespace OpenSim.Region.Framework.Scenes SceneObjectGroup group = part.ParentGroup; if (!affectedGroups.Contains(group)) { - group.AreUpdatesSuspended = true; affectedGroups.Add(group); } } @@ -1922,7 +1919,6 @@ namespace OpenSim.Region.Framework.Scenes // However, editing linked parts and unlinking may be different // SceneObjectGroup group = root.ParentGroup; - group.AreUpdatesSuspended = true; List newSet = new List(group.Parts); int numChildren = newSet.Count; @@ -1945,7 +1941,6 @@ namespace OpenSim.Region.Framework.Scenes group.DelinkFromGroup(p, sendEventsToRemainder); if (numChildren > 2) { - p.ParentGroup.AreUpdatesSuspended = true; } else { @@ -1980,7 +1975,6 @@ namespace OpenSim.Region.Framework.Scenes foreach (SceneObjectPart newChild in newSet) newChild.ClearUpdateSchedule(); - newRoot.ParentGroup.AreUpdatesSuspended = true; LinkObjects(newRoot, newSet); if (!affectedGroups.Contains(newRoot.ParentGroup)) affectedGroups.Add(newRoot.ParentGroup); @@ -1998,7 +1992,6 @@ namespace OpenSim.Region.Framework.Scenes m_parentScene.SimulationDataService.RemoveObject(g.UUID, m_parentScene.RegionInfo.RegionID); g.TriggerScriptChangedEvent(Changed.LINK); g.HasGroupChanged = true; // Persist - g.AreUpdatesSuspended = false; g.ScheduleGroupForFullUpdate(); } } diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 4d610f4c13..6104c661b0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -113,25 +113,8 @@ namespace OpenSim.Region.Framework.Scenes private long m_maxPersistTime = 0; private long m_minPersistTime = 0; private Random m_rand; - private bool m_suspendUpdates; private List m_linkedAvatars = new List(); - public bool AreUpdatesSuspended - { - get - { - return m_suspendUpdates; - } - set - { - m_suspendUpdates = value; - if (!value) - { - QueueForUpdateCheck(); - } - } - } - /// /// This indicates whether the object has changed such that it needs to be repersisted to permenant storage /// (the database). diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 0148394630..5f7b95f67c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs @@ -1775,13 +1775,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { try { - parts[0].ParentGroup.AreUpdatesSuspended = true; foreach (SceneObjectPart part in parts) SetAlpha(part, alpha, face); } finally { - parts[0].ParentGroup.AreUpdatesSuspended = false; } } } @@ -1962,13 +1960,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { try { - parts[0].ParentGroup.AreUpdatesSuspended = true; foreach (SceneObjectPart part in parts) SetTexture(part, texture, face); } finally { - parts[0].ParentGroup.AreUpdatesSuspended = false; } } ScriptSleep(200); @@ -3931,13 +3927,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { try { - parts[0].ParentGroup.AreUpdatesSuspended = true; foreach (SceneObjectPart part in parts) part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face); } finally { - parts[0].ParentGroup.AreUpdatesSuspended = false; } } } @@ -4055,7 +4049,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { try { - parts[0].ParentGroup.AreUpdatesSuspended = true; foreach (SceneObjectPart part in parts) { parentPrim.DelinkFromGroup(part.LocalId, true); @@ -4063,7 +4056,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } finally { - parts[0].ParentGroup.AreUpdatesSuspended = false; } } @@ -4078,7 +4070,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api try { - parts[0].ParentGroup.AreUpdatesSuspended = true; foreach (SceneObjectPart part in parts) { part.ClearUpdateSchedule(); @@ -4087,7 +4078,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } finally { - parts[0].ParentGroup.AreUpdatesSuspended = false; } @@ -6302,7 +6292,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api { try { - parts[0].ParentGroup.AreUpdatesSuspended = true; foreach (var part in parts) { SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate); @@ -6310,7 +6299,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api } finally { - parts[0].ParentGroup.AreUpdatesSuspended = false; } } }