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/llagentlanguage.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/llagentlanguage.cpp')
| -rw-r--r-- | indra/newview/llagentlanguage.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llagentlanguage.cpp b/indra/newview/llagentlanguage.cpp index 7401f95f29..e34e8d1969 100644 --- a/indra/newview/llagentlanguage.cpp +++ b/indra/newview/llagentlanguage.cpp @@ -31,13 +31,17 @@ #include "llviewerprecompiledheaders.h" #include "llagentlanguage.h" +// viewer includes #include "llagent.h" #include "llviewercontrol.h" #include "llviewerregion.h" +// library includes +#include "llui.h" // getLanguage() LLAgentLanguage::LLAgentLanguage() { gSavedSettings.getControl("Language")->getSignal()->connect(boost::bind(&update)); + gSavedSettings.getControl("InstallLanguage")->getSignal()->connect(boost::bind(&update)); gSavedSettings.getControl("SystemLanguage")->getSignal()->connect(boost::bind(&update)); gSavedSettings.getControl("LanguageIsPublic")->getSignal()->connect(boost::bind(&update)); } @@ -51,9 +55,7 @@ bool LLAgentLanguage::update() std::string url = gAgent.getRegion()->getCapability("UpdateAgentLanguage"); if (!url.empty()) { - std::string language = gSavedSettings.getString("Language"); - if (language == "default") - language = gSavedSettings.getString("SystemLanguage"); + std::string language = LLUI::getLanguage(); body["language"] = language; body["language_is_public"] = gSavedSettings.getBOOL("LanguageIsPublic"); @@ -62,4 +64,3 @@ bool LLAgentLanguage::update() } return true; } - |