From d571b2df4183f2bfdc29aedbd05b371427b42fde Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 21 Sep 2016 00:42:42 +0200
Subject: [PATCH] BUG-40548: Don't bug user with DPI scaling changed on first
 run after clean install

---
 indra/newview/llviewerwindow.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 4ecb5a6496..60e2c0da66 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1831,7 +1831,10 @@ LLViewerWindow::LLViewerWindow(const Params& p)
 	F32 system_scale_factor = mWindow->getSystemUISize();
 	if (p.first_run || gSavedSettings.getF32("LastSystemUIScaleFactor") != system_scale_factor)
 	{
-		mSystemUIScaleFactorChanged = true;
+		// <FS:Ansariel> BUG-40548: Don't bug user with DPI scaling changed on first run after clean install
+		//mSystemUIScaleFactorChanged = true;
+		mSystemUIScaleFactorChanged = !p.first_run;
+		// </FS:Ansariel>
 		gSavedSettings.setF32("LastSystemUIScaleFactor", system_scale_factor);
 		gSavedSettings.setF32("UIScaleFactor", system_scale_factor);
 	}