diff options
| author | James Cook <james@lindenlab.com> | 2010-05-25 11:41:33 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-25 11:41:33 -0700 |
| commit | a91d10dc1806d1931c7f1361bfcf70df59d982d5 (patch) | |
| tree | 20f2940d888aaf71c54ff1e7834cbf79a3617216 /indra/newview/llviewermenufile.cpp | |
| parent | d6ea42984553b7adb6f26cf2ed094d32e36814d2 (diff) | |
| parent | f682c996d28c3841b6709f8fc67ba443bfcd1926 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index c415d89e9c..5570fe5fec 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -39,7 +39,7 @@ #include "llagentcamera.h" #include "llfilepicker.h" #include "llfloaterreg.h" -#include "llfloaterbuycurrency.h" +#include "llbuycurrencyhtml.h" #include "llfloatersnapshot.h" #include "llimage.h" #include "llimagebmp.h" @@ -811,7 +811,7 @@ void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExt LLStringUtil::format_map_t args; args["NAME"] = data->mAssetInfo.getName(); args["AMOUNT"] = llformat("%d", expected_upload_cost); - LLFloaterBuyCurrency::buyCurrency(LLTrans::getString("UploadingCosts", args), expected_upload_cost); + LLBuyCurrencyHTML::openCurrencyFloater( LLTrans::getString("UploadingCosts", args), expected_upload_cost ); is_balance_sufficient = FALSE; } else if(region) |