diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-11-14 16:00:02 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-11-14 16:00:02 -0500 |
| commit | b344612e4c99ea57b98e88d5569f50fed1dd8955 (patch) | |
| tree | 7a4c94a02862741bba95becc80e7cdac782d091e | |
| parent | 852e60859977a6a2b088d8c99ae7350fe3a3d587 (diff) | |
DRTVWR-241: resolve merge conflict with viewer-development.
LLUI::setupPaths() went away with DRTVWR-210.
| -rw-r--r-- | indra/newview/llappviewer.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index fddf8bd7a3..438194c715 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2765,7 +2765,6 @@ bool LLAppViewer::initConfiguration() // keeps growing, necessitating a method all its own. void LLAppViewer::initStrings() { - LLUI::setupPaths(); LLTransUtil::parseStrings("strings.xml", default_trans_args); LLTransUtil::parseLanguageStrings("language_settings.xml"); |