diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-09-30 17:44:38 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-09-30 17:44:38 +0300 |
| commit | f5f4b771f1b6888371415fb088ae63ac3ef36dc7 (patch) | |
| tree | 097d7280c568ac62ea47d8ee1c5d5662ef1f8f65 | |
| parent | b7b98918eb36a1b69ef987a0b1fe8861a39b25b9 (diff) | |
| parent | 7a7dc795f64c7a8ac6de055db5fcfe83d821810d (diff) | |
Merged in lindenlab/viewer-bear
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 6515394a00..bd534ecc88 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -201,6 +201,7 @@ Ansariel Hiller MAINT-6612 MAINT-6637 MAINT-6636 + MAINT-6744 MAINT-6752 MAINT-6773 Aralara Rajal diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 79ddc43a3e..9679f69e2c 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1755,7 +1755,7 @@ LLViewerWindow::LLViewerWindow(const Params& p) F32 system_scale_factor = mWindow->getSystemUISize(); if (p.first_run || gSavedSettings.getF32("LastSystemUIScaleFactor") != system_scale_factor) { - mSystemUIScaleFactorChanged = true; + mSystemUIScaleFactorChanged = !p.first_run; gSavedSettings.setF32("LastSystemUIScaleFactor", system_scale_factor); gSavedSettings.setF32("UIScaleFactor", system_scale_factor); } |