aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authormingchen2008-07-03 01:29:18 +0000
committermingchen2008-07-03 01:29:18 +0000
commitba2afef0f1b5ae1fcd5dfee0243336f28e1fa456 (patch)
tree65ad88ab7fd8d33d92423a0b79885387a735ba28
parentMantis#1652. Thank you, Melanie for a patch that: (diff)
downloadopensim-SC-ba2afef0f1b5ae1fcd5dfee0243336f28e1fa456.zip
opensim-SC-ba2afef0f1b5ae1fcd5dfee0243336f28e1fa456.tar.gz
opensim-SC-ba2afef0f1b5ae1fcd5dfee0243336f28e1fa456.tar.bz2
opensim-SC-ba2afef0f1b5ae1fcd5dfee0243336f28e1fa456.tar.xz
*Parcel Claim date is no longer Epoch (Jan 1, 1970). Now shows the actual creation/reclaim/sale date.
-rw-r--r--OpenSim/Framework/LandData.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs3
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index 68c4c2e..11a4fb4 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Framework
39 public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned 39 public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned
40 public LLUUID authBuyerID = LLUUID.Zero; //Unemplemented. Authorized Buyer's UUID 40 public LLUUID authBuyerID = LLUUID.Zero; //Unemplemented. Authorized Buyer's UUID
41 public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category 41 public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
42 public int claimDate = 0; //Unemplemented 42 public int claimDate = 0;
43 public int claimPrice = 0; //Unemplemented 43 public int claimPrice = 0; //Unemplemented
44 public LLUUID globalID = LLUUID.Zero; 44 public LLUUID globalID = LLUUID.Zero;
45 public LLUUID groupID = LLUUID.Zero; //Unemplemented 45 public LLUUID groupID = LLUUID.Zero; //Unemplemented
diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
index 05bd983..7898a30 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
@@ -163,7 +163,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
163 163
164 fullSimParcel.setLandBitmap(fullSimParcel.getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); 164 fullSimParcel.setLandBitmap(fullSimParcel.getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
165 fullSimParcel.landData.ownerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; 165 fullSimParcel.landData.ownerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
166 166 fullSimParcel.landData.claimDate = Util.UnixTimeSinceEpoch();
167 AddLandObject(fullSimParcel); 167 AddLandObject(fullSimParcel);
168 } 168 }
169 169
@@ -946,6 +946,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
946 if (m_scene.ExternalChecks.ExternalChecksCanReclaimParcel(remote_client.AgentId, landList[local_id])) 946 if (m_scene.ExternalChecks.ExternalChecksCanReclaimParcel(remote_client.AgentId, landList[local_id]))
947 { 947 {
948 landList[local_id].landData.ownerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; 948 landList[local_id].landData.ownerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
949 landList[local_id].landData.claimDate = Util.UnixTimeSinceEpoch();
949 m_scene.Broadcast(SendParcelOverlay); 950 m_scene.Broadcast(SendParcelOverlay);
950 landList[local_id].sendLandUpdateToClient(remote_client); 951 landList[local_id].sendLandUpdateToClient(remote_client);
951 } 952 }