From d5e1a0dd4bd59a1d982487b43a73ae7737031208 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 27 May 2013 19:18:47 -0500
Subject: [PATCH] Unbreak ui scaling.

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

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 7683d768e..68b37ef54 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1586,7 +1586,15 @@ LLViewerWindow::LLViewerWindow(
 	F32 ui_scale_factor = gSavedSettings.getF32("UIScaleFactor");
 	
 	mDisplayScale.setVec(llmax(1.f / mWindow->getPixelAspectRatio(), 1.f), llmax(mWindow->getPixelAspectRatio(), 1.f));
-	mDisplayScale *= ui_scale_factor;
+	if(mWindow->getFullscreen())
+	{
+		F32 height_normalization = gSavedSettings.getBOOL("UIAutoScale") ? ((F32)mWindowRectRaw.getHeight() / mDisplayScale.mV[VY]) / 768.f : 1.f;
+		mDisplayScale *= (ui_scale_factor * height_normalization);
+	}
+	else
+	{
+		mDisplayScale *= ui_scale_factor;
+	}
 	LLUI::setScaleFactor(mDisplayScale);
 
 	{