diff options
Diffstat (limited to 'linden/indra/llinventory/llparcel.cpp')
-rw-r--r-- | linden/indra/llinventory/llparcel.cpp | 6 |
1 files changed, 5 insertions, 1 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 @@ | |||
38 | #include "llstreamtools.h" | 38 | #include "llstreamtools.h" |
39 | 39 | ||
40 | #include "llmath.h" | 40 | #include "llmath.h" |
41 | #include "llsd.h" | ||
42 | #include "llsdutil.h" | ||
41 | #include "lltransactiontypes.h" | 43 | #include "lltransactiontypes.h" |
42 | #include "lltransactionflags.h" | 44 | #include "lltransactionflags.h" |
43 | #include "message.h" | 45 | #include "message.h" |
@@ -1614,7 +1616,7 @@ void LLParcel::startSale(const LLUUID& buyer_id, BOOL is_buyer_group) | |||
1614 | mSaleTimerExpires.setTimerExpirySec(DEFAULT_USEC_SALE_TIMEOUT / SEC_TO_MICROSEC); | 1616 | mSaleTimerExpires.setTimerExpirySec(DEFAULT_USEC_SALE_TIMEOUT / SEC_TO_MICROSEC); |
1615 | mStatus = OS_LEASE_PENDING; | 1617 | mStatus = OS_LEASE_PENDING; |
1616 | mClaimDate = time(NULL); | 1618 | mClaimDate = time(NULL); |
1617 | mAuctionID = 0; | 1619 | setAuctionID(0); |
1618 | // clear the autoreturn whenever land changes hands | 1620 | // clear the autoreturn whenever land changes hands |
1619 | setCleanOtherTime(0); | 1621 | setCleanOtherTime(0); |
1620 | } | 1622 | } |
@@ -1649,6 +1651,7 @@ void LLParcel::completeSale(U32& type, U8& flags, | |||
1649 | // Purchased parcels are assumed to no longer be for sale. | 1651 | // Purchased parcels are assumed to no longer be for sale. |
1650 | // Otherwise someone can snipe the sale. | 1652 | // Otherwise someone can snipe the sale. |
1651 | setForSale(FALSE); | 1653 | setForSale(FALSE); |
1654 | setAuctionID(0); | ||
1652 | 1655 | ||
1653 | // Turn off show directory, since it's a recurring fee that | 1656 | // Turn off show directory, since it's a recurring fee that |
1654 | // the buyer may not want. | 1657 | // the buyer may not want. |
@@ -1674,6 +1677,7 @@ void LLParcel::clearSale() | |||
1674 | } | 1677 | } |
1675 | mAuthBuyerID.setNull(); | 1678 | mAuthBuyerID.setNull(); |
1676 | setForSale(FALSE); | 1679 | setForSale(FALSE); |
1680 | setAuctionID(0); | ||
1677 | setPreviousOwnerID(LLUUID::null); | 1681 | setPreviousOwnerID(LLUUID::null); |
1678 | setPreviouslyGroupOwned(FALSE); | 1682 | setPreviouslyGroupOwned(FALSE); |
1679 | setSellWithObjects(FALSE); | 1683 | setSellWithObjects(FALSE); |