diff options
| author | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2019-03-01 22:39:32 +0200 |
|---|---|---|
| committer | ruslantproductengine <ruslantproductengine@lindenlab.com> | 2019-03-01 22:39:32 +0200 |
| commit | e58a45ec46c5a9418d6b7f24d33762a8f91ada98 (patch) | |
| tree | 2122583c237e0f15dc6210ec856e6264e50ad31c | |
| parent | 5715cda6e061294ae344ff6275ee4c643b91bf0f (diff) | |
mac build fix (add up to: https://bitbucket.org/lindenlab/viewer-cougar/pull-requests/46/clean-up-ui-scaling/diff)
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index e1700abc49..cc10d08f3a 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1763,17 +1763,6 @@ LLViewerWindow::LLViewerWindow(const Params& p) LLCoordScreen scr; mWindow->getSize(&scr); -#if LL_DARWIN - F32 system_scale_factor = 1.f; -#else - F32 system_scale_factor = mWindow->getSystemUISize(); - if (system_scale_factor < MIN_UI_SCALE || system_scale_factor > MAX_UI_SCALE) - { - // reset to default; - system_scale_factor = 1.f; - } -#endif - // Get the real window rect the window was created with (since there are various OS-dependent reasons why // the size of a window or fullscreen context may have been adjusted slightly...) F32 ui_scale_factor = llclamp(gSavedSettings.getF32("UIScaleFactor"), MIN_UI_SCALE, MAX_UI_SCALE) * mWindow->getSystemUISize(); |