Merged in graham_linden/viewer-eep-graham (pull request #77)

SL-1936 and SL-1912 WIP

4 files changed, 464 insertions, 0 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 c8843db28b..aec71fda07 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
@@ -520,6 +520,17 @@ Select a key frame from the timeline above to edit settings.
                                 left_delta="0"
                                 top_pad="5"
                                 name="moon_panel" />
+                        <!-- added programatically so it doesn't show up whether we want it or not
+                        <panel
+                                border="true"
+                                class="panel_settings_density"
+                                filename="panel_settings_sky_density.xml"
+                                label="Density"
+                                layout="topleft"
+                                left_delta="0"
+                                top_pad="5"
+                                name="density_panel" />
+                         -->
                     </tab_container>
                 </layout_panel>        
             </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index c2500951a6..4b202ec21e 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -819,6 +819,22 @@
       function="Pref.VertexShaderEnable" />
   </check_box>
 
+  <!--
+  <check_box
+    control_name="RenderUseAdvancedAtmospherics"
+    height="16"
+    initial_value="true"
+    label="Advanced Atmospherics"
+    layout="topleft"
+    left="480"
+    name="UseAdvancedAtmo"
+    top_delta="16"
+    width="240">
+    <check_box.commit_callback
+      function="Pref.AdvancedAtmosphericsEnable" />
+  </check_box>
+  -->
+
   <text
     type="string"
     length="1"
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
new file mode 100644
index 0000000000..e071b30c80
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+        border="true"
+        follows="all"
+        label="Density"
+        layout="topleft"
+        left="0"
+        help_topic="sky_density"
+        name="panel_settings_sky_density"
+        top="0">
+    <layout_stack 
+            follows="all"
+            layout="topleft"
+            left="5"
+            top="5"
+            right="-5"
+            bottom="-5"
+            orientation="vertical">
+        <layout_panel
+                border="true"
+                bevel_style="in"
+                auto_resize="true"
+                user_resize="true"
+                visible="true"
+                height="14">
+            <slider
+                    decimal_digits="6"
+                    follows="left|top"
+                    height="14"
+                    increment="0.0000001"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="5"
+                    min_val="0"
+                    max_val="1"
+                    name="rayleigh_exponential"
+                    label="Rayleigh Exponential Term:"
+                    top_pad="12"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+            <slider
+                    decimal_digits="6"
+                    follows="left|top"
+                    height="14"
+                    increment="0.000001"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="-0.01"
+                    max_val="0.01"
+                    name="rayleigh_exponential_scale"
+                    label="Rayleigh Exponential Scale:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+            <slider
+                    decimal_digits="6"
+                    follows="left|top"
+                    height="14"
+                    increment="0.000001"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="0"
+                    max_val="0.00001"
+                    name="rayleigh_linear"
+                    label="Rayleigh Linear Term:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+            <slider
+                    decimal_digits="6"
+                    follows="left|top"
+                    height="14"
+                    increment="0.0000001"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="0"
+                    max_val="1"
+                    name="rayleigh_constant"
+                    label="Rayleigh Constant Term:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+            <slider
+                    decimal_digits="1"
+                    follows="left|top"
+                    height="14"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="1000"
+                    max_val="40000"
+                    name="rayleigh_max_altitude"
+                    label="Rayleigh Max Altitude:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+        </layout_panel>
+        <layout_panel
+                border="true"
+                bevel_style="in"
+                auto_resize="true"
+                user_resize="true"
+                visible="true"
+                height="16">
+            <slider
+                    decimal_digits="6"
+                    follows="left|top"
+                    height="14"
+                    increment="0.0000001"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="5"
+                    min_val="0"
+                    max_val="3.0"
+                    name="mie_exponential"
+                    label="Mie Exponential Term:"
+                    top_pad="12"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+            <slider
+                    decimal_digits="6"
+                    follows="left|top"
+                    height="14"
+                    increment="0.0000001"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="-0.01"
+                    max_val="0.01"
+                    name="mie_exponential_scale"
+                    label="Mie Exponential Scale:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+            <slider
+                    decimal_digits="6"
+                    follows="left|top"
+                    height="14"
+                    increment="0.000001"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="0"
+                    max_val="0.000004"
+                    name="mie_linear"
+                    label="Mie Linear Term:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+            <slider
+                    decimal_digits="6"
+                    follows="left|top"
+                    height="14"
+                    increment="0.0000001"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="0"
+                    max_val="1"
+                    name="mie_constant"
+                    label="Mie Constant Term:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="14"
+                    increment="0.01"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="0.2"
+                    max_val="1.8"
+                    name="mie_aniso_factor"
+                    label="Mie Aniso Factor:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+            <slider
+                    decimal_digits="1"
+                    follows="left|top"
+                    height="14"
+                    increment="0.1"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="1000"
+                    max_val="30000"
+                    name="mie_max_altitude"
+                    label="Mie Max Altitude:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+        </layout_panel>
+        <layout_panel
+                border="true"
+                bevel_style="in"
+                auto_resize="true"
+                user_resize="true"
+                visible="true"
+                height="14">
+            <slider
+                    decimal_digits="6"
+                    follows="left|top"
+                    height="14"
+                    increment="0.0000001"
+                    initial_value="0"
+                    layout="topleft"
+                    left_delta="5"
+                    min_val="0"
+                    max_val="1"
+                    name="absorption_exponential"
+                    label="Absorption Exponential Term:"
+                    top_pad="8"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+            <slider
+                    decimal_digits="6"
+                    follows="left|top"
+                    height="14"
+                    increment="0.0000001"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="-1"
+                    max_val="1"
+                    name="absorption_exponential_scale"
+                    label="Absorption Exponential Scale:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+            <slider
+                    decimal_digits="6"
+                    follows="left|top"
+                    height="14"
+                    increment="0.0000001"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="0"
+                    max_val="1"
+                    name="absorption_linear"
+                    label="Absorption Linear Term:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+            <slider
+                    decimal_digits="6"
+                    follows="left|top"
+                    height="14"
+                    increment="0.0000001"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="0"
+                    max_val="1"
+                    name="absorption_constant"
+                    label="Absorption Constant Term:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+            <slider
+                    decimal_digits="1"
+                    follows="left|top"
+                    height="14"
+                    increment="0.1"
+                    initial_value="0"
+                    layout="topleft"
+                    min_val="1000"
+                    max_val="25000"
+                    name="absorption_max_altitude"
+                    label="Absorption Max Altitude:"
+                    width="400"
+                    label_width="160"
+                    can_edit_text="true"/>
+        </layout_panel>
+    </layout_stack>
+</panel> 
diff --git a/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml b/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml
new file mode 100644
index 0000000000..0f3f0159db
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/density_ctrl.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<densityctrl
+ border="true"
+ follows="all"
+ label="Density"
+ name="density_ctrl"
+ layout="topleft"
+ left="0"
+ top="0"
+ width="320"
+ height="240">
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     left="15"
+     top_pad="-5"
+     width="120">
+Exponential Term
+    </text>
+    <slider
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.01"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="0"
+     max_val="1"
+     name="level_exponential"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+
+    <view
+     left_pad="15"
+     top="15"
+     name="preview_image"
+     height="140"
+     width="140"
+     follows="left|top"
+    />
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     left="15"
+     top_pad="-5"
+     width="120">
+Exponential Scale Factor
+    </text>
+    <slider
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.01"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="0"
+     max_val="1"
+     name="exponential_scale"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     left="15"
+     top_pad="-5"
+     width="120">
+Linear Term
+    </text>
+    <slider
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.01"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="0"
+     max_val="1"
+     name="level_linear"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     left="15"
+     top_pad="-5"
+     width="120">
+Constant Term
+    </text>
+    <slider
+     decimal_digits="2"
+     follows="left|top"
+     height="16"
+     increment="0.01"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="0"
+     max_val="1"
+     name="level_constant"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     left="15"
+     top_pad="15"
+     width="80">
+Max Altitude
+    </text>
+    <slider
+     decimal_digits="0"
+     follows="left|top"
+     height="16"
+     increment="1"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="1000"
+     max_val="40000"
+     name="max_altitude"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+
+    <text
+     follows="left|top"
+     height="11"
+     layout="topleft"
+     name="aniso_factor_label"
+     left="15"
+     top_pad="15"
+     width="80">
+Anisotropy Factor
+    </text>
+    <slider
+     decimal_digits="0"
+     follows="left|top"
+     height="16"
+     increment="1"
+     initial_value="0"
+     layout="topleft"
+     left="15"
+     min_val="1000"
+     max_val="40000"
+     name="aniso_factor"
+     top_delta="15"
+     width="200"
+     can_edit_text="true"/>
+</densityctrl>