diff options
author | Richard Linden <none@none> | 2010-03-05 14:46:00 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2010-03-05 14:46:00 -0800 |
commit | 931ff555bdfe109e18a85a005bbe340f1951da40 (patch) | |
tree | eca53eefddae66b310182d9ffa88490b96fb8536 /indra/newview/llappviewer.cpp | |
parent | 18687a365245122fd74829fc0b735931d2d7d0e0 (diff) | |
parent | 485711e179e0ccf6351feb02318f41bbb5593662 (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(); |