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

1 files changed, 0 insertions, 44 deletions

diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp
index 1ee8cd62ab..7ed84e495a 100644
--- a/indra/newview/llfloaterbuyland.cpp
+++ b/indra/newview/llfloaterbuyland.cpp
@@ -75,7 +75,6 @@ private:
 	// information about the parcel
 	bool			mParcelValid;
 	bool			mParcelIsForSale;
-	bool			mParcelIsFirstLand;
 	bool			mParcelIsGroupLand;
 	S32				mParcelGroupContribution;
 	S32				mParcelPrice;
@@ -352,7 +351,6 @@ void LLFloaterBuyLandUI::updateParcelInfo()
 	LLParcel* parcel = mParcel->getParcel();
 	mParcelValid = parcel && mRegion;
 	mParcelIsForSale = false;
-	mParcelIsFirstLand = false;
 	mParcelIsGroupLand = false;
 	mParcelGroupContribution = 0;
 	mParcelPrice = 0;
@@ -386,7 +384,6 @@ void LLFloaterBuyLandUI::updateParcelInfo()
 	{
 		mParcelActualArea = parcel->getArea();
 		mParcelIsForSale = parcel->getForSale();
-		mParcelIsFirstLand = parcel->getReservedForNewbie();
 		mParcelIsGroupLand = parcel->getIsGroupOwned();
 		mParcelPrice = mParcelIsForSale ? parcel->getSalePrice() : 0;
 		
@@ -493,36 +490,6 @@ void LLFloaterBuyLandUI::updateParcelInfo()
 		}
 	}
 
-	/*
-	if ((mRegion->getRegionFlags() & REGION_FLAGS_BLOCK_LAND_RESELL)
-		&& !gAgent.isGodlike())
-	{
-		mCannotBuyReason = llformat(
-				"The region %s does not allow transfer of land.",
-				mRegion->getName().c_str() );
-		return;
-	}
-	*/
-	
-	if (parcel->getReservedForNewbie())
-	{
-		if (mIsForGroup)
-		{
-			mCannotBuyReason = childGetText("first_time_group");
-			return;
-		}
-		
-		if (gStatusBar->getSquareMetersCommitted() > 0)
-		{
-			mCannotBuyReason == childGetText("first_time");
-			return;
-		}
-		
-		// *TODO: There should be a check based on the database value
-		// indra.user.ever_owned_land, only that value never makes it
-		// to the viewer, see SL-10728
-	}
-
 	mCanBuy = true;
 }
 
@@ -1143,17 +1110,6 @@ void LLFloaterBuyLandUI::refreshUI()
 			message += childGetText("insufficient_land_credits");
 				
 		}
-		else if (mAgentHasNeverOwnedLand)
-		{
-			if (mParcelIsFirstLand)
-			{
-				message += childGetText("first_purchase");
-			}
-			else
-			{
-				message += childGetText("first_time_but_not_first_land");
-			}
-		}
 		else
 		{