diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-09-12 11:32:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-09-12 11:32:13 -0400 |
| commit | 08b75949998adbe3bbb4ef1d1d7e49405e468c94 (patch) | |
| tree | cef5bdd4706a23410eb097909f26fa45f5bda7f6 | |
| parent | 84a53eb5477d4ab6782f0f21a9558482f7b66b6b (diff) | |
| parent | 535710ae25a7f161d2aacf6e12d94a8dfe599d08 (diff) | |
merge changes for storm-1587
| -rw-r--r-- | indra/newview/llappviewer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 7e597fe5dc..4e1ef59765 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -786,6 +786,12 @@ bool LLAppViewer::init() &LLUI::sGLScaleFactor); LL_INFOS("InitInfo") << "UI initialized." << LL_ENDL ; + // Setup paths and LLTrans after LLUI::initClass has been called. + LLUI::setupPaths(); + LLTransUtil::parseStrings("strings.xml", default_trans_args); + LLTransUtil::parseLanguageStrings("language_settings.xml"); + + // Setup notifications after LLUI::setupPaths() has been called. LLNotifications::instance(); LL_INFOS("InitInfo") << "Notifications initialized." << LL_ENDL ; @@ -831,12 +837,6 @@ bool LLAppViewer::init() LLError::setPrintLocation(true); } - - // Setup paths and LLTrans after LLUI::initClass has been called - LLUI::setupPaths(); - LLTransUtil::parseStrings("strings.xml", default_trans_args); - LLTransUtil::parseLanguageStrings("language_settings.xml"); - // LLKeyboard relies on LLUI to know what some accelerator keys are called. LLKeyboard::setStringTranslatorFunc( LLTrans::getKeyboardString ); |