diff options
| author | Dave Parks <none@none> | 2010-06-07 23:05:22 -0500 |
|---|---|---|
| committer | Dave Parks <none@none> | 2010-06-07 23:05:22 -0500 |
| commit | f461ae214c8c998f5a0e3661696a30d27ad2814e (patch) | |
| tree | e9430d423ee46fad6cb8319575d37ec925b88e99 /indra/newview/llviewermenufile.cpp | |
| parent | 84e619a6dc9e5a5967c4ce035ac530a4588f72a5 (diff) | |
| parent | 48809cb3a9350a0357a0fc710140e2437f3e068e (diff) | |
Merge with render-pipeline
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 aca0090d7d..e473461622 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 "llfloaterimportcollada.h" #include "llfloatermodelpreview.h" #include "llfloatersnapshot.h" @@ -962,7 +962,7 @@ void upload_done_callback( 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) |