Second Life viewer sources 1.15.0.2

1 files changed, 5 insertions, 0 deletions

diff --git a/linden/indra/llui/lluictrlfactory.cpp b/linden/indra/llui/lluictrlfactory.cpp
index 77ef749..475ef2e 100644
--- a/linden/indra/llui/lluictrlfactory.cpp
+++ b/linden/indra/llui/lluictrlfactory.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2003-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -241,6 +242,10 @@ void LLUICtrlFactory::setupPaths()
                         if (LLUI::sConfigGroup)
                         {
                                 language = LLUI::sConfigGroup->getString("Language");
+                                if(language == "default")
+                                {
+                                        language = LLUI::sConfigGroup->getString("SystemLanguage");
+                                }
                         }
                         path_val_ui.setArg("[Language]", language);
                         LLString fullpath = app_dir + path_val_ui.getString();