diff options
author | Sean Dague | 2008-06-27 23:22:14 +0000 |
---|---|---|
committer | Sean Dague | 2008-06-27 23:22:14 +0000 |
commit | 30592156c8892f595ad22dd5d14934525cb5ac58 (patch) | |
tree | 36dad0f93116eec2776b84c770727771c2a7703c /OpenSim/Region | |
parent | last round of warning squashing. calling it a day now. (diff) | |
download | opensim-SC_OLD-30592156c8892f595ad22dd5d14934525cb5ac58.zip opensim-SC_OLD-30592156c8892f595ad22dd5d14934525cb5ac58.tar.gz opensim-SC_OLD-30592156c8892f595ad22dd5d14934525cb5ac58.tar.bz2 opensim-SC_OLD-30592156c8892f595ad22dd5d14934525cb5ac58.tar.xz |
tart the property wrapping in SOP. This will be a long process
will do more next week.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 7b04c82..f9ee542 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -1,4 +1,4 @@ | |||
1 | #region Header | 1 | #region Header |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) Contributors, http://opensimulator.org/ | 4 | * Copyright (c) Contributors, http://opensimulator.org/ |
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
104 | public uint BaseMask = (uint)PermissionMask.All; | 104 | public uint BaseMask = (uint)PermissionMask.All; |
105 | public uint Category; | 105 | public uint Category; |
106 | public Int32 CreationDate; | 106 | public Int32 CreationDate; |
107 | public LLUUID CreatorID; | 107 | private LLUUID _creatorID; |
108 | [XmlIgnore] | 108 | [XmlIgnore] |
109 | public bool DIE_AT_EDGE = false; | 109 | public bool DIE_AT_EDGE = false; |
110 | public uint EveryoneMask = (uint)PermissionMask.None; | 110 | public uint EveryoneMask = (uint)PermissionMask.None; |
@@ -250,7 +250,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
250 | 250 | ||
251 | CreationDate = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; | 251 | CreationDate = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; |
252 | OwnerID = ownerID; | 252 | OwnerID = ownerID; |
253 | CreatorID = OwnerID; | 253 | _creatorID = OwnerID; |
254 | LastOwnerID = LLUUID.Zero; | 254 | LastOwnerID = LLUUID.Zero; |
255 | UUID = LLUUID.Random(); | 255 | UUID = LLUUID.Random(); |
256 | LocalId = (uint) (localID); | 256 | LocalId = (uint) (localID); |
@@ -260,7 +260,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
260 | ObjectSaleType = (byte) 0; | 260 | ObjectSaleType = (byte) 0; |
261 | SalePrice = 0; | 261 | SalePrice = 0; |
262 | Category = (uint) 0; | 262 | Category = (uint) 0; |
263 | LastOwnerID = CreatorID; | 263 | LastOwnerID = _creatorID; |
264 | // End Todo: /// | 264 | // End Todo: /// |
265 | GroupPosition = groupPosition; | 265 | GroupPosition = groupPosition; |
266 | OffsetPosition = offsetPosition; | 266 | OffsetPosition = offsetPosition; |
@@ -303,7 +303,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
303 | TimeStampTerse = (uint) Util.UnixTimeSinceEpoch(); | 303 | TimeStampTerse = (uint) Util.UnixTimeSinceEpoch(); |
304 | CreationDate = creationDate; | 304 | CreationDate = creationDate; |
305 | OwnerID = ownerID; | 305 | OwnerID = ownerID; |
306 | CreatorID = creatorID; | 306 | _creatorID = creatorID; |
307 | LastOwnerID = lastOwnerID; | 307 | LastOwnerID = lastOwnerID; |
308 | UUID = LLUUID.Random(); | 308 | UUID = LLUUID.Random(); |
309 | LocalId = (uint) (localID); | 309 | LocalId = (uint) (localID); |
@@ -312,7 +312,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
312 | ObjectSaleType = (byte) 0; | 312 | ObjectSaleType = (byte) 0; |
313 | SalePrice = 0; | 313 | SalePrice = 0; |
314 | Category = (uint) 0; | 314 | Category = (uint) 0; |
315 | LastOwnerID = CreatorID; | 315 | LastOwnerID = _creatorID; |
316 | OffsetPosition = position; | 316 | OffsetPosition = position; |
317 | RotationOffset = rotation; | 317 | RotationOffset = rotation; |
318 | ObjectFlags = flags; | 318 | ObjectFlags = flags; |
@@ -379,6 +379,17 @@ namespace OpenSim.Region.Environment.Scenes | |||
379 | m_clickAction = value; | 379 | m_clickAction = value; |
380 | } | 380 | } |
381 | } | 381 | } |
382 | |||
383 | public LLUUID CreatorID { | ||
384 | get | ||
385 | { | ||
386 | return _creatorID; | ||
387 | } | ||
388 | set | ||
389 | { | ||
390 | _creatorID = value; | ||
391 | } | ||
392 | } | ||
382 | 393 | ||
383 | public Color Color | 394 | public Color Color |
384 | { | 395 | { |
@@ -494,7 +505,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
494 | 505 | ||
495 | public LLUUID ObjectCreator | 506 | public LLUUID ObjectCreator |
496 | { | 507 | { |
497 | get { return CreatorID; } | 508 | get { return _creatorID; } |
498 | } | 509 | } |
499 | 510 | ||
500 | public uint ObjectFlags | 511 | public uint ObjectFlags |
@@ -1229,7 +1240,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1229 | info.AddValue("TimeStampLastActivity", TimeStampLastActivity); | 1240 | info.AddValue("TimeStampLastActivity", TimeStampLastActivity); |
1230 | 1241 | ||
1231 | info.AddValue("m_updateFlag", m_updateFlag); | 1242 | info.AddValue("m_updateFlag", m_updateFlag); |
1232 | info.AddValue("CreatorID", CreatorID.UUID); | 1243 | info.AddValue("CreatorID", _creatorID.UUID); |
1233 | 1244 | ||
1234 | info.AddValue("m_inventorySerial", m_inventorySerial); | 1245 | info.AddValue("m_inventorySerial", m_inventorySerial); |
1235 | info.AddValue("m_uuid", m_uuid.UUID); | 1246 | info.AddValue("m_uuid", m_uuid.UUID); |
@@ -1281,7 +1292,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1281 | 1292 | ||
1282 | public void GetProperties(IClientAPI client) | 1293 | public void GetProperties(IClientAPI client) |
1283 | { | 1294 | { |
1284 | client.SendObjectPropertiesReply(LLUUID.Zero, (ulong)CreationDate, CreatorID, LLUUID.Zero, LLUUID.Zero, | 1295 | client.SendObjectPropertiesReply(LLUUID.Zero, (ulong)CreationDate, _creatorID, LLUUID.Zero, LLUUID.Zero, |
1285 | GroupID, (short)InventorySerial, LastOwnerID, UUID, OwnerID, | 1296 | GroupID, (short)InventorySerial, LastOwnerID, UUID, OwnerID, |
1286 | ParentGroup.RootPart.TouchName, new byte[0], ParentGroup.RootPart.SitName, Name, Description, | 1297 | ParentGroup.RootPart.TouchName, new byte[0], ParentGroup.RootPart.SitName, Name, Description, |
1287 | ParentGroup.RootPart.OwnerMask, ParentGroup.RootPart.NextOwnerMask, ParentGroup.RootPart.GroupMask, ParentGroup.RootPart.EveryoneMask, | 1298 | ParentGroup.RootPart.OwnerMask, ParentGroup.RootPart.NextOwnerMask, ParentGroup.RootPart.GroupMask, ParentGroup.RootPart.EveryoneMask, |