merge up changes for water preset editing

1 files changed, 17 insertions, 14 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
index 77484bcfea..7d7e170c1e 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_water_preset.xml
@@ -13,6 +13,7 @@
   <string name="title_edit">Edit a Water Preset</string>
   <string name="hint_new">Name your preset, adjust the controls to create it, and click "Save".</string>
   <string name="hint_edit">To edit your water preset, adjust the controls and click "Save".</string>
+  <string name="combo_label">-Select a preset-</string>
 
   <text
    follows="top|left|right"
@@ -45,12 +46,14 @@
    	max_chars="100"
    	name="water_preset_combo"
    	top_delta="-5"
-   	width="200">
-      <combo_box.item
-       label="-Select a preset-"
-       name="item0"
-       value="any" />
-    </combo_box>
+   	width="200"/>
+
+   <line_editor
+    height="20"
+    left_delta="0"
+    name="water_preset_name"
+    top_delta="0"
+    width="200" />
    
    <text
    follows="top|left|right"
@@ -115,9 +118,9 @@
     layout="topleft"
     left_delta="-15"
     top_pad="0"
-    name="water_fog_destiny_label"
+    name="water_fog_density_label"
     width="200">
-    	Fog Destiny Exponent
+    	Fog Density Exponent
    </text>
    <slider
     decimal_digits="1"
@@ -127,7 +130,7 @@
     layout="topleft"
     left_delta="15"
     max_val="10"
-    name="fog_destiny_exponent"
+    name="WaterFogDensity"
     top_pad="10"
     width="200"/>
     
@@ -140,7 +143,7 @@
     top_pad="15"
     name="underwater_fog_modifier_label"
     width="200">
-    	Underwater For Modifier
+    	Underwater Fog Modifier
    </text>
    <slider
     decimal_digits="1"
@@ -150,7 +153,7 @@
     layout="topleft"
     left_delta="15"
     max_val="10"
-    name="underwater_fog_modifier"
+    name="WaterUnderWaterFogMod"
     top_pad="10"
     width="200"/>
     
@@ -175,7 +178,7 @@
      layout="topleft"             
      max_val="4"
      min_val="-4"
-     name="water_wave_direction_x"
+     name="WaterWave1DirX"
      top_pad="10"
      width="216"/>    
     <slider
@@ -188,7 +191,7 @@
      layout="topleft"
      max_val="4"
      min_val="-4"
-     name="water_wave_direction_y"
+     name="WaterWave1DirY"
      top_pad="5"
      width="216"/>
     
@@ -421,7 +424,7 @@
 	label="Make this preset my new water setting"
 	layout="topleft"
 	left="430"
-	name="new_water_preset_chb"
+	name="make_default_cb"
 	top_pad="30"
 	width="280"/>