merge changes for latest windlight integration project repo

1 files changed, 11 insertions, 6 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 a29c725ee9..cf4e224835 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
@@ -3,18 +3,23 @@
  legacy_header_height="18"
  height="450"
  layout="topleft"
- name="Environment Editor Floater"
- help_topic="environment_editor_floater"
+ name="Edit Water Preset"
+ help_topic=""
  save_rect="true"
  title="Edit Water Preset"
  width="900">
- 
+
+  <string name="title_new">Create a New Water Preset</string>
+  <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>
+
   <text
    follows="top|left|right"
    height="10"
    layout="topleft"
    left="30"
-   name="info_string"
+   name="hint"
    top="25"
    width="700">
    	To edit your preset, adjust the controls then click "Save"
@@ -26,7 +31,7 @@
    height="10"
    layout="topleft"
    left="30"
-   name="info_string"
+   name="label"
    top_pad="25"
    width="120">
    	Preset Name:
@@ -51,7 +56,7 @@
    height="40"
    layout="topleft"
    left_pad="10"
-   name="info_string"
+   name="note"
    top_delta="0"
    width="405"
    wrap="true">