diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-06 11:15:09 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-06 11:15:09 +0000 |
commit | 809a280a51bc8645de7a02c2a3dbe32bc230b93c (patch) | |
tree | 2a4d6dbe1fb8d78e77f5f7ce118a5f662788a453 /indra/newview/llappviewer.cpp | |
parent | 1889d02569a58d08b6c452e609819a1961bf64e8 (diff) | |
parent | 93051dc23cb3252af327a9b113abc45de154ff4e (diff) |
viewer2 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 b1db7bf481..33ab12c623 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -704,9 +704,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(); |