merge changes for latest windlight integration project repo

6 files changed, 70 insertions, 44 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
index a7ab5abf38..1539c6448e 100644
--- a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml
@@ -2,22 +2,31 @@
 <floater
  legacy_header_height="18"
  height="130"
- help_topic="environment_editor_floater"
+ help_topic=""
  layout="topleft"
- name="Environment Editor Floater"
+ name="Delete Env Preset"
  save_rect="true"
- title="DELETE PRESETS"
+ title="DELETE ENV PRESET"
  width="550">
+
+    <string name="title_water">Delete Water Preset</string>
+    <string name="title_sky">Delete Sky Preset</string>
+    <string name="title_day_cycle">Delete Day Cycle</string>
+
+    <string name="label_water">Preset:</string>
+    <string name="label_sky">Preset:</string>
+    <string name="label_day_cycle">Day cycle:</string>
+
     <text
      follows="top|left|right"
      font="SansSerif"
      height="10"
      layout="topleft"
      left="50"
-     name="delete_preset"
+     name="label"
      top="60"
      width="60">
-     Setting:
+     Preset:
     </text>
     <combo_box
      follows="top|left"
diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
index e76059751e..7572efea05 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml
@@ -3,17 +3,23 @@
  legacy_header_height="18"
  height="450"
  layout="topleft"
- name="Environment Editor Floater"
- help_topic="environment_editor_floater"
+ name="Edit Day cycle"
+ help_topic=""
  save_rect="true"
  title="Edit Day Cycle"
  width="800">
+
+    <string name="title_new">Create a New Day Cycle</string>
+    <string name="title_edit">Edit Day Cycle</string>
+    <string name="hint_new">Name your day cycle, adjust the controls to create it, and click "Save".</string>
+    <string name="hint_edit">To edit your day cycle, adjust the controls below 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"
@@ -24,7 +30,7 @@
      height="10"
      layout="topleft"
      left="30"
-     name="info_string"
+     name="label"
      top_pad="25"
      width="120">
      Preset Name:
@@ -34,7 +40,7 @@
      follows="top|left"
      layout="topleft"
      left_pad="10"
-     name="water_preset_combo"
+     name="day_cycle_combo"
      top_delta="-5"
      width="200">
         <combo_box.item
@@ -47,7 +53,7 @@
      height="40"
      layout="topleft"
      left_pad="10"
-     name="info_string"
+     name="note"
      top_delta="0"
      width="405"
      wrap="true">
@@ -452,7 +458,7 @@
         <check_box
          follows="top|left"
          height="10"
-         label="Make this preset my new water setting"
+         label="Make this my new day cycle"
          layout="topleft"
          left="330"
          name="new_water_preset_chb"
diff --git a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
index 7ddb7ac1e1..ae7e83ee56 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_sky_preset.xml
@@ -3,17 +3,23 @@
  legacy_header_height="18"
  height="375"
  layout="topleft"
- name="Environment Editor Floater"
- help_topic="environment_editor_floater"
+ name="Edit Sky Preset"
+ help_topic=""
  save_rect="true"
  title="Edit Sky Preset"
  width="900">
+
+    <string name="title_new">Create a New Sky Preset</string>
+    <string name="title_edit">Edit Sky 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 sky 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"
@@ -24,7 +30,7 @@
      height="10"
      layout="topleft"
      left="30"
-     name="info_string"
+     name="label"
      top_pad="25"
      width="120">
         Preset Name:
@@ -34,7 +40,7 @@
      follows="top|left"
      layout="topleft"
      left_pad="10"
-     name="water_preset_combo"
+     name="sky_preset_combo"
      top_delta="-5"
      width="200">
         <combo_box.item
@@ -47,7 +53,7 @@
      height="40"
      layout="topleft"
      left_pad="10"
-     name="info_string"
+     name="note"
      top_delta="0"
      width="405"
      wrap="true">
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">
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 093a5e36d3..d8aec81eba 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -539,22 +539,22 @@
 	     	 	 label="New preset..."
 	     	 	 name="new_water_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="new_water"/>
 	     	 	</menu_item_call>
 	     	 	<menu_item_call
 	     	 	 label="Edit preset..."
 	     	 	 name="edit_water_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="edit_water"/>
 	     	 	</menu_item_call>
 	     	 	<menu_item_call
 	     	 	 label="Delete preset..."
 	     	 	 name="delete_water_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="delete_water"/>
 	     	 	</menu_item_call>
 	     	</menu>
 	     	
@@ -565,22 +565,22 @@
 	     	 	 label="New preset..."
 	     	 	 name="new_sky_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="new_sky"/>
 	     	 	</menu_item_call>
 	     	 	<menu_item_call
 	     	 	 label="Edit preset..."
 	     	 	 name="edit_sky_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="edit_sky"/>
 	     	 	</menu_item_call>
 	     	 	<menu_item_call
 	     	 	 label="Delete preset..."
 	     	 	 name="delete_sky_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="delete_sky"/>
 	     	 	</menu_item_call>
 	     	</menu>
 	     	
@@ -591,22 +591,22 @@
 	     	 	 label="New preset..."
 	     	 	 name="new_day_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="new_day_cycle"/>
 	     	 	</menu_item_call>
 	     	 	<menu_item_call
 	     	 	 label="Edit preset..."
 	     	 	 name="edit_day_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="edit_day_cycle"/>
 	     	 	</menu_item_call>
 	     	 	<menu_item_call
 	     	 	 label="Delete preset..."
 	     	 	 name="delete_day_preset">
 	     	 	 	<menu_item_call.on_click
-	     	 	 	function="stub"
-	     	 	 	parameter="stub"/>
+	     	 	 	function="World.EnvPreset"
+	     	 	 	parameter="delete_day_cycle"/>
 	     	 	</menu_item_call>
 	     	</menu>
 	    </menu>
diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml
index 956ba53a26..91d0bbe6bf 100644
--- a/indra/newview/skins/default/xui/en/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml
@@ -123,10 +123,10 @@
  <button
   follows="left|top"
   height="23"
-  label="Save"
+  label="Apply"
   layout="topleft"
   right="-160"
-  name="save_btn"
+  name="apply_btn"
   top_pad="150"
   width="100" />
  <button