diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 17 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 |
3 files changed, 0 insertions, 36 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index a1da5ee..e29b2c1 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1793,7 +1793,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1793 | 1793 | ||
1794 | try | 1794 | try |
1795 | { | 1795 | { |
1796 | parentGroup.AreUpdatesSuspended = true; | ||
1797 | 1796 | ||
1798 | List<SceneObjectGroup> childGroups = new List<SceneObjectGroup>(); | 1797 | List<SceneObjectGroup> childGroups = new List<SceneObjectGroup>(); |
1799 | 1798 | ||
@@ -1850,7 +1849,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1850 | SceneObjectGroupsByLocalPartID[part.LocalId] = parentGroup; | 1849 | SceneObjectGroupsByLocalPartID[part.LocalId] = parentGroup; |
1851 | } | 1850 | } |
1852 | 1851 | ||
1853 | parentGroup.AreUpdatesSuspended = false; | ||
1854 | parentGroup.HasGroupChanged = true; | 1852 | parentGroup.HasGroupChanged = true; |
1855 | parentGroup.ProcessBackup(m_parentScene.SimulationDataService, true); | 1853 | parentGroup.ProcessBackup(m_parentScene.SimulationDataService, true); |
1856 | parentGroup.ScheduleGroupForFullUpdate(); | 1854 | parentGroup.ScheduleGroupForFullUpdate(); |
@@ -1896,7 +1894,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1896 | SceneObjectGroup group = part.ParentGroup; | 1894 | SceneObjectGroup group = part.ParentGroup; |
1897 | if (!affectedGroups.Contains(group)) | 1895 | if (!affectedGroups.Contains(group)) |
1898 | { | 1896 | { |
1899 | group.AreUpdatesSuspended = true; | ||
1900 | affectedGroups.Add(group); | 1897 | affectedGroups.Add(group); |
1901 | } | 1898 | } |
1902 | } | 1899 | } |
@@ -1922,7 +1919,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1922 | // However, editing linked parts and unlinking may be different | 1919 | // However, editing linked parts and unlinking may be different |
1923 | // | 1920 | // |
1924 | SceneObjectGroup group = root.ParentGroup; | 1921 | SceneObjectGroup group = root.ParentGroup; |
1925 | group.AreUpdatesSuspended = true; | ||
1926 | 1922 | ||
1927 | List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts); | 1923 | List<SceneObjectPart> newSet = new List<SceneObjectPart>(group.Parts); |
1928 | int numChildren = newSet.Count; | 1924 | int numChildren = newSet.Count; |
@@ -1945,7 +1941,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1945 | group.DelinkFromGroup(p, sendEventsToRemainder); | 1941 | group.DelinkFromGroup(p, sendEventsToRemainder); |
1946 | if (numChildren > 2) | 1942 | if (numChildren > 2) |
1947 | { | 1943 | { |
1948 | p.ParentGroup.AreUpdatesSuspended = true; | ||
1949 | } | 1944 | } |
1950 | else | 1945 | else |
1951 | { | 1946 | { |
@@ -1980,7 +1975,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1980 | foreach (SceneObjectPart newChild in newSet) | 1975 | foreach (SceneObjectPart newChild in newSet) |
1981 | newChild.ClearUpdateSchedule(); | 1976 | newChild.ClearUpdateSchedule(); |
1982 | 1977 | ||
1983 | newRoot.ParentGroup.AreUpdatesSuspended = true; | ||
1984 | LinkObjects(newRoot, newSet); | 1978 | LinkObjects(newRoot, newSet); |
1985 | if (!affectedGroups.Contains(newRoot.ParentGroup)) | 1979 | if (!affectedGroups.Contains(newRoot.ParentGroup)) |
1986 | affectedGroups.Add(newRoot.ParentGroup); | 1980 | affectedGroups.Add(newRoot.ParentGroup); |
@@ -1998,7 +1992,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1998 | m_parentScene.SimulationDataService.RemoveObject(g.UUID, m_parentScene.RegionInfo.RegionID); | 1992 | m_parentScene.SimulationDataService.RemoveObject(g.UUID, m_parentScene.RegionInfo.RegionID); |
1999 | g.TriggerScriptChangedEvent(Changed.LINK); | 1993 | g.TriggerScriptChangedEvent(Changed.LINK); |
2000 | g.HasGroupChanged = true; // Persist | 1994 | g.HasGroupChanged = true; // Persist |
2001 | g.AreUpdatesSuspended = false; | ||
2002 | g.ScheduleGroupForFullUpdate(); | 1995 | g.ScheduleGroupForFullUpdate(); |
2003 | } | 1996 | } |
2004 | } | 1997 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 4d610f4..6104c66 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -113,25 +113,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
113 | private long m_maxPersistTime = 0; | 113 | private long m_maxPersistTime = 0; |
114 | private long m_minPersistTime = 0; | 114 | private long m_minPersistTime = 0; |
115 | private Random m_rand; | 115 | private Random m_rand; |
116 | private bool m_suspendUpdates; | ||
117 | private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>(); | 116 | private List<ScenePresence> m_linkedAvatars = new List<ScenePresence>(); |
118 | 117 | ||
119 | public bool AreUpdatesSuspended | ||
120 | { | ||
121 | get | ||
122 | { | ||
123 | return m_suspendUpdates; | ||
124 | } | ||
125 | set | ||
126 | { | ||
127 | m_suspendUpdates = value; | ||
128 | if (!value) | ||
129 | { | ||
130 | QueueForUpdateCheck(); | ||
131 | } | ||
132 | } | ||
133 | } | ||
134 | |||
135 | /// <summary> | 118 | /// <summary> |
136 | /// This indicates whether the object has changed such that it needs to be repersisted to permenant storage | 119 | /// This indicates whether the object has changed such that it needs to be repersisted to permenant storage |
137 | /// (the database). | 120 | /// (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 0148394..5f7b95f 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 | |||
1775 | { | 1775 | { |
1776 | try | 1776 | try |
1777 | { | 1777 | { |
1778 | parts[0].ParentGroup.AreUpdatesSuspended = true; | ||
1779 | foreach (SceneObjectPart part in parts) | 1778 | foreach (SceneObjectPart part in parts) |
1780 | SetAlpha(part, alpha, face); | 1779 | SetAlpha(part, alpha, face); |
1781 | } | 1780 | } |
1782 | finally | 1781 | finally |
1783 | { | 1782 | { |
1784 | parts[0].ParentGroup.AreUpdatesSuspended = false; | ||
1785 | } | 1783 | } |
1786 | } | 1784 | } |
1787 | } | 1785 | } |
@@ -1962,13 +1960,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
1962 | { | 1960 | { |
1963 | try | 1961 | try |
1964 | { | 1962 | { |
1965 | parts[0].ParentGroup.AreUpdatesSuspended = true; | ||
1966 | foreach (SceneObjectPart part in parts) | 1963 | foreach (SceneObjectPart part in parts) |
1967 | SetTexture(part, texture, face); | 1964 | SetTexture(part, texture, face); |
1968 | } | 1965 | } |
1969 | finally | 1966 | finally |
1970 | { | 1967 | { |
1971 | parts[0].ParentGroup.AreUpdatesSuspended = false; | ||
1972 | } | 1968 | } |
1973 | } | 1969 | } |
1974 | ScriptSleep(200); | 1970 | ScriptSleep(200); |
@@ -3931,13 +3927,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3931 | { | 3927 | { |
3932 | try | 3928 | try |
3933 | { | 3929 | { |
3934 | parts[0].ParentGroup.AreUpdatesSuspended = true; | ||
3935 | foreach (SceneObjectPart part in parts) | 3930 | foreach (SceneObjectPart part in parts) |
3936 | part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face); | 3931 | part.SetFaceColor(new Vector3((float)color.x, (float)color.y, (float)color.z), face); |
3937 | } | 3932 | } |
3938 | finally | 3933 | finally |
3939 | { | 3934 | { |
3940 | parts[0].ParentGroup.AreUpdatesSuspended = false; | ||
3941 | } | 3935 | } |
3942 | } | 3936 | } |
3943 | } | 3937 | } |
@@ -4055,7 +4049,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4055 | { | 4049 | { |
4056 | try | 4050 | try |
4057 | { | 4051 | { |
4058 | parts[0].ParentGroup.AreUpdatesSuspended = true; | ||
4059 | foreach (SceneObjectPart part in parts) | 4052 | foreach (SceneObjectPart part in parts) |
4060 | { | 4053 | { |
4061 | parentPrim.DelinkFromGroup(part.LocalId, true); | 4054 | parentPrim.DelinkFromGroup(part.LocalId, true); |
@@ -4063,7 +4056,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4063 | } | 4056 | } |
4064 | finally | 4057 | finally |
4065 | { | 4058 | { |
4066 | parts[0].ParentGroup.AreUpdatesSuspended = false; | ||
4067 | } | 4059 | } |
4068 | } | 4060 | } |
4069 | 4061 | ||
@@ -4078,7 +4070,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4078 | 4070 | ||
4079 | try | 4071 | try |
4080 | { | 4072 | { |
4081 | parts[0].ParentGroup.AreUpdatesSuspended = true; | ||
4082 | foreach (SceneObjectPart part in parts) | 4073 | foreach (SceneObjectPart part in parts) |
4083 | { | 4074 | { |
4084 | part.ClearUpdateSchedule(); | 4075 | part.ClearUpdateSchedule(); |
@@ -4087,7 +4078,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4087 | } | 4078 | } |
4088 | finally | 4079 | finally |
4089 | { | 4080 | { |
4090 | parts[0].ParentGroup.AreUpdatesSuspended = false; | ||
4091 | } | 4081 | } |
4092 | 4082 | ||
4093 | 4083 | ||
@@ -6302,7 +6292,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6302 | { | 6292 | { |
6303 | try | 6293 | try |
6304 | { | 6294 | { |
6305 | parts[0].ParentGroup.AreUpdatesSuspended = true; | ||
6306 | foreach (var part in parts) | 6295 | foreach (var part in parts) |
6307 | { | 6296 | { |
6308 | SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate); | 6297 | SetTextureAnim(part, mode, face, sizex, sizey, start, length, rate); |
@@ -6310,7 +6299,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6310 | } | 6299 | } |
6311 | finally | 6300 | finally |
6312 | { | 6301 | { |
6313 | parts[0].ParentGroup.AreUpdatesSuspended = false; | ||
6314 | } | 6302 | } |
6315 | } | 6303 | } |
6316 | } | 6304 | } |