From 7a7dc795f64c7a8ac6de055db5fcfe83d821810d Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 26 Sep 2016 00:58:25 +0300
Subject: MAINT-6744 'System UI size factor has changed... ' shouldn't appear
after installation
---
doc/contributions.txt | 1 +
indra/newview/llviewerwindow.cpp | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 9f6b701000..772d7fe3b5 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
Aralara Rajal
Arare Chantilly
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);
}
--
cgit v1.2.3