summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelplaceprofile.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-03-24 18:04:26 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2010-03-24 18:04:26 +0200
commitd3a606f8323a32c660c71675257e3abd95cb097e (patch)
tree11e272b194cb42bd9b11b861395f44793d3fa9f6 /indra/newview/llpanelplaceprofile.cpp
parent5f46430a1aa16212838dd7a9493a42fcb5e92ec3 (diff)
parent7857f59f9e7c673f1ddbf32d6a66e85f78004445 (diff)
Manual merge from default branch.
Resolved conflicts in llpanellandmarks.cpp. --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llpanelplaceprofile.cpp')
-rw-r--r--indra/newview/llpanelplaceprofile.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp
index cdd79b1559..1a1650c38b 100644
--- a/indra/newview/llpanelplaceprofile.cpp
+++ b/indra/newview/llpanelplaceprofile.cpp
@@ -567,9 +567,13 @@ void LLPanelPlaceProfile::onForSaleBannerClick()
if(parcel->getLocalID() == mSelectedParcelID &&
mLastSelectedRegionID ==selected_region->getRegionID())
{
- if(parcel->getSalePrice() - gStatusBar->getBalance() > 0)
+ S32 price = parcel->getSalePrice();
+
+ if(price - gStatusBar->getBalance() > 0)
{
- LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("buying_selected_land"), parcel->getSalePrice());
+ LLStringUtil::format_map_t args;
+ args["AMOUNT"] = llformat("%d", price);
+ LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("buying_selected_land", args), price);
}
else
{