tart the property wrapping in SOP. This will be a long process

will do more next week.
0.6.0-stable
Sean Dague 2008-06-27 23:22:14 +00:00
parent 748f72326d
commit 30592156c8
1 changed files with 20 additions and 9 deletions

View File

@ -1,4 +1,4 @@
#region Header #region Header
/* /*
* Copyright (c) Contributors, http://opensimulator.org/ * Copyright (c) Contributors, http://opensimulator.org/
@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Scenes
public uint BaseMask = (uint)PermissionMask.All; public uint BaseMask = (uint)PermissionMask.All;
public uint Category; public uint Category;
public Int32 CreationDate; public Int32 CreationDate;
public LLUUID CreatorID; private LLUUID _creatorID;
[XmlIgnore] [XmlIgnore]
public bool DIE_AT_EDGE = false; public bool DIE_AT_EDGE = false;
public uint EveryoneMask = (uint)PermissionMask.None; public uint EveryoneMask = (uint)PermissionMask.None;
@ -250,7 +250,7 @@ namespace OpenSim.Region.Environment.Scenes
CreationDate = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; CreationDate = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
OwnerID = ownerID; OwnerID = ownerID;
CreatorID = OwnerID; _creatorID = OwnerID;
LastOwnerID = LLUUID.Zero; LastOwnerID = LLUUID.Zero;
UUID = LLUUID.Random(); UUID = LLUUID.Random();
LocalId = (uint) (localID); LocalId = (uint) (localID);
@ -260,7 +260,7 @@ namespace OpenSim.Region.Environment.Scenes
ObjectSaleType = (byte) 0; ObjectSaleType = (byte) 0;
SalePrice = 0; SalePrice = 0;
Category = (uint) 0; Category = (uint) 0;
LastOwnerID = CreatorID; LastOwnerID = _creatorID;
// End Todo: /// // End Todo: ///
GroupPosition = groupPosition; GroupPosition = groupPosition;
OffsetPosition = offsetPosition; OffsetPosition = offsetPosition;
@ -303,7 +303,7 @@ namespace OpenSim.Region.Environment.Scenes
TimeStampTerse = (uint) Util.UnixTimeSinceEpoch(); TimeStampTerse = (uint) Util.UnixTimeSinceEpoch();
CreationDate = creationDate; CreationDate = creationDate;
OwnerID = ownerID; OwnerID = ownerID;
CreatorID = creatorID; _creatorID = creatorID;
LastOwnerID = lastOwnerID; LastOwnerID = lastOwnerID;
UUID = LLUUID.Random(); UUID = LLUUID.Random();
LocalId = (uint) (localID); LocalId = (uint) (localID);
@ -312,7 +312,7 @@ namespace OpenSim.Region.Environment.Scenes
ObjectSaleType = (byte) 0; ObjectSaleType = (byte) 0;
SalePrice = 0; SalePrice = 0;
Category = (uint) 0; Category = (uint) 0;
LastOwnerID = CreatorID; LastOwnerID = _creatorID;
OffsetPosition = position; OffsetPosition = position;
RotationOffset = rotation; RotationOffset = rotation;
ObjectFlags = flags; ObjectFlags = flags;
@ -380,6 +380,17 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
public LLUUID CreatorID {
get
{
return _creatorID;
}
set
{
_creatorID = value;
}
}
public Color Color public Color Color
{ {
get { return m_color; } get { return m_color; }
@ -494,7 +505,7 @@ namespace OpenSim.Region.Environment.Scenes
public LLUUID ObjectCreator public LLUUID ObjectCreator
{ {
get { return CreatorID; } get { return _creatorID; }
} }
public uint ObjectFlags public uint ObjectFlags
@ -1229,7 +1240,7 @@ namespace OpenSim.Region.Environment.Scenes
info.AddValue("TimeStampLastActivity", TimeStampLastActivity); info.AddValue("TimeStampLastActivity", TimeStampLastActivity);
info.AddValue("m_updateFlag", m_updateFlag); info.AddValue("m_updateFlag", m_updateFlag);
info.AddValue("CreatorID", CreatorID.UUID); info.AddValue("CreatorID", _creatorID.UUID);
info.AddValue("m_inventorySerial", m_inventorySerial); info.AddValue("m_inventorySerial", m_inventorySerial);
info.AddValue("m_uuid", m_uuid.UUID); info.AddValue("m_uuid", m_uuid.UUID);
@ -1281,7 +1292,7 @@ namespace OpenSim.Region.Environment.Scenes
public void GetProperties(IClientAPI client) public void GetProperties(IClientAPI client)
{ {
client.SendObjectPropertiesReply(LLUUID.Zero, (ulong)CreationDate, CreatorID, LLUUID.Zero, LLUUID.Zero, client.SendObjectPropertiesReply(LLUUID.Zero, (ulong)CreationDate, _creatorID, LLUUID.Zero, LLUUID.Zero,
GroupID, (short)InventorySerial, LastOwnerID, UUID, OwnerID, GroupID, (short)InventorySerial, LastOwnerID, UUID, OwnerID,
ParentGroup.RootPart.TouchName, new byte[0], ParentGroup.RootPart.SitName, Name, Description, ParentGroup.RootPart.TouchName, new byte[0], ParentGroup.RootPart.SitName, Name, Description,
ParentGroup.RootPart.OwnerMask, ParentGroup.RootPart.NextOwnerMask, ParentGroup.RootPart.GroupMask, ParentGroup.RootPart.EveryoneMask, ParentGroup.RootPart.OwnerMask, ParentGroup.RootPart.NextOwnerMask, ParentGroup.RootPart.GroupMask, ParentGroup.RootPart.EveryoneMask,