diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
2 files changed, 8 insertions, 8 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 | { |