aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs34
1 files changed, 30 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 70b8829..727ebb0 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -51,13 +51,18 @@ namespace OpenSim.Region.Environment.Scenes
51 [XmlIgnore] public PhysicsActor PhysActor = null; 51 [XmlIgnore] public PhysicsActor PhysActor = null;
52 52
53 protected Dictionary<LLUUID, TaskInventoryItem> TaskInventory = new Dictionary<LLUUID, TaskInventoryItem>(); 53 protected Dictionary<LLUUID, TaskInventoryItem> TaskInventory = new Dictionary<LLUUID, TaskInventoryItem>();
54 54 public LLUUID LastOwnerID;
55 public LLUUID OwnerID; 55 public LLUUID OwnerID;
56 public LLUUID GroupID; 56 public LLUUID GroupID;
57 public LLUUID LastOwnerID; 57 public int OwnershipCost;
58 public byte ObjectSaleType;
59 public int SalePrice;
60 public uint Category;
61
58 public Int32 CreationDate; 62 public Int32 CreationDate;
59 public uint ParentID = 0; 63 public uint ParentID = 0;
60 64
65
61 public uint OwnerMask = FULL_MASK_PERMISSIONS; 66 public uint OwnerMask = FULL_MASK_PERMISSIONS;
62 public uint NextOwnerMask = FULL_MASK_PERMISSIONS; 67 public uint NextOwnerMask = FULL_MASK_PERMISSIONS;
63 public uint GroupMask = FULL_MASK_PERMISSIONS; 68 public uint GroupMask = FULL_MASK_PERMISSIONS;
@@ -68,6 +73,7 @@ namespace OpenSim.Region.Environment.Scenes
68 73
69 [XmlIgnore] public uint TimeStampFull = 0; 74 [XmlIgnore] public uint TimeStampFull = 0;
70 [XmlIgnore] public uint TimeStampTerse = 0; 75 [XmlIgnore] public uint TimeStampTerse = 0;
76 [XmlIgnore] public uint TimeStampLastActivity = 0; // Will be used for AutoReturn
71 77
72 protected SceneObjectGroup m_parentGroup; 78 protected SceneObjectGroup m_parentGroup;
73 79
@@ -418,7 +424,13 @@ namespace OpenSim.Region.Environment.Scenes
418 UUID = LLUUID.Random(); 424 UUID = LLUUID.Random();
419 LocalID = (uint) (localID); 425 LocalID = (uint) (localID);
420 Shape = shape; 426 Shape = shape;
421 427 // Todo: Add More Object Parameter from above!
428 OwnershipCost = 0;
429 ObjectSaleType = (byte)0;
430 SalePrice = 0;
431 Category = (uint)0;
432 LastOwnerID = CreatorID;
433 // End Todo: ///
422 GroupPosition = groupPosition; 434 GroupPosition = groupPosition;
423 OffsetPosition = offsetPosition; 435 OffsetPosition = offsetPosition;
424 RotationOffset = rotationOffset; 436 RotationOffset = rotationOffset;
@@ -467,8 +479,14 @@ namespace OpenSim.Region.Environment.Scenes
467 LastOwnerID = lastOwnerID; 479 LastOwnerID = lastOwnerID;
468 UUID = LLUUID.Random(); 480 UUID = LLUUID.Random();
469 LocalID = (uint) (localID); 481 LocalID = (uint) (localID);
482 // Todo: Add More parameters from above
470 Shape = shape; 483 Shape = shape;
471 484 OwnershipCost = 0;
485 ObjectSaleType = (byte)0;
486 SalePrice = 0;
487 Category = (uint)0;
488 // End Todo: ///
489 LastOwnerID = CreatorID;
472 OffsetPosition = position; 490 OffsetPosition = position;
473 RotationOffset = rotation; 491 RotationOffset = rotation;
474 ObjectFlags = flags; 492 ObjectFlags = flags;
@@ -538,6 +556,14 @@ namespace OpenSim.Region.Environment.Scenes
538 dupe.AngularVelocity = new LLVector3(0, 0, 0); 556 dupe.AngularVelocity = new LLVector3(0, 0, 0);
539 dupe.ObjectFlags = ObjectFlags; 557 dupe.ObjectFlags = ObjectFlags;
540 558
559 dupe.OwnershipCost = OwnershipCost;
560 dupe.ObjectSaleType = ObjectSaleType;
561 dupe.SalePrice = SalePrice;
562 dupe.Category = Category;
563
564 // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated.
565 dupe.LastOwnerID = ObjectOwner;
566
541 byte[] extraP = new byte[Shape.ExtraParams.Length]; 567 byte[] extraP = new byte[Shape.ExtraParams.Length];
542 Array.Copy(Shape.ExtraParams, extraP, extraP.Length); 568 Array.Copy(Shape.ExtraParams, extraP, extraP.Length);
543 dupe.Shape.ExtraParams = extraP; 569 dupe.Shape.ExtraParams = extraP;