Second Life viewer sources 1.18.5.0-RC

2 files changed, 9 insertions, 3 deletions

diff --git a/linden/indra/llinventory/llparcel.cpp b/linden/indra/llinventory/llparcel.cpp
index 3a67385..7cc3e57 100644
--- a/linden/indra/llinventory/llparcel.cpp
+++ b/linden/indra/llinventory/llparcel.cpp
@@ -38,6 +38,8 @@
 #include "llstreamtools.h"
 
 #include "llmath.h"
+#include "llsd.h"
+#include "llsdutil.h"
 #include "lltransactiontypes.h"
 #include "lltransactionflags.h"
 #include "message.h"
@@ -1614,7 +1616,7 @@ void LLParcel::startSale(const LLUUID& buyer_id, BOOL is_buyer_group)
         mSaleTimerExpires.setTimerExpirySec(DEFAULT_USEC_SALE_TIMEOUT / SEC_TO_MICROSEC);
         mStatus = OS_LEASE_PENDING;
         mClaimDate = time(NULL);
-        mAuctionID = 0;
+        setAuctionID(0);
         // clear the autoreturn whenever land changes hands
         setCleanOtherTime(0);
 }
@@ -1649,6 +1651,7 @@ void LLParcel::completeSale(U32& type, U8& flags,
         // Purchased parcels are assumed to no longer be for sale.
         // Otherwise someone can snipe the sale.
         setForSale(FALSE);
+        setAuctionID(0);
 
         // Turn off show directory, since it's a recurring fee that
         // the buyer may not want.
@@ -1674,6 +1677,7 @@ void LLParcel::clearSale()
         }
         mAuthBuyerID.setNull();
         setForSale(FALSE);
+        setAuctionID(0);
         setPreviousOwnerID(LLUUID::null);
         setPreviouslyGroupOwned(FALSE);
         setSellWithObjects(FALSE);
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index 9c63008..3af1824 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -31,6 +31,9 @@
 #ifndef LL_LLPARCEL_H
 #define LL_LLPARCEL_H
 
+#include <time.h>
+#include <iostream>
+
 #include "lluuid.h"
 #include "llparcelflags.h"
 #include "llpermissions.h"
@@ -100,6 +103,7 @@ const U32 RT_LIST	= 0x1 << 4;
 const U32 RT_SELL       = 0x1 << 5;
 
 class LLMessageSystem;
+class LLSD;
 
 class LLAccessEntry
 {
@@ -603,8 +607,6 @@ public:
         std::map<LLUUID,LLAccessEntry>  mBanList;
         std::map<LLUUID,LLAccessEntry>  mTempBanList;
         std::map<LLUUID,LLAccessEntry>  mTempAccessList;
-
-        //LLDynamicArray<LLAccessEntry> mRenterList;
 };