diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-01 21:39:25 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-01 21:39:25 +0000 |
| commit | 4ecb9cb63e4993b3b4bc65d73ed255139b5c3f75 (patch) | |
| tree | 48d9bb9a1ae468ecdbd53cf21a598d66ee8eced3 /indra/newview/llviewerparcelmgr.cpp | |
| parent | f5e9ce7e47694e349a4eb28b052016b11e1bdf81 (diff) | |
svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index c3f2b2d2f6..5af3d532a6 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1347,7 +1347,6 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use LLUUID owner_id; BOOL is_group_owned; U32 auction_id = 0; - BOOL is_reserved = FALSE; S32 claim_price_per_meter = 0; S32 rent_price_per_meter = 0; S32 claim_date = 0; @@ -1424,7 +1423,6 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use msg->getUUIDFast(_PREHASH_ParcelData, _PREHASH_OwnerID, owner_id); msg->getBOOLFast(_PREHASH_ParcelData, _PREHASH_IsGroupOwned, is_group_owned); msg->getU32Fast(_PREHASH_ParcelData, _PREHASH_AuctionID, auction_id); - msg->getBOOLFast(_PREHASH_ParcelData, _PREHASH_ReservedNewbie, is_reserved); msg->getS32Fast( _PREHASH_ParcelData, _PREHASH_ClaimDate, claim_date); msg->getS32Fast( _PREHASH_ParcelData, _PREHASH_ClaimPrice, claim_price_per_meter); msg->getS32Fast( _PREHASH_ParcelData, _PREHASH_RentPrice, rent_price_per_meter); @@ -1461,7 +1459,6 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use parcel->setAABBMax(aabb_max); parcel->setAuctionID(auction_id); - parcel->setReservedForNewbie(is_reserved); parcel->setOwnershipStatus((LLParcel::EOwnershipStatus)status); parcel->setSimWideMaxPrimCapacity(sw_max_prims); @@ -2214,16 +2211,10 @@ bool LLViewerParcelMgr::canAgentBuyParcel(LLParcel* parcel, bool forGroup) const bool isOwner = parcelOwner == (forGroup ? gAgent.getGroupID() : gAgent.getID()); - bool isAvailable - = parcel->getReservedForNewbie() - ? (!forGroup && gStatusBar->getSquareMetersCommitted() == 0) - : true; - // *TODO: should be based on never_owned_land, see SL-10728 - bool isAuthorized = (authorizeBuyer.isNull() || (gAgent.getID() == authorizeBuyer)); - return isForSale && !isOwner && isAuthorized && isAvailable && isEmpowered; + return isForSale && !isOwner && isAuthorized && isEmpowered; } |