diff options
| author | Richard Linden <none@none> | 2011-11-29 23:54:00 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-11-29 23:54:00 -0800 |
| commit | 0323a37ac6c55e3ed599f60f4950c49e0e084c4a (patch) | |
| tree | 5375e3679b21e8e7893bb5b8761ba681f981c68e /indra/newview/llviewerwindow.cpp | |
| parent | f2f90b6ed8e493a42aff805135527d6a7a345e3e (diff) | |
| parent | ff32ef773b19a6d0f7826c7edf7962e2fde492e6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 2479006eeb..22076417a6 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -4745,6 +4745,9 @@ void LLViewerWindow::initFonts(F32 zoom_factor) { LLFontGL::destroyAllGL(); // Initialize with possibly different zoom factor + + LLFontManager::initClass(); + LLFontGL::initClass( gSavedSettings.getF32("FontScreenDPI"), mDisplayScale.mV[VX] * zoom_factor, mDisplayScale.mV[VY] * zoom_factor, |