From db984bebb11983ebcb755092cd9fb6ab427fecab Mon Sep 17 00:00:00 2001
From: Kadah_Coba <kadah.coba@gmail.com>
Date: Sat, 12 Nov 2011 23:35:30 -0800
Subject: [PATCH] Pref work: Moved and renamed Pref>Advanced>"Font Scaling" to
 Pref>UI>"UI Scaling"

---
 .../default/xui/en/panel_preferences_UI.xml   | 29 ++++++++++++++++++-
 .../xui/en/panel_preferences_advanced.xml     | 26 -----------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
index dcfe9c3cef..11d89e60dc 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
@@ -31,6 +31,33 @@
      label="General"
      name="UI Prefs Panel" >
 
+        <text
+         type="string"
+         length="1"
+         follows="left|top"
+         height="12"
+         layout="topleft"
+         left="30"
+         name="UI Size:"
+         top_pad="10"
+         width="200">
+            UI Scaling (may have side effects):
+        </text>
+        <slider
+         control_name="UIScaleFactor"
+         decimal_digits="2"
+         follows="left|top"
+         height="17"
+         increment="0.025"
+         initial_value="1"
+         layout="topleft"
+         left_pad="0"
+         max_val="1.4"
+         min_val="0.75"
+         name="ui_scale_slider"
+         top_pad="-14"
+         width="250" />
+
         <text
          type="string"
          left="5"
@@ -251,7 +278,7 @@
         <text
          type="string"
          left="200"
-         top="10"
+         top="35"
          length="1"
          follows="left|top"
          height="12"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 99ee871b7c..bf1358f5ec 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -17,32 +17,6 @@
      name="middle_mouse">
         Middle Mouse
     </panel.string>
-    <text
-     type="string"
-     length="1"
-     follows="left|top"
-     height="12"
-     layout="topleft"
-     left="33"
-     name="UI Size:"
-     top_pad="25"
-     width="200">
-        Font Scaling (may have side effects):
-    </text>
-    <slider
-     control_name="UIScaleFactor"
-     decimal_digits="2"
-     follows="left|top"
-     height="17"
-     increment="0.025"
-     initial_value="1"
-     layout="topleft"
-     left_pad="0"
-     max_val="1.4"
-     min_val="0.75"
-     name="ui_scale_slider"
-     top_pad="-14"
-     width="250" />
     <check_box
      control_name="AllowMultipleViewers"
      follows="top|left"