diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-05 16:21:45 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-05 16:21:45 -0800 |
| commit | 64b5c53156ce3115652e094be25a3e165512ffca (patch) | |
| tree | ca0e1a0c54fb61285056f04ba5f8758312049fd3 /indra/newview/llappviewer.cpp | |
| parent | f92a3add5910103e910ad993c3b09a26cc0d2d59 (diff) | |
| parent | a3fa96ff0eeb3691f38e82ad4a245db8049dfddd (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(); |