diff options
author | Justin Clarke Casey | 2008-11-10 20:04:55 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-10 20:04:55 +0000 |
commit | 0e180b0ad30d5f468be1c239865688449b8747cc (patch) | |
tree | 4d442315d268836641cb2b10e6937a0d308bdc18 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |
parent | Removed some debug output I forgot to remove... (diff) | |
download | opensim-SC-0e180b0ad30d5f468be1c239865688449b8747cc.zip opensim-SC-0e180b0ad30d5f468be1c239865688449b8747cc.tar.gz opensim-SC-0e180b0ad30d5f468be1c239865688449b8747cc.tar.bz2 opensim-SC-0e180b0ad30d5f468be1c239865688449b8747cc.tar.xz |
* refactor: Expose SOG.SetRootPart for outsiders to use rather than setting RootPart and adding the part separately
* Make RootPart read only
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 8f88d8e..d2bd698 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -184,10 +184,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
184 | set { m_parts = value; } | 184 | set { m_parts = value; } |
185 | } | 185 | } |
186 | 186 | ||
187 | /// <value> | ||
188 | /// The root part of this scene object | ||
189 | /// </value> | ||
187 | public SceneObjectPart RootPart | 190 | public SceneObjectPart RootPart |
188 | { | 191 | { |
189 | get { return m_rootPart; } | 192 | get { return m_rootPart; } |
190 | set { m_rootPart = value; } | ||
191 | } | 193 | } |
192 | 194 | ||
193 | public ulong RegionHandle | 195 | public ulong RegionHandle |
@@ -877,7 +879,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
877 | /// Set a part to act as the root part for this scene object | 879 | /// Set a part to act as the root part for this scene object |
878 | /// </summary> | 880 | /// </summary> |
879 | /// <param name="part"></param> | 881 | /// <param name="part"></param> |
880 | private void SetRootPart(SceneObjectPart part) | 882 | public void SetRootPart(SceneObjectPart part) |
881 | { | 883 | { |
882 | part.SetParent(this); | 884 | part.SetParent(this); |
883 | part.ParentID = 0; | 885 | part.ParentID = 0; |
@@ -1886,7 +1888,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1886 | 1888 | ||
1887 | m_scene.UnlinkSceneObject(objectGroup.UUID, true); | 1889 | m_scene.UnlinkSceneObject(objectGroup.UUID, true); |
1888 | objectGroup.Children.Clear(); | 1890 | objectGroup.Children.Clear(); |
1889 | objectGroup.RootPart = null; | 1891 | objectGroup.m_rootPart = null; |
1890 | 1892 | ||
1891 | // TODO Deleting the original group object may cause problems later on if they have already | 1893 | // TODO Deleting the original group object may cause problems later on if they have already |
1892 | // made it into the update queue. However, sending out updates for those parts is now | 1894 | // made it into the update queue. However, sending out updates for those parts is now |