diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 15:35:47 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 15:35:47 +0100 |
| commit | 65d887250759183c0221d20003026f71fbb44b3e (patch) | |
| tree | 3801b495b2ebdfc5c5a0c9560162cd1bd2362d39 /indra/newview | |
| parent | b9ea8cc0b53d6a352e0bda8f45dc46ae6d7fc71c (diff) | |
merge fix in unrelated file.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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; } } |