diff options
author | Richard Linden <none@none> | 2010-03-05 15:41:37 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2010-03-05 15:41:37 -0800 |
commit | a3fa96ff0eeb3691f38e82ad4a245db8049dfddd (patch) | |
tree | d02718296dfec15284ee94cd647b89084502f213 /indra/newview/llappviewer.cpp | |
parent | f0ea8083ebf207d00c043dd35eddf5ab55e71c0d (diff) | |
parent | 27919e106a383ea873b9bf73d2974b40cbe2e603 (diff) |
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index ccd58e26fe..36faeb100f 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -703,9 +703,9 @@ bool LLAppViewer::init() settings_map["account"] = &gSavedPerAccountSettings; LLUI::initClass(settings_map, - LLUIImageList::getInstance(), - ui_audio_callback, - &LLUI::sGLScaleFactor); + LLUIImageList::getInstance(), + ui_audio_callback, + &LLUI::sGLScaleFactor); // Setup paths and LLTrans after LLUI::initClass has been called LLUI::setupPaths(); |