merge up latest viewer-development

1 files changed, 140 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_environment_settings.xml b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
new file mode 100644
index 0000000000..77cad2a2bd
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_environment_settings.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="400"
+ layout="topleft"
+ name="Environment Editor Floater"
+ help_topic="environment_editor_floater"
+ save_rect="true"
+ title="ENVIRONMENT EDITOR"
+ width="600">
+ 
+ <!-- Water Settings -->
+ <view_border
+  bevel_style="none"  
+  follows="top|left"
+  height="100"
+  layout="topleft"
+  left="50"
+  name="water_panel"
+  top="50"
+  width="500"/> 
+ <text
+  name="water_settings_title"
+  follows="top|left"
+  height="16"
+  layout="topleft"
+  left_delta="5"
+  top_delta="5"
+  width="35">
+  		Water
+  </text>
+  
+  <radio_group
+   follows="top|left"
+   height="45"
+   layout="topleft"
+   name="water_settings_radio_group"   
+   top_pad="20"
+   width="200">
+  	<radio_item  	 
+  	 label="Use region settings"
+  	 layout="topleft"
+  	 name="region_water_settings"/>
+  	<radio_item  	 
+  	 label="Use my settings"
+  	 layout="topleft"
+  	 name="my_water_settings"
+  	 top_pad="20"/>  	
+  </radio_group>
+  <combo_box
+   follows="top|left"
+   left_pad="2"
+   name="water_settings_preset_combo"
+   top_delta="24"
+   width="200">
+      <combo_box.item
+       label="-Select a preset-"
+       name="item0"
+       value="any" />
+  </combo_box>
+ 
+ 
+ <!-- Sky/Day Cycle Settings -->  
+ <view_border
+  bevel_style="none"  
+  follows="top|left"
+  height="180"
+  layout="topleft"
+  left="50"
+  name="sky_dayc_panel"
+  top="175"
+  width="500"/> 
+ <text
+  name="sky_dayc_settings_title"
+  follows="top|left"
+  height="16"
+  layout="topleft"
+  left="55"
+  top_delta="5"
+  width="100">
+  		Sky / Day Cycle
+  </text>
+  
+  <radio_group
+   follows="top|left"
+   height="45"
+   layout="topleft"
+   name="sky_dayc_settings_radio_group1"
+   top_pad="20"
+   width="200">
+  	<radio_item
+  	 layout="topleft"
+  	 label="Use region settings"
+  	 name="region_sky_dayc_settings"/>
+  	<radio_item
+  	 layout="topleft"
+  	 label="Use my settings"
+  	 name="my_sky_dayc_settings"
+  	 top_pad="20"/>  	
+  </radio_group>
+  
+  <radio_group
+   layout="topleft"
+   left_delta="50"
+   name="sky_dayc_settings_radio_group2"
+   top_pad="10"
+   height="50"
+   width="150">
+  	<radio_item
+  	 layout="topleft"
+  	 label="Fixed sky"
+  	 name="my_sky_settings"/>
+  	<radio_item
+  	 layout="topleft"
+  	 label="Day cycle"
+  	 name="my_dayc_settings"
+  	 top_pad="25"/>  	
+  </radio_group>
+  <combo_box
+   follows="top|left"
+   left_pad="2"
+   name="sky_settings_preset_combo"
+   top_delta="-7"
+   width="200">
+      <combo_box.item
+       label="-Select a preset-"
+       name="item0"
+       value="any" />
+  </combo_box>
+    <combo_box
+   follows="top|left"
+   name="dayc_settings_preset_combo"
+   top_delta="36"
+   width="200">
+      <combo_box.item
+       label="-Select a preset-"
+       name="item0"
+       value="any" />
+  </combo_box>		
+</floater>