diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-10-15 16:16:24 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-10-15 16:16:24 -0400 |
commit | c5373b90eb2de8f29be6801a07e937064ecb7fbb (patch) | |
tree | 007a91a0585bd9fcb20ca42695dbecc5a3c4b08e /indra/newview/llappviewer.cpp | |
parent | 7f0b247d4b6ce03e92ee3e80e8f7a2027813ea0c (diff) |
Add 'sourceid' settings var specifically for skin-files insertion.
Add logic after (both!) LLTransUtil::parseStrings() calls to ensure that
"[sourceid]" embedded in (e.g.) strings.xml content will be replaced.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index efa24796e5..9637bd328e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -771,6 +771,8 @@ bool LLAppViewer::init() LLUI::setupPaths(); LLTransUtil::parseStrings("strings.xml", default_trans_args); LLTransUtil::parseLanguageStrings("language_settings.xml"); + // parseStrings() sets up the LLTrans substitution table. Add this one item. + LLTrans::setDefaultArg("[sourceid]", gSavedSettings.getString("sourceid")); // Setup notifications after LLUI::setupPaths() has been called. LLNotifications::instance(); @@ -2242,6 +2244,8 @@ bool LLAppViewer::initConfiguration() LLUI::setupPaths(); // setup paths for LLTrans based on settings files only LLTransUtil::parseStrings("strings.xml", default_trans_args); LLTransUtil::parseLanguageStrings("language_settings.xml"); + // parseStrings() sets up the LLTrans substitution table. Add this one item. + LLTrans::setDefaultArg("[sourceid]", gSavedSettings.getString("sourceid")); // - set procedural settings // Note: can't use LL_PATH_PER_SL_ACCOUNT for any of these since we haven't logged in yet gSavedSettings.setString("ClientSettingsFile", |