aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/ContentManagementSystem
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-10 20:04:55 +0000
committerJustin Clarke Casey2008-11-10 20:04:55 +0000
commit0e180b0ad30d5f468be1c239865688449b8747cc (patch)
tree4d442315d268836641cb2b10e6937a0d308bdc18 /OpenSim/Region/Environment/Modules/ContentManagementSystem
parentRemoved some debug output I forgot to remove... (diff)
downloadopensim-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/Modules/ContentManagementSystem')
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/MetaEntity.cs1
-rw-r--r--OpenSim/Region/Environment/Modules/ContentManagementSystem/PointMetaEntity.cs6
2 files changed, 1 insertions, 6 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
132 public SceneObjectPart RootPart 132 public SceneObjectPart RootPart
133 { 133 {
134 get { return m_Entity.RootPart; } 134 get { return m_Entity.RootPart; }
135 set { m_Entity.RootPart = value; }
136 } 135 }
137 136
138 public Scene Scene 137 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
104 104
105 //Initialize group and add part as root part 105 //Initialize group and add part as root part
106 x.SetScene(scene); 106 x.SetScene(scene);
107 y.SetParent(x); 107 x.SetRootPart(y);
108 y.ParentID = 0;
109 y.LinkNum = 0;
110 x.Children.Add(y.UUID, y);
111 x.RootPart = y;
112 x.RegionHandle = scene.RegionInfo.RegionHandle; 108 x.RegionHandle = scene.RegionInfo.RegionHandle;
113 x.SetScene(scene); 109 x.SetScene(scene);
114 110