diff options
| author | Jacek Antonelli | 2008-12-09 22:25:37 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-09 22:25:41 -0600 |
| commit | 22b861982f2efd5d16097a012627e73b9fb85834 (patch) | |
| tree | 6152a84b92c682e271bdd52d46cd1728454f679a /linden/indra/llui/lluictrlfactory.cpp | |
| parent | Second Life viewer sources 1.22.1-RC (diff) | |
| download | meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.zip meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.gz meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.bz2 meta-impy-22b861982f2efd5d16097a012627e73b9fb85834.tar.xz | |
Second Life viewer sources 1.22.2-RC
Diffstat (limited to 'linden/indra/llui/lluictrlfactory.cpp')
| -rw-r--r-- | linden/indra/llui/lluictrlfactory.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/linden/indra/llui/lluictrlfactory.cpp b/linden/indra/llui/lluictrlfactory.cpp index bcd4876..db52261 100644 --- a/linden/indra/llui/lluictrlfactory.cpp +++ b/linden/indra/llui/lluictrlfactory.cpp | |||
| @@ -130,15 +130,7 @@ void LLUICtrlFactory::setupPaths() | |||
| 130 | for (path = root->getFirstChild(); path.notNull(); path = path->getNextSibling()) | 130 | for (path = root->getFirstChild(); path.notNull(); path = path->getNextSibling()) |
| 131 | { | 131 | { |
| 132 | LLUIString path_val_ui(path->getValue()); | 132 | LLUIString path_val_ui(path->getValue()); |
| 133 | std::string language = "en-us"; | 133 | std::string language = LLUI::getLanguage(); |
| 134 | if (LLUI::sConfigGroup) | ||
| 135 | { | ||
| 136 | language = LLUI::sConfigGroup->getString("Language"); | ||
| 137 | if(language == "default") | ||
| 138 | { | ||
| 139 | language = LLUI::sConfigGroup->getString("SystemLanguage"); | ||
| 140 | } | ||
| 141 | } | ||
| 142 | path_val_ui.setArg("[LANGUAGE]", language); | 134 | path_val_ui.setArg("[LANGUAGE]", language); |
| 143 | 135 | ||
| 144 | if (std::find(sXUIPaths.begin(), sXUIPaths.end(), path_val_ui.getString()) == sXUIPaths.end()) | 136 | if (std::find(sXUIPaths.begin(), sXUIPaths.end(), path_val_ui.getString()) == sXUIPaths.end()) |