From ef7b187ff600231f2ab9496e29b59392b2f4591c Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 1 Sep 2010 23:56:23 -0700
Subject: Fixed layout issues in preferences window caused by increased size

---
 .../skins/default/xui/en-us/panel_preferences_advanced.xml        | 6 +++---
 .../newview/skins/default/xui/en-us/panel_preferences_general.xml | 6 +++---
 .../skins/default/xui/en-us/panel_preferences_graphics1.xml       | 8 ++++----
 .../newview/skins/default/xui/en-us/panel_preferences_network.xml | 4 ++--
 .../newview/skins/default/xui/en-us/panel_preferences_voice.xml   | 2 +-
 .../newview/skins/default/xui/en-us/panel_preferences_web.xml     | 6 +++---
 6 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'linden/indra/newview')

diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 626a19b..74ea621 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -3,7 +3,7 @@
      height="408" label="Advanced" left="102" mouse_opaque="true"
      name="advanced_panel" width="517">
   <!-- Start organizing these when we get enough of 'em - MC -->
-  <tab_container label="Page 2" bottom="0" height="455" left="0" mouse_opaque="false"
+  <tab_container label="Page 2" bottom="0" height="450" left="0" mouse_opaque="false"
    name="tab2" tab_min_width="50" tab_position="top" width="495" bg_opaque_color="0,0,0,0.0">
     
     <panel border="true" bottom="-409" enabled="true" follows="left|top|right|bottom"
@@ -103,7 +103,7 @@
       <check_box bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
            initial_value="false" label="Use the chatbar as a command line" left="12"
            mouse_opaque="true" name="command_line_check" radio_style="false" width="270"/>
-      <button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" width="150"
+      <button bottom_delta="-20" follows="left|top" font="SansSerif" height="20" width="150"
            label="Chatbar Commands" name="command_line_btn" left="12"
            tool_tip="Set specific chatbar command line commands here" />
 
@@ -128,7 +128,7 @@
     </combo_item>
   </combo_box>-->
 
-    <button bottom="30" follows="left|top" font="SansSerifSmall" height="20" width="250" 
+    <button bottom="10" follows="left|bottom" font="SansSerif" height="20" width="250" 
            label="Reset All Preferences To Default" name="reset_btn" left="12" 
            tool_tip="Reset all preferences to their default values (requires a restart)" />
     </panel>
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 1357eb5..7b4b809 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
@@ -4,7 +4,7 @@
      name="general_panel" width="517">
   <combo_box name="default_location_combo"
              bottom="-22" left="155" height="16" width="150"
-             follows="left|bottom" font="SansSerifSmall"
+             follows="left|top" font="SansSerifSmall"
              mouse_opaque="true" allow_text_entry="true" max_chars="128">
     <combo_item name="MyHome" value="My Home">
       My Home
@@ -18,7 +18,7 @@
   </combo_box>
   <button name="grid_btn" label="Grid Manager"
           bottom_delta="0" left="330" height="16" width="100"
-          follows="left|bottom" font="SansSerifSmall" halign="center"
+          follows="left|top" font="SansSerifSmall" halign="center"
 		      mouse_opaque="true" scale_image="TRUE" />
   <check_box bottom="-44" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="true"
@@ -194,7 +194,7 @@
 		</combo_item>
 	</combo_box>
 	<combo_box allow_text_entry="true" bottom="-382" enabled="true"
-	     follows="left|bottom" height="16" left="153" max_chars="135"
+	     follows="left|top" height="16" left="153" max_chars="135"
 	     mouse_opaque="true" name="language_combobox" width="146">
 		<combo_item type="string" length="1" enabled="true" name="System Default Language" value="default">
 			System Default
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 4df33e2..55af056 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -141,16 +141,16 @@
 	     name="QualityText2" v_pad="0" width="95">
 		Quality
 	</text>
-	<icon bottom="-89" color="0.12 0.12 0.12 1.0" height="14"
+	<icon bottom="-89" color="0.12 0.12 0.12 1.0" height="14" follows="left|top" 
 	     image_name="rounded_square.tga" left="173" name="LowGraphicsDivet"
 	     width="2" />
-	<icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14"
+	<icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
 	     image_name="rounded_square.tga" left_delta="44" name="MidGraphicsDivet"
 	     width="2" />
-	<icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14"
+	<icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
 	     image_name="rounded_square.tga" left_delta="44" name="HighGraphicsDivet"
 	     width="2" />
-	<icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14"
+	<icon bottom_delta="0" color="0.12 0.12 0.12 1.0" height="14" follows="left|top"
 	     image_name="rounded_square.tga" left_delta="44" name="UltraGraphicsDivet"
 	     width="2" />
 	<slider bottom="-90" can_edit_text="false" control_name="RenderQualityPerformance"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index 2b9a551..1e4ded6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -31,12 +31,12 @@
 	     decimal_digits="0" enabled="true" follows="left|top" height="15"
 	     increment="10" initial_val="50" left_delta="0" max_val="1000" min_val="10"
 	     mouse_opaque="true" name="cache_size" show_text="true" width="180" />
-	<button bottom="-55" bottom_delta="-4" enabled="true" follows="left|bottom"
+	<button bottom_delta="-4" enabled="true" follows="left|top"
 	     font="SansSerif" halign="center" height="22" label="Clear Cache" left="340"
 	     left_delta="186" mouse_opaque="true" name="clear_cache" scale_image="true"
 	     width="100" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-70" bottom_delta="-17" drop_shadow_visible="true" enabled="true"
+	     bottom_delta="-17" drop_shadow_visible="true" enabled="true"
 	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left"
 	     height="10" left="12" mouse_opaque="false" name="cache_location_label"
 	     v_pad="0" width="200">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
index 1ec3fcd..fc9b6cd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_voice.xml
@@ -55,7 +55,7 @@
 	<button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
 	     height="20" label="Set Key" left_delta="0" mouse_opaque="true"
 	     name="set_voice_hotkey_button" width="115" />
-	<button bottom_delta="0" follows="left" font="SansSerif" halign="center" height="20"
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center" height="20"
 	     label="Middle Mouse Button" left_delta="120" mouse_opaque="true"
 	     name="set_voice_middlemouse_button" width="160" />
 	<text allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-25"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
index 76547e8..83facb4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
@@ -20,7 +20,7 @@
 	     v_pad="0" width="128">
 		Browser Cache:
 	</text>
-	<button bottom_delta="-10" enabled="true" follows="left|bottom" font="SansSerif"
+	<button bottom_delta="-10" enabled="true" follows="left|top" font="SansSerif"
 	     halign="center" height="22" label="Clear Now" left="140"
 	     mouse_opaque="true" name="clear_cache" scale_image="true" width="100" />
 	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -72,11 +72,11 @@
 	     height="18" left="100" name="world_search_editor"
 	     tool_tip="Address of the world search engine you would like to use"
 	     width="355" />
-	<button bottom_delta="-22" enabled="true" follows="left|bottom" font="SansSerif"
+	<button bottom_delta="-22" enabled="true" follows="left|top" font="SansSerif"
 	     halign="center" height="18" label="Reset" left="100" 
 	     tool_tip="Reset to default"
 	     mouse_opaque="true" name="world_search_reset_default" scale_image="true" width="65" />
-	<button  bottom_delta="0" enabled="true" follows="left|bottom" font="SansSerif"
+	<button  bottom_delta="0" enabled="true" follows="left|top" font="SansSerif"
 	     halign="center" height="18" label="Clear" left="170" 
 	     tool_tip="clear field"
 	     mouse_opaque="true" name="world_search_clear" scale_image="true" width="65" />
-- 
cgit v1.1