aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObject.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObject.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObject.cs15
1 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 2c55a7d..c03354e 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Environment.Scenes
74 m_regionHandle = regionHandle; 74 m_regionHandle = regionHandle;
75 m_world = world; 75 m_world = world;
76 this.Pos = addPacket.ObjectData.RayEnd; 76 this.Pos = addPacket.ObjectData.RayEnd;
77 this.CreateFromPacket(addPacket, ownerID, localID); 77 this.CreateRootFromPacket(addPacket, ownerID, localID);
78 78
79 } 79 }
80 /// <summary> 80 /// <summary>
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Environment.Scenes
83 /// <param name="addPacket"></param> 83 /// <param name="addPacket"></param>
84 /// <param name="agentID"></param> 84 /// <param name="agentID"></param>
85 /// <param name="localID"></param> 85 /// <param name="localID"></param>
86 public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID) 86 public void CreateRootFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID)
87 { 87 {
88 this.rootPrimitive = new Primitive( this.m_regionHandle, this.m_world, addPacket, agentID, localID, true, this, this); 88 this.rootPrimitive = new Primitive( this.m_regionHandle, this.m_world, addPacket, agentID, localID, true, this, this);
89 this.children.Add(rootPrimitive); 89 this.children.Add(rootPrimitive);
@@ -99,6 +99,15 @@ namespace OpenSim.Region.Environment.Scenes
99 99
100 } 100 }
101 101
102 /// <summary>
103 ///
104 /// </summary>
105 public void DeleteAllChildren()
106 {
107 this.children.Clear();
108 this.ChildPrimitives.Clear();
109 this.rootPrimitive = null;
110 }
102 111
103 /// <summary> 112 /// <summary>
104 /// 113 ///
@@ -106,7 +115,7 @@ namespace OpenSim.Region.Environment.Scenes
106 /// <param name="primObject"></param> 115 /// <param name="primObject"></param>
107 public void AddNewChildPrims(SceneObject primObject) 116 public void AddNewChildPrims(SceneObject primObject)
108 { 117 {
109 this.rootPrimitive.AddToChildren(primObject); 118 this.rootPrimitive.AddNewChildren(primObject);
110 } 119 }
111 120
112 /// <summary> 121 /// <summary>