From 0008208ce02f7612735d7a599a29b821cbc2a083 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 17 Sep 2010 18:43:26 -0500
Subject: UI Scale Reset button finds the actual default, not hardcoded.

---
 linden/indra/newview/llpanelgeneral.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 287ee41..a2cba4c 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -214,7 +214,8 @@ void LLPanelGeneral::cancel()
 void LLPanelGeneral::onClickResetUISize(void* user_data)
 {
 	LLPanelGeneral* self = (LLPanelGeneral*)user_data;
-	self->childSetValue("ui_scale_slider", 1.002f);
+	F32 def = gSavedSettings.getControl("UIScaleFactor")->getDefault().asReal();
+	self->childSetValue("ui_scale_slider", def);
 }
 
 // static
-- 
cgit v1.1