STORM-2082 Rearrange Reset, load, save, delete buttons.

Make load, save, and delete floaters close when preferences floater closes.

1 files changed, 54 insertions, 53 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index a94907f0c9..6cf9045f2a 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -31,34 +31,6 @@
       (None)
   </text>
 
-  <button
-    follows="top|left"
-    height="23"
-    label="Load preset..."
-    layout="topleft"
-    left_pad="5"
-    name="PrefLoadButton"
-    top_delta="0"
-    width="115">
-    <button.commit_callback
-      function="Pref.PrefLoad"
-	  parameter="graphic"/>
-  </button>
-
-  <button
-    follows="top|left"
-    height="23"
-    label="Delete preset..."
-    layout="topleft"
-    left_pad="5"
-    name="PrefDeleteButton"
-    top_delta="0"
-    width="115">
-    <button.commit_callback
-      function="Pref.PrefDelete"
-	  parameter="graphic"/>
-  </button>
-
   <text
     type="string"
     length="1"
@@ -230,19 +202,6 @@
 
 <!-- This block shows Basic Settings -->
 
-  <button
-    follows="top|left"
-    height="23"
-    label="Reset to recommended settings"
-    layout="topleft"
-    left="5"
-    name="Defaults"
-    top_delta="30"
-    width="210">
-    <button.commit_callback
-      function="Pref.HardwareDefaults" />
-  </button>
-
   <slider
     control_name="RenderFarClip"
     decimal_digits="0"
@@ -303,30 +262,72 @@
 <!-- End of Basic Settings block -->
 
   <button
-    follows="left|bottom"
+    follows="top|left"
     height="23"
-    label="Advanced Settings..."
+    label="Save settings as a preset..."
     layout="topleft"
     left="10"
-    name="AdvancedSettings"
-    top_delta="60"
+    name="PrefSaveButton"
+    top="310"
     width="200">
     <button.commit_callback
-      function="Pref.Advanced"
-      parameter="advanced" />
+      function="Pref.PrefSave"
+      parameter="graphic" />
   </button>
 
   <button
-    follows="left|bottom"
+    follows="top|left"
     height="23"
-    label="Save settings as a preset..."
+    label="Load preset..."
+    layout="topleft"
+    left_pad="10"
+    name="PrefLoadButton"
+    top_delta="0"
+    width="115">
+    <button.commit_callback
+      function="Pref.PrefLoad"
+	  parameter="graphic"/>
+  </button>
+
+  <button
+    follows="top|left"
+    height="23"
+    label="Delete preset..."
+    layout="topleft"
+    left_pad="10"
+    name="PrefDeleteButton"
+    top_delta="0"
+    width="115">
+    <button.commit_callback
+      function="Pref.PrefDelete"
+	  parameter="graphic"/>
+  </button>
+
+  <button
+    follows="top|left"
+    height="23"
+    label="Reset to recommended settings"
     layout="topleft"
     left="10"
-    name="PrefSaveButton"
-    top="295"
+    name="Defaults"
+    top_delta="65"
+    width="210">
+    <button.commit_callback
+      function="Pref.HardwareDefaults" />
+  </button>
+
+  <button
+    follows="top|left"
+    height="23"
+    label="Advanced Settings..."
+    layout="topleft"
+    left_pad="10"
+    name="AdvancedSettings"
+    top_delta="0"
     width="200">
     <button.commit_callback
-      function="Pref.PrefSave"
-      parameter="graphic" />
+      function="Pref.Advanced"
+      parameter="advanced" />
   </button>
+
 </panel>