aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-07 21:07:14 +0000
committerJustin Clarke Casey2008-11-07 21:07:14 +0000
commit54e10e5b61aa543102bcc3a7415877c44aabb5df (patch)
treed16149d29a5ef4921e9256f6128cbb9cc17aadc0 /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
parent* refactor: stop unnecessary passing of scene to sog copy constructor (diff)
downloadopensim-SC_OLD-54e10e5b61aa543102bcc3a7415877c44aabb5df.zip
opensim-SC_OLD-54e10e5b61aa543102bcc3a7415877c44aabb5df.tar.gz
opensim-SC_OLD-54e10e5b61aa543102bcc3a7415877c44aabb5df.tar.bz2
opensim-SC_OLD-54e10e5b61aa543102bcc3a7415877c44aabb5df.tar.xz
* Stop requiring local ids in the SOG constructors.
* These are assigned when the object is attached to the scene
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs15
1 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index d746ec4..d2c4253 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -216,9 +216,9 @@ namespace OpenSim.Region.Environment.Scenes
216 Rezzed = DateTime.Now; 216 Rezzed = DateTime.Now;
217 } 217 }
218 218
219 public SceneObjectPart(SceneObjectGroup parent, UUID ownerID, uint localID, 219 public SceneObjectPart(SceneObjectGroup parent, UUID ownerID,
220 PrimitiveBaseShape shape, Vector3 groupPosition, Vector3 offsetPosition) 220 PrimitiveBaseShape shape, Vector3 groupPosition, Vector3 offsetPosition)
221 : this(parent, ownerID, localID, shape, groupPosition, Quaternion.Identity, offsetPosition) 221 : this(parent, ownerID, shape, groupPosition, Quaternion.Identity, offsetPosition)
222 { 222 {
223 } 223 }
224 224
@@ -228,14 +228,13 @@ namespace OpenSim.Region.Environment.Scenes
228 /// <param name="regionHandle"></param> 228 /// <param name="regionHandle"></param>
229 /// <param name="parent"></param> 229 /// <param name="parent"></param>
230 /// <param name="ownerID"></param> 230 /// <param name="ownerID"></param>
231 /// <param name="localID"></param>
232 /// <param name="shape"></param> 231 /// <param name="shape"></param>
233 /// <param name="position"></param> 232 /// <param name="position"></param>
234 /// <param name="rotationOffset"></param> 233 /// <param name="rotationOffset"></param>
235 /// <param name="offsetPosition"></param> 234 /// <param name="offsetPosition"></param>
236 public SceneObjectPart(SceneObjectGroup parent, UUID ownerID, uint localID, 235 public SceneObjectPart(
237 PrimitiveBaseShape shape, Vector3 groupPosition, Quaternion rotationOffset, 236 SceneObjectGroup parent, UUID ownerID, PrimitiveBaseShape shape, Vector3 groupPosition,
238 Vector3 offsetPosition) 237 Quaternion rotationOffset, Vector3 offsetPosition)
239 { 238 {
240 m_name = "Primitive"; 239 m_name = "Primitive";
241 m_parentGroup = parent; 240 m_parentGroup = parent;
@@ -246,7 +245,6 @@ namespace OpenSim.Region.Environment.Scenes
246 _creatorID = _ownerID; 245 _creatorID = _ownerID;
247 _lastOwnerID = UUID.Zero; 246 _lastOwnerID = UUID.Zero;
248 UUID = UUID.Random(); 247 UUID = UUID.Random();
249 LocalId = (uint) (localID);
250 Shape = shape; 248 Shape = shape;
251 // Todo: Add More Object Parameter from above! 249 // Todo: Add More Object Parameter from above!
252 _ownershipCost = 0; 250 _ownershipCost = 0;
@@ -286,7 +284,7 @@ namespace OpenSim.Region.Environment.Scenes
286 /// <param name="shape"></param> 284 /// <param name="shape"></param>
287 /// <param name="position"></param> 285 /// <param name="position"></param>
288 public SceneObjectPart(SceneObjectGroup parent, int creationDate, UUID ownerID, 286 public SceneObjectPart(SceneObjectGroup parent, int creationDate, UUID ownerID,
289 UUID creatorID, UUID lastOwnerID, uint localID, PrimitiveBaseShape shape, 287 UUID creatorID, UUID lastOwnerID, PrimitiveBaseShape shape,
290 Vector3 position, Quaternion rotation, uint flags) 288 Vector3 position, Quaternion rotation, uint flags)
291 { 289 {
292 m_parentGroup = parent; 290 m_parentGroup = parent;
@@ -296,7 +294,6 @@ namespace OpenSim.Region.Environment.Scenes
296 _creatorID = creatorID; 294 _creatorID = creatorID;
297 _lastOwnerID = lastOwnerID; 295 _lastOwnerID = lastOwnerID;
298 UUID = UUID.Random(); 296 UUID = UUID.Random();
299 LocalId = (uint) (localID);
300 Shape = shape; 297 Shape = shape;
301 _ownershipCost = 0; 298 _ownershipCost = 0;
302 _objectSaleType = (byte) 0; 299 _objectSaleType = (byte) 0;