diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-03-12 22:34:15 +0000 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-03-12 22:34:15 +0000 |
| commit | 1586107e87f20da7a3eb8b14beffaed03ffc5db5 (patch) | |
| tree | 60dd6cafc09babbf44efd91d5587405af199d0b6 /indra/newview/llappviewer.cpp | |
| parent | 45838b8b07a61af9b85ab9bc3013f1ac867e70d8 (diff) | |
SH-3944 WIP CHUI merge fixing
re-introduced don's refactor of low-level openGL calls pulling out of llui
and putting them into llrender. Took the new code from their updated versions
from the CHUI merge, but put them in a place accessible to appearance utility.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 0f77c68ec8..dac268ec92 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -803,7 +803,7 @@ bool LLAppViewer::init() LLUIImageList::getInstance(), ui_audio_callback, deferred_ui_audio_callback, - &LLUI::sGLScaleFactor); + &LLUI::getScaleFactor()); LL_INFOS("InitInfo") << "UI initialized." << LL_ENDL ; // NOW LLUI::getLanguage() should work. gDirUtilp must know the language |