diff options
author | James Cook <james@lindenlab.com> | 2008-11-19 23:26:29 +0000 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2008-11-19 23:26:29 +0000 |
commit | 2a44e81675d22aa5ed0844d5a4ac18bb9bd49f64 (patch) | |
tree | 595dd4b8b7beac938fc0e14ee075e5cfeb1f129b /indra/newview/llpanellogin.cpp | |
parent | 2d2d427158ca2465e2d70d84b4499cab57e2e208 (diff) |
QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge
Diffstat (limited to 'indra/newview/llpanellogin.cpp')
-rw-r--r-- | indra/newview/llpanellogin.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 13f3d125ed..816a8b5765 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -925,11 +925,7 @@ void LLPanelLogin::loadLoginPage() } // Language - std::string language(gSavedSettings.getString("Language")); - if(language == "default") - { - language = gSavedSettings.getString("SystemLanguage"); - } + std::string language = LLUI::getLanguage(); oStr << first_query_delimiter<<"lang=" << language; // First Login? |