From 65d887250759183c0221d20003026f71fbb44b3e Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Tue, 15 Jun 2010 15:35:47 +0100
Subject: merge fix in unrelated file.

---
 indra/newview/llviewermenufile.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 6d5a72f900..f741e1bc10 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -1000,8 +1000,11 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType asset_ty
 			S32 balance = gStatusBar->getBalance();
 			if (balance < expected_upload_cost)
 			{
+				LLStringUtil::format_map_t args;
+				args["NAME"] = name;
+				args["AMOUNT"] = llformat("%d", expected_upload_cost);
 				// insufficient funds, bail on this upload
-				LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("uploading_costs"), expected_upload_cost);
+				LLBuyCurrencyHTML::openCurrencyFloater( LLTrans::getString("UploadingCosts", args), expected_upload_cost );
 				return;
 			}
 		}
-- 
cgit v1.2.3