From 7da3a1eb4f14b67c698977eb1947ce06a312d507 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 6 Aug 2018 17:49:50 +0100
Subject: WIP check-in to allow merge of upstream changes.

---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  |   9 ++
 .../default/xui/en/panel_settings_sky_density.xml  |  32 ++++
 .../skins/default/xui/en/widgets/density_ctrl.xml  | 164 +++++++++++++++++++++
 3 files changed, 205 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
 create mode 100644 indra/newview/skins/default/xui/en/widgets/density_ctrl.xml

(limited to 'indra/newview/skins/default/xui/en')

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 caf7153a5c..80e58c8248 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
@@ -526,6 +526,15 @@
                                 left_delta="0"
                                 top_pad="5"
                                 name="moon_panel" />
+                      <panel
+                                border="true"
+                                class="panel_settings_density"
+                                filename="panel_settings_sky_density.xml"
+                                label="Advanced Atmospherics"
+                                layout="topleft"
+                                left_delta="0"
+                                top_pad="5"
+                                name="advanced_atmo_panel" />
                     </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
new file mode 100644
index 0000000000..05bd3c336a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ border="true"
+ follows="all"
+ label="Density"
+ name="panel_settings_sky_density"
+ layout="topleft"
+ left="0"
+ top="0"
+ width="320"
+ height="240">
+<tab_container>
+  <panel>
+    name="panel_settings_sky_density_rayleigh"
+    <densityctrl>
+      name = "density_rayleigh"
+    </densityctrl>
+  </panel>
+  <panel>
+    name="panel_settings_sky_density_mie"
+    <densityctrl>
+      name = "density_mie"
+    </densityctrl>
+  </panel>
+  <panel>    
+    name="panel_settings_sky_density_absorption"
+    <densityctrl>
+       name = "density_absorption"
+    </densityctrl>
+  </panel>
+</tab_container>
+</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>
-- 
cgit v1.2.3


From 964a472461bed91b3efa383aaea34d425b96111d Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 29 Aug 2018 21:13:09 +0100
Subject: 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.
---
 .../default/xui/en/floater_edit_ext_day_cycle.xml  |  4 +-
 .../default/xui/en/panel_settings_sky_density.xml  | 84 ++++++++++------------
 2 files changed, 41 insertions(+), 47 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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> 
-- 
cgit v1.2.3


From 52f949d71a57415e372381fffeb126d8939522be Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Wed, 29 Aug 2018 21:14:56 +0100
Subject: Fix range on rayleigh exponential scale factor to include negative
 values.

---
 indra/newview/skins/default/xui/en/panel_settings_sky_density.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en')

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 d82cdb30be..5159a2714e 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
@@ -46,7 +46,7 @@
                     increment="0.01"
                     initial_value="0"
                     layout="topleft"
-                    min_val="0"
+                    min_val="-1"
                     max_val="1"
                     name="rayleigh_exponential_scale"
                     label="Rayleigh Exponential Scale:"
-- 
cgit v1.2.3


From 32631f09a57548c2bbf7e09211a2053ff2e4e47d Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 4 Sep 2018 23:41:36 +0100
Subject: 8283/4 WIP

---
 .../default/xui/en/panel_settings_sky_density.xml  | 54 ++++++++++++++--------
 1 file changed, 36 insertions(+), 18 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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 5159a2714e..50663e94f6 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,7 +22,7 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="16">
+                height="14">
             <slider
                     decimal_digits="2"
                     follows="left|top"
@@ -35,7 +35,7 @@
                     max_val="1"
                     name="rayleigh_exponential"
                     label="Rayleigh Exponential Term:"
-                    top_pad="8"
+                    top_pad="12"
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
@@ -81,6 +81,20 @@
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="14"
+                    increment="1"
+                    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"
@@ -88,7 +102,7 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="18">
+                height="16">
             <slider
                     decimal_digits="2"
                     follows="left|top"
@@ -101,7 +115,7 @@
                     max_val="3.0"
                     name="mie_exponential"
                     label="Mie Exponential Term:"
-                    top_pad="8"
+                    top_pad="12"
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
@@ -161,6 +175,20 @@
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
+            <slider
+                    decimal_digits="2"
+                    follows="left|top"
+                    height="14"
+                    increment="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"
@@ -168,7 +196,7 @@
                 auto_resize="true"
                 user_resize="true"
                 visible="true"
-                height="16">
+                height="14">
             <slider
                     decimal_digits="2"
                     follows="left|top"
@@ -227,14 +255,6 @@
                     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="10">
             <slider
                     decimal_digits="2"
                     follows="left|top"
@@ -242,12 +262,10 @@
                     increment="1"
                     initial_value="0"
                     layout="topleft"
-                    left_delta="5"
                     min_val="1000"
-                    max_val="40000"
-                    name="max_altitude"
-                    label="Max Altitude:"
-                    top_pad="8"
+                    max_val="25000"
+                    name="absorption_max_altitude"
+                    label="Absorption Max Altitude:"
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
-- 
cgit v1.2.3


From 451ab80ca65a7ae75316442086f42b6553ea6bbe Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Thu, 6 Sep 2018 22:50:26 +0100
Subject: Fix tex format mismatch between what libatmosphere was generating and
 what we were claiming to use in rendering.

First pass at sky shader using libatmosphere sky radiance lookup.

Add atmo density controls to ext daycycle floater tabs.
---
 .../newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml  | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

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..7a5c9cb63f 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,15 @@ Select a key frame from the timeline above to edit settings.
                                 left_delta="0"
                                 top_pad="5"
                                 name="moon_panel" />
+                        <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>
-- 
cgit v1.2.3


From 4bd2b8b98ba1c562dfd65975a87ef5ee3db35633 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Fri, 7 Sep 2018 17:24:29 +0100
Subject: Fix createDensityProfileLayer dropping passed in values.

Enable sky density panel to update advanced atmo precomputed textures.

Take wild stab at appropriate ranges for density parameters in edit panel UI.

Clean up debug-only code that isn't necessary anymore.

Point autobuild at latest version of libatmosphere package.
---
 .../default/xui/en/panel_settings_sky_density.xml  | 73 +++++++++++-----------
 1 file changed, 36 insertions(+), 37 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

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 50663e94f6..e071b30c80 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
@@ -24,10 +24,10 @@
                 visible="true"
                 height="14">
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
@@ -40,38 +40,38 @@
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.000001"
                     initial_value="0"
                     layout="topleft"
-                    min_val="-1"
-                    max_val="1"
+                    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="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.000001"
                     initial_value="0"
                     layout="topleft"
                     min_val="0"
-                    max_val="1"
+                    max_val="0.00001"
                     name="rayleigh_linear"
                     label="Rayleigh Linear Term:"
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
                     min_val="0"
@@ -82,10 +82,9 @@
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="1"
                     follows="left|top"
                     height="14"
-                    increment="1"
                     initial_value="0"
                     layout="topleft"
                     min_val="1000"
@@ -104,10 +103,10 @@
                 visible="true"
                 height="16">
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
@@ -120,42 +119,42 @@
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
-                    min_val="-1"
-                    max_val="1"
+                    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="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.000001"
                     initial_value="0"
                     layout="topleft"
                     min_val="0"
-                    max_val="3.0"
+                    max_val="0.000004"
                     name="mie_linear"
                     label="Mie Linear Term:"
                     width="400"
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
                     min_val="0"
-                    max_val="10"
+                    max_val="1"
                     name="mie_constant"
                     label="Mie Constant Term:"
                     width="400"
@@ -176,10 +175,10 @@
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="1"
                     follows="left|top"
                     height="14"
-                    increment="1"
+                    increment="0.1"
                     initial_value="0"
                     layout="topleft"
                     min_val="1000"
@@ -198,10 +197,10 @@
                 visible="true"
                 height="14">
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
                     left_delta="5"
@@ -214,10 +213,10 @@
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
                     min_val="-1"
@@ -228,10 +227,10 @@
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
                     min_val="0"
@@ -242,10 +241,10 @@
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="6"
                     follows="left|top"
                     height="14"
-                    increment="0.01"
+                    increment="0.0000001"
                     initial_value="0"
                     layout="topleft"
                     min_val="0"
@@ -256,10 +255,10 @@
                     label_width="160"
                     can_edit_text="true"/>
             <slider
-                    decimal_digits="2"
+                    decimal_digits="1"
                     follows="left|top"
                     height="14"
-                    increment="1"
+                    increment="0.1"
                     initial_value="0"
                     layout="topleft"
                     min_val="1000"
-- 
cgit v1.2.3


From e075c65ee22a54b114808057399b5c7546dfb08a Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 10 Sep 2018 16:43:49 +0100
Subject: First pass at preferences and feature table hookup for advanced
 atmospherics.

---
 .../xui/en/floater_preferences_graphics_advanced.xml       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

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..d9bbf32583 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,20 @@
       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"
-- 
cgit v1.2.3


From 642a4ddd60745db292c543a5cea3b1e5fe606795 Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Mon, 10 Sep 2018 20:39:48 +0100
Subject: Fixes for switching between atmospherics implementations on the fly.

---
 indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

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 7a5c9cb63f..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,7 @@ 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"
@@ -529,6 +530,7 @@ Select a key frame from the timeline above to edit settings.
                                 left_delta="0"
                                 top_pad="5"
                                 name="density_panel" />
+                         -->
                     </tab_container>
                 </layout_panel>        
             </layout_stack>
-- 
cgit v1.2.3


From cd2dc42a28873f9d3d18c4d52d1b1a64a2170a6f Mon Sep 17 00:00:00 2001
From: Graham Linden <graham@lindenlab.com>
Date: Tue, 11 Sep 2018 17:49:26 +0100
Subject: Hide UI related to advanced atmospherics and make it off by default
 again.

---
 .../skins/default/xui/en/floater_preferences_graphics_advanced.xml      | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins/default/xui/en')

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 d9bbf32583..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,7 @@
       function="Pref.VertexShaderEnable" />
   </check_box>
 
+  <!--
   <check_box
     control_name="RenderUseAdvancedAtmospherics"
     height="16"
@@ -832,6 +833,7 @@
     <check_box.commit_callback
       function="Pref.AdvancedAtmosphericsEnable" />
   </check_box>
+  -->
 
   <text
     type="string"
-- 
cgit v1.2.3