From 3160877cbec672f0bc819afb111173c67a8c612b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 29 Sep 2009 23:18:29 -0700
Subject: Fixed reset UI size to default button missing from preferences >
 general (regression). Changed incremets to 0.001 to be more Liberation
 Sans-friendly

---
 ChangeLog.txt                                                    | 8 ++++++++
 linden/indra/newview/llpanelgeneral.cpp                          | 9 +++++++++
 linden/indra/newview/llpanelgeneral.h                            | 3 +++
 .../skins/default/xui/en-us/panel_preferences_general.xml        | 8 ++++++--
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f78a0a1..cc7ec34 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,13 @@
 2009-09-29 McCabe Maxsted  <hakushakukun@gmail.com>
 
+	* Fixed reset UI size to default button missing from preferences > general (regression).
+	  Changed incremets to 0.001 to be more Liberation Sans-friendly.
+	
+	  modified:   linden/indra/newview/llpanelgeneral.cpp
+	  modified:   linden/indra/newview/llpanelgeneral.h
+	  modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+
+
 	* Renamed preferences checkbox to 'show WindLight toolbar,' removed reference to 'Second Life.'
 	
 	  modified:   linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp
index 490e40d..e416401 100644
--- a/linden/indra/newview/llpanelgeneral.cpp
+++ b/linden/indra/newview/llpanelgeneral.cpp
@@ -74,6 +74,8 @@ BOOL LLPanelGeneral::postBuild()
 	
 	childSetValue("language_combobox", 	gSavedSettings.getString("Language"));
 
+	childSetAction("reset_ui_size", onClickResetUISize, this);
+
 	return TRUE;
 }
 
@@ -112,3 +114,10 @@ void LLPanelGeneral::apply()
 void LLPanelGeneral::cancel()
 {
 }
+
+// static
+void LLPanelGeneral::onClickResetUISize(void* user_data)
+{
+	LLPanelGeneral* self = (LLPanelGeneral*)user_data;
+	self->childSetValue("ui_scale_slider", 1.0f);
+}
diff --git a/linden/indra/newview/llpanelgeneral.h b/linden/indra/newview/llpanelgeneral.h
index 6fd10ff..73f6ee5 100644
--- a/linden/indra/newview/llpanelgeneral.h
+++ b/linden/indra/newview/llpanelgeneral.h
@@ -45,6 +45,9 @@ public:
 
 	void apply();
 	void cancel();
+	
+private:
+	static void onClickResetUISize(void*);
 };
 
 #endif
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index e8a2625..bb1c5ee 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -62,9 +62,13 @@
 		UI Size:
 	</text>
 	<slider bottom="-217" can_edit_text="true"
-	     decimal_digits="3" enabled="true" height="16" increment="0.025"
+	     decimal_digits="3" enabled="true" height="16" increment="0.001"
 	     initial_val="1" left="148" max_val="1.4" min_val="0.75" mouse_opaque="true"
-	     name="ui_scale_slider" show_text="true" value="1" width="256" />
+	     name="ui_scale_slider" show_text="true" value="1" width="220" />
+  <button bottom="-221" enabled="true" follows="left|top"
+	     font="SansSerif" halign="center" height="22" label="Reset"
+	     label_selected="Reset" left_delta="226" mouse_opaque="true"
+	     name="reset_ui_size" scale_image="true" width="80" />
 	<check_box bottom="-236" enabled="true" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Use resolution independent scale" left="151" mouse_opaque="true"
-- 
cgit v1.1