OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove AreUpdatesSuspended flag because it does nothing

avinationmerge
Melanie 2012-08-16 01:18:32 +02:00
parent b97053269b
commit bbac8f76fa
3 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -1793,7 +1793,6 @@ namespace OpenSim.Region.Framework.Scenes
try try
{ {
parentGroup.AreUpdatesSuspended = true;
List<SceneObjectGroup> childGroups = new List<SceneObjectGroup>(); List<SceneObjectGroup> childGroups = new List<SceneObjectGroup>();
@ -1850,7 +1849,6 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectGroupsByLocalPartID[part.LocalId] = parentGroup; SceneObjectGroupsByLocalPartID[part.LocalId] = parentGroup;
} }
parentGroup.AreUpdatesSuspended = false;
parentGroup.HasGroupChanged = true; parentGroup.HasGroupChanged = true;
parentGroup.ProcessBackup(m_parentScene.SimulationDataService, true); parentGroup.ProcessBackup(m_parentScene.SimulationDataService, true);
parentGroup.ScheduleGroupForFullUpdate(); parentGroup.ScheduleGroupForFullUpdate();
@ -1896,7 +1894,6 @@ namespace OpenSim.Region.Framework.Scenes
SceneObjectGroup group = part.ParentGroup; SceneObjectGroup group = part.ParentGroup;
if (!affectedGroups.Contains(group)) if (!affectedGroups.Contains(group))
{ {
group.AreUpdatesSuspended = true;
affectedGroups.Add(group); affectedGroups.Add(group);
} }
} }
@ -1922,7 +1919,6 @@ namespace OpenSim.Region.Framework.Scenes
// However, editing linked parts and unlinking may be different // However, editing linked parts and unlinking may be different
// //
SceneObjectGroup group = root.ParentGroup; SceneObjectGroup group = root.ParentGroup;
group.AreUpdatesSuspended = true;
List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts); List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts);
int numChildren = newSet.Count; int numChildren = newSet.Count;
@ -1945,7 +1941,6 @@ namespace OpenSim.Region.Framework.Scenes
group.DelinkFromGroup(p, sendEventsToRemainder); group.DelinkFromGroup(p, sendEventsToRemainder);
if (numChildren > 2) if (numChildren > 2)
{ {
p.ParentGroup.AreUpdatesSuspended = true;
} }
else else
{ {
@ -1980,7 +1975,6 @@ namespace OpenSim.Region.Framework.Scenes
foreach (SceneObjectPart newChild in newSet) foreach (SceneObjectPart newChild in newSet)
newChild.ClearUpdateSchedule(); newChild.ClearUpdateSchedule();
newRoot.ParentGroup.AreUpdatesSuspended = true;
LinkObjects(newRoot, newSet); LinkObjects(newRoot, newSet);
if (!affectedGroups.Contains(newRoot.ParentGroup)) if (!affectedGroups.Contains(newRoot.ParentGroup))
affectedGroups.Add(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); m_parentScene.SimulationDataService.RemoveObject(g.UUID, m_parentScene.RegionInfo.RegionID);
g.TriggerScriptChangedEvent(Changed.LINK); g.TriggerScriptChangedEvent(Changed.LINK);
g.HasGroupChanged = true; // Persist g.HasGroupChanged = true; // Persist
g.AreUpdatesSuspended = false;
g.ScheduleGroupForFullUpdate(); g.ScheduleGroupForFullUpdate();
} }
} }

17
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -113,25 +113,8 @@ namespace OpenSim.Region.Framework.Scenes
private long m_maxPersistTime = 0; private long m_maxPersistTime = 0;
private long m_minPersistTime = 0; private long m_minPersistTime = 0;
private Random m_rand; private Random m_rand;
private bool m_suspendUpdates;
private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>(); private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>();
public bool AreUpdatesSuspended
{
get
{
return m_suspendUpdates;
}
set
{
m_suspendUpdates = value;
if (!value)
{
QueueForUpdateCheck();
}
}
}
/// <summary> /// <summary>
/// This indicates whether the object has changed such that it needs to be repersisted to permenant storage /// This indicates whether the object has changed such that it needs to be repersisted to permenant storage
/// (the database). /// (the database).

12
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -1775,13 +1775,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
try try
{ {
parts[0].ParentGroup.AreUpdatesSuspended = true;
foreach (SceneObjectPart part in parts) foreach (SceneObjectPart part in parts)
SetAlpha(part, alpha, face); SetAlpha(part, alpha, face);
} }
finally finally
{ {
parts[0].ParentGroup.AreUpdatesSuspended = false;
} }
} }
} }
@ -1962,13 +1960,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
try try
{ {
parts[0].ParentGroup.AreUpdatesSuspended = true;
foreach (SceneObjectPart part in parts) foreach (SceneObjectPart part in parts)
SetTexture(part, texture, face); SetTexture(part, texture, face);
} }
finally finally
{ {
parts[0].ParentGroup.AreUpdatesSuspended = false;
} }
} }
ScriptSleep(200); ScriptSleep(200);
@ -3931,13 +3927,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
try try
{ {
parts[0].ParentGroup.AreUpdatesSuspended = true;
foreach (SceneObjectPart part in parts) foreach (SceneObjectPart part in parts)
part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face); part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face);
} }
finally finally
{ {
parts[0].ParentGroup.AreUpdatesSuspended = false;
} }
} }
} }
@ -4055,7 +4049,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
try try
{ {
parts[0].ParentGroup.AreUpdatesSuspended = true;
foreach (SceneObjectPart part in parts) foreach (SceneObjectPart part in parts)
{ {
parentPrim.DelinkFromGroup(part.LocalId, true); parentPrim.DelinkFromGroup(part.LocalId, true);
@ -4063,7 +4056,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
finally finally
{ {
parts[0].ParentGroup.AreUpdatesSuspended = false;
} }
} }
@ -4078,7 +4070,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
try try
{ {
parts[0].ParentGroup.AreUpdatesSuspended = true;
foreach (SceneObjectPart part in parts) foreach (SceneObjectPart part in parts)
{ {
part.ClearUpdateSchedule(); part.ClearUpdateSchedule();
@ -4087,7 +4078,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
finally finally
{ {
parts[0].ParentGroup.AreUpdatesSuspended = false;
} }
@ -6302,7 +6292,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
try try
{ {
parts[0].ParentGroup.AreUpdatesSuspended = true;
foreach (var part in parts) foreach (var part in parts)
{ {
SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate); SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
@ -6310,7 +6299,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
finally finally
{ {
parts[0].ParentGroup.AreUpdatesSuspended = false;
} }
} }
} }