svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release

1 files changed, 0 insertions, 5 deletions

diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index 16d3cb01e5..131bcdd55d 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -190,7 +190,6 @@ public:
 	void setLandingType(const ELandingType type) { mLandingType = type; }
 
 	void setAuctionID(U32 auction_id) { mAuctionID = auction_id;}
-	void setReservedForNewbie(BOOL reserve) { mIsReservedForNewbie = reserve; }
 
 	void	setAllParcelFlags(U32 flags) { mParcelFlags = flags; }
 	void	setParcelFlag(U32 flag, BOOL b);
@@ -271,7 +270,6 @@ public:
 	BOOL			getIsGroupOwned() const		{ return mGroupOwned; }
 
 	U32 getAuctionID() { return mAuctionID; }
-	BOOL getReservedForNewbie() { return mIsReservedForNewbie; }
 	bool isInEscrow() const { return mInEscrow; }
 
 	BOOL isPublic() const;
@@ -518,9 +516,6 @@ protected:
 	// the parcel.
 	U32 mAuctionID;
 
-	// This value is TRUE if the land is reserved for a newbie.
-	BOOL mIsReservedForNewbie;
-
 	// value used to temporarily lock attempts to purchase the parcel.
 	bool mInEscrow;