SL-12510 Revert changes and separate 'Save Graphic Preset' floater

2 files changed, 94 insertions, 48 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_save_camera_preset.xml b/indra/newview/skins/default/xui/en/floater_save_camera_preset.xml
new file mode 100644
index 0000000000..54fdb6d167
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_save_camera_preset.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<floater
+ legacy_header_height="18"
+ height="185"
+ help_topic="floater_save_preset"
+ layout="topleft"
+ name="save_camera_preset"
+ save_rect="true"
+ title="Save Camera Preset"
+ width="280">
+
+    <string name="btn_label_save">Save</string>
+    <string name="btn_label_replace">Replace</string>
+    <radio_group
+     height="85"
+     layout="topleft"
+     left="20"
+     top="15"
+     width="150"
+     name="radio_save_preset">
+     <radio_item
+      label="Save as a new preset"
+      name="new_preset"
+      top="10" 
+      layout="topleft"
+      height="16" 
+      value="0"/>
+     <radio_item
+      label="Replace a preset"
+      name="replace_preset"
+      layout="topleft"
+      top="70" 
+      height="16" 
+      value="1"/>
+    </radio_group> 
+    <line_editor
+     commit_on_focus_lost = "true"
+     follows="top|left"
+     height="23"
+     layout="topleft"
+     left="41"
+     name="preset_txt_editor"
+     width="200"
+     top="45"/>
+    <button
+     follows="top|left"
+     height="25"
+     label="Save"
+     layout="topleft"
+     top="145"
+     left="25"
+     name="save"
+     width="110"/>
+    <button
+     follows="bottom|right"
+     height="25"
+     label="Cancel"
+     layout="topleft"
+     left_pad="20"
+     name="cancel"
+     width="110"/>
+<!-- *HACK to correctly draw drop-down list over the buttons-->
+    <combo_box
+     follows="top|left"
+     layout="topleft"
+     left="41"
+     name="preset_combo"
+     top_delta="-40"
+     width="200"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
index 3a5838e846..62260274f5 100644
--- a/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_save_pref_preset.xml
@@ -1,72 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <floater
  legacy_header_height="18"
- height="185"
+ height="145"
  help_topic="floater_save_preset"
  layout="topleft"
  name="save_pref_preset"
  save_rect="true"
- title="SAVE PREF PRESET"
- width="280">
+ title="Save Graphic Preset"
+ width="300">
 
-    <string name="title_graphic">Save Graphic Preset</string>
-    <string name="title_camera">Save Camera Preset</string>
-    <string name="btn_label_save">Save</string>
-    <string name="btn_label_replace">Replace</string>
-    <radio_group
-     height="85"
+    <text
+     follows="top|left|right"
+     height="32"
      layout="topleft"
+     word_wrap="true"
      left="20"
-     top="15"
-     width="150"
-     name="radio_save_preset">
-     <radio_item
-      label="Save as a new preset"
-      name="new_preset"
-      top="10" 
-      layout="topleft"
-      height="16" 
-      value="0"/>
-     <radio_item
-      label="Replace a preset"
-      name="replace_preset"
-      layout="topleft"
-      top="70" 
-      height="16" 
-      value="1"/>
-    </radio_group> 
-    <line_editor
-     commit_on_focus_lost = "true"
+     name="Preset"
+     top="30"
+     width="200">
+     Type a name for the preset or choose an existing preset.
+    </text>
+    <combo_box
      follows="top|left"
-     height="23"
      layout="topleft"
-     left="41"
-     name="preset_txt_editor"
-     width="200"
-     top="45"/>
+     left="20"
+     name="preset_combo"
+     top_delta="35"
+     allow_text_entry="true"
+     width="200"/>
     <button
      follows="top|left"
-     height="25"
+     height="23"
      label="Save"
      layout="topleft"
-     top="145"
-     left="25"
+     top_delta="40"
+     left="20"
      name="save"
-     width="110"/>
+     width="70"/>
     <button
      follows="bottom|right"
-     height="25"
+     height="23"
      label="Cancel"
      layout="topleft"
      left_pad="20"
      name="cancel"
-     width="110"/>
-<!-- *HACK to correctly draw drop-down list over the buttons-->
-    <combo_box
-     follows="top|left"
-     layout="topleft"
-     left="41"
-     name="preset_combo"
-     top_delta="-40"
-     width="200"/>
+     width="70"/>
 </floater>