aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/lluictrlfactory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llui/lluictrlfactory.cpp')
-rw-r--r--linden/indra/llui/lluictrlfactory.cpp10
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())