Tidied up the sky/water editors (both use a flyout_button to save now). Still some non-trivial bugs to fix, specifically: #474 and #475. Both have repros

1 files changed, 14 insertions, 10 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_water.xml b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
index fd0c131..441ce7b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
@@ -21,17 +21,21 @@
              label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
              mouse_opaque="true" name="next" scale_image="true" width="20" />
         <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="New" label_selected="New" left_delta="30"
-             mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="50" />
+             label="New" right="-270"
+       mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="100" />
+  <flyout_button bottom_delta="0" follows="left|top" height="20" label="Save to Disk"
+       right="-140" halign="center" list_position="above" enabled="true" 
+       mouse_opaque="true" width="125"  name="WaterSavePreset">
+    <flyout_button_item value="save_inventory_item" name="save_inventory_item">
+      Save to Inventory
+    </flyout_button_item>
+    <flyout_button_item value="save_disk_item" name="save_disk_item">
+      Save to Disk
+    </flyout_button_item>
+  </flyout_button>
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Save to Disk" label_selected="Save to Disk" left_delta="50"
-             mouse_opaque="true" name="WaterSavePreset" scale_image="true" width="110" />
-        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Save to Inventory" label_selected="Save" left_delta="110"
-             mouse_opaque="true" name="WaterSaveNotecard" scale_image="true" width="110" />
-        <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Delete File" label_selected="Delete File" left_delta="110"
-             mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="110" />
+             label="Delete File" label_selected="Delete File" right="-10"
+             mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="125" />
         <tab_container bottom="-240" follows="left|top" height="180" left="0"
              mouse_opaque="false" name="Water Tabs" tab_position="top" width="700">
                 <panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"