diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs | 6 |
2 files changed, 7 insertions, 7 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 |
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs index 4a038e2..de37eb4 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs +++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTests.cs | |||
@@ -78,10 +78,8 @@ namespace OpenSim.Region.Environment.Scenes.Tests | |||
78 | SceneObjectPart part | 78 | SceneObjectPart part |
79 | = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero); | 79 | = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero); |
80 | //part.UpdatePrimFlags(false, false, true); | 80 | //part.UpdatePrimFlags(false, false, true); |
81 | part.ObjectFlags |= (uint)PrimFlags.Phantom; | 81 | part.ObjectFlags |= (uint)PrimFlags.Phantom; |
82 | 82 | sceneObject.SetRootPart(part); | |
83 | sceneObject.RootPart = part; | ||
84 | sceneObject.AddPart(part); | ||
85 | 83 | ||
86 | scene.AddNewSceneObject(sceneObject, false); | 84 | scene.AddNewSceneObject(sceneObject, false); |
87 | 85 | ||