4 files changed, 8 insertions, 13 deletions

diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
index 801f8ff..d654a1a 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs
@@ -132,7 +132,6 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
         public SceneObjectPart RootPart
         {
             get { return m_Entity.RootPart; }
-            set { m_Entity.RootPart = value; }
         }
 
         public Scene Scene
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs
index bf7d944..5db9545 100644
--- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs
+++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs
@@ -104,11 +104,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
 
             //Initialize group and add part as root part
             x.SetScene(scene);
-            y.SetParent(x);
-            y.ParentID = 0;
-            y.LinkNum = 0;
-            x.Children.Add(y.UUID, y);
-            x.RootPart = y;
+            x.SetRootPart(y);
             x.RegionHandle = scene.RegionInfo.RegionHandle;
             x.SetScene(scene);
 
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
             set { m_parts = value; }
         }
 
+        /// <value>
+        /// The root part of this scene object
+        /// </value>
         public SceneObjectPart RootPart
         {
             get { return m_rootPart; }
-            set { m_rootPart = value; }
         }
 
         public ulong RegionHandle
@@ -877,7 +879,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// Set a part to act as the root part for this scene object
         /// </summary>
         /// <param name="part"></param>
-        private void SetRootPart(SceneObjectPart part)
+        public void SetRootPart(SceneObjectPart part)
         {            
             part.SetParent(this);
             part.ParentID = 0;
@@ -1886,7 +1888,7 @@ namespace OpenSim.Region.Environment.Scenes
 
             m_scene.UnlinkSceneObject(objectGroup.UUID, true);
             objectGroup.Children.Clear();
-            objectGroup.RootPart = null;
+            objectGroup.m_rootPart = null;
 
             // TODO Deleting the original group object may cause problems later on if they have already
             // 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
             SceneObjectPart part 
                 = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero);
             //part.UpdatePrimFlags(false, false, true);           
-            part.ObjectFlags |= (uint)PrimFlags.Phantom;
-            
-            sceneObject.RootPart = part;
-            sceneObject.AddPart(part);
+            part.ObjectFlags |= (uint)PrimFlags.Phantom;            
+            sceneObject.SetRootPart(part);
             
             scene.AddNewSceneObject(sceneObject, false);