Merge of windlight into release (QAR-286). This includes all changes in

windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620

1 files changed, 141 insertions, 0 deletions

diff --git a/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml b/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml
new file mode 100644
index 0000000000..8576ec125c
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.029999999329447746</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0.029999999329447746</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.097999997437000275</real>
+            <real>0.2800000011920929</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.11999999731779099</real>
+            <real>0.35094299912452698</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.48999997973442078</real>
+            <real>0.79000002145767212</real>
+            <real>0.80000001192092896</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.5</real>
+            <real>0.75999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.38999998569488525</real>
+            <real>0.5</real>
+            <real>0.039999999105930328</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.43999999761581421</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>11.809999465942383</real>
+            <real>12.799999237060547</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00021999998716637492</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.2044246196746826</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.5399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>3.8000010331979865</real>
+            <real>0.001000000059761974</real>
+            <real>-0.49999996688498527</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.20999999344348907</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.049999997019767761</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.056814663112163544</real>
+            <real>0.42577928304672241</real>
+            <real>-0.90304160118103027</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>676.10003662109375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0.44999998807907104</real>
+    <key>sun_angle</key>
+        <real>0.4398229718208313</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.7999999523162842</real>
+            <real>1.4099999666213989</real>
+            <real>1.0199999809265137</real>
+            <real>1.7999999523162842</real>
+        </array>
+    </map>
+</llsd>