svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.

1 files changed, 11 insertions, 1 deletions

diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 556e0bc79b..21365fa3b9 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -1038,7 +1038,9 @@ public:
 	
 	// for parcel buys
 	S32		mParcelID;
-	
+	S32		mPrice;
+	S32		mArea;
+
 	// for land claims
 	F32		mWest;
 	F32		mSouth;
@@ -1096,6 +1098,8 @@ LLViewerParcelMgr::ParcelBuyInfo* LLViewerParcelMgr::setupParcelBuy(
 	info->mIsClaim = is_claim;
 	info->mRemoveContribution = remove_contribution;
 	info->mHost = region->getHost();
+	info->mPrice = mCurrentParcel->getSalePrice();
+	info->mArea = mCurrentParcel->getArea();
 	
 	if (!is_claim)
 	{
@@ -1141,6 +1145,12 @@ void LLViewerParcelMgr::sendParcelBuy(ParcelBuyInfo* info)
 		msg->addF32("East",  info->mEast);
 		msg->addF32("North", info->mNorth);
 	}
+	else // ParcelBuy
+	{
+		msg->nextBlock("ParcelData");
+		msg->addS32("Price",info->mPrice);
+		msg->addS32("Area",info->mArea);
+	}
 	msg->sendReliable(info->mHost);
 }