aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObject.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObject.cs19
1 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 7992b17..95db271 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment.Scenes
88 this.CreateRootFromShape(ownerID, localID, shape, pos); 88 this.CreateRootFromShape(ownerID, localID, shape, pos);
89 89
90 registerEvents(); 90 registerEvents();
91 91
92 } 92 }
93 93
94 /// <summary> 94 /// <summary>
@@ -97,7 +97,7 @@ namespace OpenSim.Region.Environment.Scenes
97 /// <remarks>Need a null constructor for duplication</remarks> 97 /// <remarks>Need a null constructor for duplication</remarks>
98 public SceneObject() 98 public SceneObject()
99 { 99 {
100 100
101 } 101 }
102 102
103 public void registerEvents() 103 public void registerEvents()
@@ -121,18 +121,15 @@ namespace OpenSim.Region.Environment.Scenes
121 datastore.StoreObject(this); 121 datastore.StoreObject(this);
122 } 122 }
123 123
124
125 /// <summary> 124 /// <summary>
126 /// Sends my primitive info to the parcel manager for it to keep tally of all of the prims! 125 /// Sends my primitive info to the parcel manager for it to keep tally of all of the prims!
127 /// </summary> 126 /// </summary>
128 private void ProcessParcelPrimCountUpdate() 127 private void ProcessParcelPrimCountUpdate()
129 { 128 {
129
130 m_eventManager.TriggerParcelPrimCountAdd(this); 130 m_eventManager.TriggerParcelPrimCountAdd(this);
131 } 131 }
132 132
133
134
135
136 /// <summary> 133 /// <summary>
137 /// 134 ///
138 /// </summary> 135 /// </summary>
@@ -141,7 +138,9 @@ namespace OpenSim.Region.Environment.Scenes
141 /// <param name="localID"></param> 138 /// <param name="localID"></param>
142 public void CreateRootFromShape(LLUUID agentID, uint localID, PrimitiveBaseShape shape, LLVector3 pos) 139 public void CreateRootFromShape(LLUUID agentID, uint localID, PrimitiveBaseShape shape, LLVector3 pos)
143 { 140 {
144 this.rootPrimitive = new Primitive(this.m_regionHandle, this.m_world,this.m_eventManager, agentID, localID, true, this, this, shape, pos); 141
142 this.rootPrimitive = new Primitive(this.m_regionHandle, this.m_world, agentID, localID, true, this, this, shape, pos);
143
145 this.children.Add(rootPrimitive); 144 this.children.Add(rootPrimitive);
146 this.ChildPrimitives.Add(this.rootUUID, this.rootPrimitive); 145 this.ChildPrimitives.Add(this.rootUUID, this.rootPrimitive);
147 } 146 }
@@ -156,7 +155,7 @@ namespace OpenSim.Region.Environment.Scenes
156 } 155 }
157 156
158 /// <summary> 157 /// <summary>
159 /// Copies a prim or group of prims (SceneObject) -- TODO: cleanup code 158 /// Makes a copy of this SceneObject (and child primitives)
160 /// </summary> 159 /// </summary>
161 /// <returns>A complete copy of the object</returns> 160 /// <returns>A complete copy of the object</returns>
162 public new SceneObject Copy() 161 public new SceneObject Copy()
@@ -171,8 +170,8 @@ namespace OpenSim.Region.Environment.Scenes
171 dupe.children.Add(dupe.rootPrimitive); 170 dupe.children.Add(dupe.rootPrimitive);
172 dupe.rootPrimitive.Pos = this.Pos; 171 dupe.rootPrimitive.Pos = this.Pos;
173 dupe.Rotation = this.Rotation; 172 dupe.Rotation = this.Rotation;
174 LLUUID rootu= dupe.rootUUID; 173 LLUUID rootu = dupe.rootUUID;
175 uint rooti = dupe.rootLocalID; 174 uint rooti = dupe.rootLocalID;
176 175
177 dupe.registerEvents(); 176 dupe.registerEvents();
178 return dupe; 177 return dupe;