diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2010-02-04 00:33:13 +0000 |
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2010-02-04 00:33:13 +0000 |
| commit | 2d9a08b5d1e74907ecd6df617e1be0c94cdd254d (patch) | |
| tree | 7e8a1629c13cc8f179545c85993e723470f6cc33 /indra/newview/llviewermenu.cpp | |
| parent | 6259214fac607200c26b421fc29bc37fbb7beca1 (diff) | |
| parent | fe5dc0351c810ba3c13d7c0c81adf910451e2293 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 0d6e490faa..a83baf7f9a 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7187,25 +7187,7 @@ void handle_buy_currency_test(void*) LLStringUtil::format_map_t replace; replace["[AGENT_ID]"] = gAgent.getID().asString(); replace["[SESSION_ID]"] = gAgent.getSecureSessionID().asString(); - - // *TODO: Replace with call to LLUI::getLanguage() after windows-setup - // branch merges in. JC - std::string language = "en"; - language = gSavedSettings.getString("Language"); - if (language.empty() || language == "default") - { - language = gSavedSettings.getString("InstallLanguage"); - } - if (language.empty() || language == "default") - { - language = gSavedSettings.getString("SystemLanguage"); - } - if (language.empty() || language == "default") - { - language = "en"; - } - - replace["[LANGUAGE]"] = language; + replace["[LANGUAGE]"] = LLUI::getLanguage(); LLStringUtil::format(url, replace); llinfos << "buy currency url " << url << llendl; |