From 641ada030eee8eaf4a320469e4d19d120f6d1043 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 27 May 2013 19:23:36 -0500
Subject: [PATCH] Didn't actually want to commit the latter ui-scale related
 change, but rebasing is too annoying, so revert.

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

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 21c10dac0..1c7007eea 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1586,15 +1586,7 @@ LLViewerWindow::LLViewerWindow(
 	F32 ui_scale_factor = gSavedSettings.getF32("UIScaleFactor");
 	
 	mDisplayScale.setVec(llmax(1.f / mWindow->getPixelAspectRatio(), 1.f), llmax(mWindow->getPixelAspectRatio(), 1.f));
-	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;
-	}
+	mDisplayScale *= ui_scale_factor;
 	LLUI::setScaleFactor(mDisplayScale);
 
 	{