Hook up sky density panel to fixedenv and edit_ext_daycycle UI.

Fix retrieving LLSD for density configs (element not array) in density UI.

Tweak layout of sky density controls.

2 files changed, 41 insertions, 47 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index c3f94f9aa3..61299a43bd 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -524,11 +524,11 @@ Select a key frame from the timeline above to edit settings.
                                 border="true"
                                 class="panel_settings_density"
                                 filename="panel_settings_sky_density.xml"
-                                label="Advanced Atmospherics"
+                                label="Density"
                                 layout="topleft"
                                 left_delta="0"
                                 top_pad="5"
-                                name="sky_density_panel" />
+                                name="panel_settings_sky_density" />
                     </tab_container>
                 </layout_panel>        
             </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
index b97dfcd0fe..d82cdb30be 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
@@ -22,11 +22,11 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="28">
+                height="16">
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -35,53 +35,51 @@
                     max_val="1"
                     name="rayleigh_exponential"
                     label="Rayleigh Exponential Term:"
-                    top_delta="8"
+                    top_pad="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="0"
                     max_val="1"
                     name="rayleigh_exponential_scale"
                     label="Rayleigh Exponential Scale:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="0"
                     max_val="1"
                     name="rayleigh_linear"
                     label="Rayleigh Linear Term:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="0"
                     max_val="1"
                     name="rayleigh_constant"
                     label="Rayleigh Constant Term:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
         </layout_panel>
         <layout_panel
@@ -90,11 +88,11 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="28">
+                height="18">
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -103,68 +101,65 @@
                     max_val="3.0"
                     name="mie_exponential"
                     label="Mie Exponential Term:"
-                    top_delta="8"
+                    top_pad="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
-                    min_val="0"
+                    min_val="-1"
                     max_val="1"
                     name="mie_exponential_scale"
                     label="Mie Exponential Scale:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="0"
                     max_val="3.0"
                     name="mie_linear"
                     label="Mie Linear Term:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="0"
                     max_val="10"
                     name="mie_constant"
                     label="Mie Constant Term:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="0.2"
                     max_val="1.8"
                     name="mie_aniso_factor"
                     label="Mie Aniso Factor:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
         </layout_panel>
         <layout_panel
@@ -173,11 +168,11 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="28">
+                height="16">
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
@@ -186,53 +181,51 @@
                     max_val="1"
                     name="absorption_exponential"
                     label="Absorption Exponential Term:"
-                    top_delta="8"
+                    top_pad="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
-                    min_val="0"
+                    min_val="-1"
                     max_val="1"
                     name="absorption_exponential_scale"
                     label="Absorption Exponential Scale:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="0"
                     max_val="1"
                     name="absorption_linear"
                     label="Absorption Linear Term:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="0"
                     max_val="1"
                     name="absorption_constant"
                     label="Absorption Constant Term:"
-                    top_delta="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
         </layout_panel>
         <layout_panel
@@ -241,11 +234,11 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="16">
+                height="10">
             <slider
                     decimal_digits="2"
                     follows="left|top"
-                    height="16"
+                    height="14"
                     increment="1"
                     initial_value="0"
                     layout="topleft"
@@ -254,9 +247,10 @@
                     max_val="40000"
                     name="max_altitude"
                     label="Max Altitude:"
-                    top_delta="8"
+                    top_pad="8"
                     width="400"
+                    label_width="160"
                     can_edit_text="true"/>
         </layout_panel>
     </layout_stack>
-</panel>                
+</panel>