aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs14
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs24
3 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index e0260e2..a1da5ee 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1793,7 +1793,7 @@ namespace OpenSim.Region.Framework.Scenes
1793 1793
1794 try 1794 try
1795 { 1795 {
1796 parentGroup.areUpdatesSuspended = true; 1796 parentGroup.AreUpdatesSuspended = true;
1797 1797
1798 List<SceneObjectGroup> childGroups = new List<SceneObjectGroup>(); 1798 List<SceneObjectGroup> childGroups = new List<SceneObjectGroup>();
1799 1799
@@ -1850,7 +1850,7 @@ namespace OpenSim.Region.Framework.Scenes
1850 SceneObjectGroupsByLocalPartID[part.LocalId] = parentGroup; 1850 SceneObjectGroupsByLocalPartID[part.LocalId] = parentGroup;
1851 } 1851 }
1852 1852
1853 parentGroup.areUpdatesSuspended = false; 1853 parentGroup.AreUpdatesSuspended = false;
1854 parentGroup.HasGroupChanged = true; 1854 parentGroup.HasGroupChanged = true;
1855 parentGroup.ProcessBackup(m_parentScene.SimulationDataService, true); 1855 parentGroup.ProcessBackup(m_parentScene.SimulationDataService, true);
1856 parentGroup.ScheduleGroupForFullUpdate(); 1856 parentGroup.ScheduleGroupForFullUpdate();
@@ -1896,7 +1896,7 @@ namespace OpenSim.Region.Framework.Scenes
1896 SceneObjectGroup group = part.ParentGroup; 1896 SceneObjectGroup group = part.ParentGroup;
1897 if (!affectedGroups.Contains(group)) 1897 if (!affectedGroups.Contains(group))
1898 { 1898 {
1899 group.areUpdatesSuspended = true; 1899 group.AreUpdatesSuspended = true;
1900 affectedGroups.Add(group); 1900 affectedGroups.Add(group);
1901 } 1901 }
1902 } 1902 }
@@ -1922,7 +1922,7 @@ namespace OpenSim.Region.Framework.Scenes
1922 // However, editing linked parts and unlinking may be different 1922 // However, editing linked parts and unlinking may be different
1923 // 1923 //
1924 SceneObjectGroup group = root.ParentGroup; 1924 SceneObjectGroup group = root.ParentGroup;
1925 group.areUpdatesSuspended = true; 1925 group.AreUpdatesSuspended = true;
1926 1926
1927 List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts); 1927 List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts);
1928 int numChildren = newSet.Count; 1928 int numChildren = newSet.Count;
@@ -1945,7 +1945,7 @@ namespace OpenSim.Region.Framework.Scenes
1945 group.DelinkFromGroup(p, sendEventsToRemainder); 1945 group.DelinkFromGroup(p, sendEventsToRemainder);
1946 if (numChildren > 2) 1946 if (numChildren > 2)
1947 { 1947 {
1948 p.ParentGroup.areUpdatesSuspended = true; 1948 p.ParentGroup.AreUpdatesSuspended = true;
1949 } 1949 }
1950 else 1950 else
1951 { 1951 {
@@ -1980,7 +1980,7 @@ namespace OpenSim.Region.Framework.Scenes
1980 foreach (SceneObjectPart newChild in newSet) 1980 foreach (SceneObjectPart newChild in newSet)
1981 newChild.ClearUpdateSchedule(); 1981 newChild.ClearUpdateSchedule();
1982 1982
1983 newRoot.ParentGroup.areUpdatesSuspended = true; 1983 newRoot.ParentGroup.AreUpdatesSuspended = true;
1984 LinkObjects(newRoot, newSet); 1984 LinkObjects(newRoot, newSet);
1985 if (!affectedGroups.Contains(newRoot.ParentGroup)) 1985 if (!affectedGroups.Contains(newRoot.ParentGroup))
1986 affectedGroups.Add(newRoot.ParentGroup); 1986 affectedGroups.Add(newRoot.ParentGroup);
@@ -1998,7 +1998,7 @@ namespace OpenSim.Region.Framework.Scenes
1998 m_parentScene.SimulationDataService.RemoveObject(g.UUID, m_parentScene.RegionInfo.RegionID); 1998 m_parentScene.SimulationDataService.RemoveObject(g.UUID, m_parentScene.RegionInfo.RegionID);
1999 g.TriggerScriptChangedEvent(Changed.LINK); 1999 g.TriggerScriptChangedEvent(Changed.LINK);
2000 g.HasGroupChanged = true; // Persist 2000 g.HasGroupChanged = true; // Persist
2001 g.areUpdatesSuspended = false; 2001 g.AreUpdatesSuspended = false;
2002 g.ScheduleGroupForFullUpdate(); 2002 g.ScheduleGroupForFullUpdate();
2003 } 2003 }
2004 } 2004 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index d837adb..4d610f4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Region.Framework.Scenes
116 private bool m_suspendUpdates; 116 private bool m_suspendUpdates;
117 private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>(); 117 private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>();
118 118
119 public bool areUpdatesSuspended 119 public bool AreUpdatesSuspended
120 { 120 {
121 get 121 get
122 { 122 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 5264613..0148394 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1775,13 +1775,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1775 { 1775 {
1776 try 1776 try
1777 { 1777 {
1778 parts[0].ParentGroup.areUpdatesSuspended = true; 1778 parts[0].ParentGroup.AreUpdatesSuspended = true;
1779 foreach (SceneObjectPart part in parts) 1779 foreach (SceneObjectPart part in parts)
1780 SetAlpha(part, alpha, face); 1780 SetAlpha(part, alpha, face);
1781 } 1781 }
1782 finally 1782 finally
1783 { 1783 {
1784 parts[0].ParentGroup.areUpdatesSuspended = false; 1784 parts[0].ParentGroup.AreUpdatesSuspended = false;
1785 } 1785 }
1786 } 1786 }
1787 } 1787 }
@@ -1962,13 +1962,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1962 { 1962 {
1963 try 1963 try
1964 { 1964 {
1965 parts[0].ParentGroup.areUpdatesSuspended = true; 1965 parts[0].ParentGroup.AreUpdatesSuspended = true;
1966 foreach (SceneObjectPart part in parts) 1966 foreach (SceneObjectPart part in parts)
1967 SetTexture(part, texture, face); 1967 SetTexture(part, texture, face);
1968 } 1968 }
1969 finally 1969 finally
1970 { 1970 {
1971 parts[0].ParentGroup.areUpdatesSuspended = false; 1971 parts[0].ParentGroup.AreUpdatesSuspended = false;
1972 } 1972 }
1973 } 1973 }
1974 ScriptSleep(200); 1974 ScriptSleep(200);
@@ -3931,13 +3931,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3931 { 3931 {
3932 try 3932 try
3933 { 3933 {
3934 parts[0].ParentGroup.areUpdatesSuspended = true; 3934 parts[0].ParentGroup.AreUpdatesSuspended = true;
3935 foreach (SceneObjectPart part in parts) 3935 foreach (SceneObjectPart part in parts)
3936 part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face); 3936 part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face);
3937 } 3937 }
3938 finally 3938 finally
3939 { 3939 {
3940 parts[0].ParentGroup.areUpdatesSuspended = false; 3940 parts[0].ParentGroup.AreUpdatesSuspended = false;
3941 } 3941 }
3942 } 3942 }
3943 } 3943 }
@@ -4055,7 +4055,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4055 { 4055 {
4056 try 4056 try
4057 { 4057 {
4058 parts[0].ParentGroup.areUpdatesSuspended = true; 4058 parts[0].ParentGroup.AreUpdatesSuspended = true;
4059 foreach (SceneObjectPart part in parts) 4059 foreach (SceneObjectPart part in parts)
4060 { 4060 {
4061 parentPrim.DelinkFromGroup(part.LocalId, true); 4061 parentPrim.DelinkFromGroup(part.LocalId, true);
@@ -4063,7 +4063,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4063 } 4063 }
4064 finally 4064 finally
4065 { 4065 {
4066 parts[0].ParentGroup.areUpdatesSuspended = false; 4066 parts[0].ParentGroup.AreUpdatesSuspended = false;
4067 } 4067 }
4068 } 4068 }
4069 4069
@@ -4078,7 +4078,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4078 4078
4079 try 4079 try
4080 { 4080 {
4081 parts[0].ParentGroup.areUpdatesSuspended = true; 4081 parts[0].ParentGroup.AreUpdatesSuspended = true;
4082 foreach (SceneObjectPart part in parts) 4082 foreach (SceneObjectPart part in parts)
4083 { 4083 {
4084 part.ClearUpdateSchedule(); 4084 part.ClearUpdateSchedule();
@@ -4087,7 +4087,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4087 } 4087 }
4088 finally 4088 finally
4089 { 4089 {
4090 parts[0].ParentGroup.areUpdatesSuspended = false; 4090 parts[0].ParentGroup.AreUpdatesSuspended = false;
4091 } 4091 }
4092 4092
4093 4093
@@ -6302,7 +6302,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6302 { 6302 {
6303 try 6303 try
6304 { 6304 {
6305 parts[0].ParentGroup.areUpdatesSuspended = true; 6305 parts[0].ParentGroup.AreUpdatesSuspended = true;
6306 foreach (var part in parts) 6306 foreach (var part in parts)
6307 { 6307 {
6308 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate); 6308 SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate);
@@ -6310,7 +6310,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6310 } 6310 }
6311 finally 6311 finally
6312 { 6312 {
6313 parts[0].ParentGroup.areUpdatesSuspended = false; 6313 parts[0].ParentGroup.AreUpdatesSuspended = false;
6314 } 6314 }
6315 } 6315 }
6316 } 6316 }