STORM-1205 ADDITIONAL FIX Add "Environment" tab to the "Region/Estate" floater

- Set tab Environment to the right place (tab order) in the Region\Estate floater

- Updated Environment tab content according the spec

1 files changed, 1 insertions, 150 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_region_info.xml b/indra/newview/skins/default/xui/en/floater_region_info.xml
index 017c70cf49..3b58cd08f6 100644
--- a/indra/newview/skins/default/xui/en/floater_region_info.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_info.xml
@@ -16,154 +16,5 @@
      name="region_panels"
      right="-1"
      tab_position="top"
-     top="20">
-     
-     <!-- Temporary panel. It will be deleted from this xml. It'll be added the same way as others tab panels -->
-    <panel
-     border="true"
-     bevel_style="none"
-	 follows="top|left"
-	 height="320"
-	 label="Emvironment"
-	 layout="topleft"
-	 left="0"
-	 name="environment_tab"
-	 width="4250">
-	 
-	 <!-- Water Settings --> 
-	 <view_border
-	  bevel_style="none"  
-	  follows="top|left"
-	  height="100"
-	  layout="topleft"
-	  left="50"
-	  name="water_panel"
-	  top="50"
-	  width="430"/> 
-	 <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>
-	 
-	 
-	 <!-- 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="430"/> 
-	 <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>
-	    <combo_box
-	   follows="top|left"
-	   name="dayc_settings_preset_combo"
-	   top_delta="36"
-	   width="200">
-	  </combo_box>
-	  
-	  <button
-	   follows="bottom|right"
-	   height="23"
-	   label="Save"
-	   layout="topleft"
-	   left_pad="0"
-	   name="save"
-	   width="70"/>	 
-	 <button
-	   follows="bottom|right"
-	   height="23"
-	   label="Cancel"
-	   layout="topleft"
-	   left_pad="15"
-	   name="cancel"
-	   width="70"/>
-     </panel>
-     
-     </tab_container>
+     top="20"/>
 </floater>