diff --git a/indra/newview/app_settings/windlight/postprocesseffects.xml b/indra/newview/app_settings/windlight/postprocesseffects.xml
index 7e71abaf4..f27e5121a 100644
--- a/indra/newview/app_settings/windlight/postprocesseffects.xml
+++ b/indra/newview/app_settings/windlight/postprocesseffects.xml
@@ -173,12 +173,12 @@
0
enable_gauss_blur
0
- enable_posterize
- 0
- enable_motionblur
- 0
- enable_vignette
- 0
+ enable_posterize
+ 0
+ enable_motionblur
+ 0
+ enable_vignette
+ 0
gauss_blur_passes
2
extract_high
@@ -191,82 +191,20 @@
0.40000000000000002
saturation
1
- posterize_layers
- 10
- blur_strength
- 10
- vignette_strength
- 0.85
- vignette_radius
- 0.7
- vignette_darkness
- 1.0
- vignette_desaturation
- 1.0
- vignette_chromatic_aberration
- 0.01
-
- PyFx None
-
PyFX CatVision v1
- PyFX v1
+ PyFX Twilight v1 Cold
+ PyFX Twilight v1 Warm
+
@@ -950,7 +950,69 @@
vignette_strength
1
- PyFx default
+ PyFX Vivid v1 Cold
+
+ PyFX v1
+ PyFX v2
+
+ PyFX v3
+
+ PyFX Default
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Afternoon.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Afternoon.xml
index e839d6245..233a3b354 100644
--- a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Afternoon.xml
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Afternoon.xml
@@ -37,14 +37,14 @@
cloud_pos_density2
- 1.6884100437164306640625
+ 1
1
0
1
cloud_scale
- 0.07000000029802322387695313
+ 0.2000000029802322387695313
0
0
1
@@ -56,7 +56,7 @@
cloud_shadow
- 0.66999995708465576171875
+ 0.75
0
0
1
@@ -105,7 +105,7 @@
haze_horizon
- 0
+ 0.1499999910593032836914063
0.1991560012102127075195313
0.1991560012102127075195313
1
@@ -119,7 +119,7 @@
max_y
- 150
+ 1
0
0
1
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Evening.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Evening.xml
index 291e4691f..4039d2ee5 100644
--- a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Evening.xml
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Evening.xml
@@ -23,10 +23,10 @@
cloud_color
- 0.25
- 0.25
- 0.25
- 0.25
+ 0.2999999821186065673828125
+ 0.2999999821186065673828125
+ 0.2999999821186065673828125
+ 0.2999999821186065673828125
cloud_pos_density1
@@ -44,7 +44,7 @@
cloud_scale
- 0.07000000029802322387695313
+ 0.2000000029802322387695313
0
0
1
@@ -56,7 +56,7 @@
cloud_shadow
- 0.66999995708465576171875
+ 0.75
0
0
1
@@ -119,7 +119,7 @@
max_y
- 150
+ 1
0
0
1
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Noon.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Noon.xml
new file mode 100644
index 000000000..60882441d
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Noon.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Rainy%20Bright.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Rainy%20Bright.xml
new file mode 100644
index 000000000..409cea7e3
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Rainy%20Bright.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Rainy%20HalfBright.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Rainy%20HalfBright.xml
new file mode 100644
index 000000000..eee637388
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Rainy%20HalfBright.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Rainy.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Rainy.xml
index 9ba62cce2..1b1fd7488 100644
--- a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Rainy.xml
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Cloudy%20Rainy.xml
@@ -30,9 +30,9 @@
cloud_pos_density1
- 1
- 1
- 0.2999999821186065673828125
+ 0.5
+ 0.5
+ 0.1700000017881393432617188
1
cloud_pos_density2
@@ -44,33 +44,33 @@
cloud_scale
- 0.07000000029802322387695313
+ 0.2000000029802322387695313
0
0
1
cloud_scroll_rate
- 11
+ 10.3999996185302734375
10
cloud_shadow
- 0.66999995708465576171875
+ 0.75
0
0
1
density_multiplier
- 0.0003999999898951500654220581
+ 0.0005999999702908098697662354
0
0
1
distance_multiplier
- 6
+ 3.5
0
0
1
@@ -93,7 +93,7 @@
0.200002193450927734375
0.001000000047497451305389404
- -0.2499999850988388061523438
+ -0.1499999910593032836914063
1
haze_density
@@ -105,7 +105,7 @@
haze_horizon
- 0
+ 0.04999999701976776123046875
0.1991560012102127075195313
0.1991560012102127075195313
1
@@ -119,7 +119,7 @@
max_y
- 70
+ 100
0
0
1
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Default%20.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Default%20.xml
index 722a18847..b26c41ae1 100644
--- a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Default%20.xml
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Default%20.xml
@@ -2,49 +2,49 @@
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Fine%20Afternoon.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Fine%20Afternoon.xml
index fc2d3ea8e..438cfe90b 100644
--- a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Fine%20Afternoon.xml
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Fine%20Afternoon.xml
@@ -3,55 +3,55 @@
ambient
0.599999964237213134765625
- 1.0499999523162841796875
- 1.19999992847442626953125
+ 1.049999237060546875
1.19999992847442626953125
+ 0.39999997615814208984375
blue_density
- 0.199999988079071044921875
+ 0.0999999940395355224609375
0.2999999821186065673828125
0.39999997615814208984375
- 0.699999988079071044921875
+ 0.560000002384185791015625
blue_horizon
0.39999997615814208984375
- 0.5
- 1
- 0.5
+ 0.39999997615814208984375
+ 0.7999999523162841796875
+ 0.39999997615814208984375
cloud_color
- 0.2399999797344207763671875
- 0.2399999797344207763671875
- 0.2399999797344207763671875
- 0.2399999946355819702148438
+ 0.39999997615814208984375
+ 0.2800000011920928955078125
+ 0.1999999433755874633789063
+ 0.39999997615814208984375
cloud_pos_density1
1
1
- 0.329999983310699462890625
+ 0.0999999940395355224609375
1
cloud_pos_density2
1.6884100437164306640625
0
- 0.04999999701976776123046875
+ 0.0999999940395355224609375
1
cloud_scale
- 0.0999999940395355224609375
+ 0.05999999493360519409179688
0
0
1
cloud_scroll_rate
- 10.19999980926513671875
+ 10.5
10.0109996795654296875
cloud_shadow
@@ -84,28 +84,28 @@
gamma
- 0.5
+ 0.599999964237213134765625
0
0
1
glow
- 21.8000011444091796875
+ 20
0.001000000047497451305389404
- -0.2499999850988388061523438
+ -1.25
1
haze_density
- 1
+ 0.5
0
0
1
haze_horizon
- 0.199999988079071044921875
+ 0.2999999821186065673828125
0.1991560012102127075195313
0.1991560012102127075195313
1
@@ -132,10 +132,10 @@
2.51327419281005859375
sunlight_color
- 2.25
- 1.68749940395355224609375
- 1.125
- 0.75
+ 1.5
+ 1.19999992847442626953125
+ 0.89999997615814208984375
+ 1.5
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Flamesight.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Flamesight.xml
new file mode 100644
index 000000000..aafbc189f
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Flamesight.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Bright.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Bright.xml
new file mode 100644
index 000000000..16ce75e17
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Bright.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Cloudy.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Cloudy.xml
new file mode 100644
index 000000000..40bbf3b88
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Cloudy.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Evening.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Evening.xml
new file mode 100644
index 000000000..c10d7dc87
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Evening.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Night.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Night.xml
new file mode 100644
index 000000000..2958cad7e
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Indoors%20Night.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20Bright.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20Bright.xml
new file mode 100644
index 000000000..7b4cebdb9
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20Bright.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20City%20Bright.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20City%20Bright.xml
new file mode 100644
index 000000000..19951bad6
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20City%20Bright.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20City.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20City.xml
new file mode 100644
index 000000000..8fa2e039f
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20City.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20Rainy.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20Rainy.xml
new file mode 100644
index 000000000..522c66109
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night%20Rainy.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night.xml
index 3b4c08934..a1be61d2f 100644
--- a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night.xml
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Night.xml
@@ -2,10 +2,10 @@
cloud_shadow
- 0.5
+ 0.39999997615814208984375
0
0
1
density_multiplier
- 0.0001999999949475750327110291
+ 4.999999873689375817775726e-05
0
0
1
distance_multiplier
- 8
+ 10
0
0
1
@@ -84,21 +84,21 @@
gamma
- 0.699999988079071044921875
+ 1
0
0
1
glow
- 11.6000003814697265625
+ 20
0.001000000047497451305389404
- -0.749999940395355224609375
+ -1.25
1
haze_density
- 0.5
+ 2
0
0
1
@@ -119,7 +119,7 @@
max_y
- 500
+ 4000
0
0
1
@@ -127,15 +127,15 @@
preset_num
10
star_brightness
- 0.3599999845027923583984375
+ 0.5
sun_angle
3.4557521343231201171875
sunlight_color
- 0.1499999910593032836914063
- 0.1499999910593032836914063
- 0.1499999910593032836914063
- 0.04999999701976776123046875
+ 0.08999999612569808959960938
+ 0.1799999922513961791992188
+ 0.2999999821186065673828125
+ 0.0999999940395355224609375
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Studio%201.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Studio%201.xml
new file mode 100644
index 000000000..b299d5c02
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Studio%201.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Studio%20Spotlight.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Studio%20Spotlight.xml
new file mode 100644
index 000000000..7e919afff
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Studio%20Spotlight.xml
@@ -0,0 +1,141 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunrise.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunrise.xml
index 5276d856e..114564084 100644
--- a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunrise.xml
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunrise.xml
@@ -2,10 +2,10 @@
cloud_scale
- 0.0999999940395355224609375
+ 0.07000000029802322387695313
0
0
1
@@ -91,21 +91,21 @@
glow
- 4.00000095367431640625
+ 38
0.001000000047497451305389404
- -0.39999997615814208984375
+ -0.2499999850988388061523438
1
haze_density
- 0.75
+ 0.199999988079071044921875
0
0
1
haze_horizon
- 0.199999988079071044921875
+ 0.5
0.1991560012102127075195313
0.1991560012102127075195313
1
@@ -132,10 +132,10 @@
0.31415927410125732421875
sunlight_color
- 3
+ 2.9999997615814208984375
1.19999992847442626953125
- 0.2999999821186065673828125
- 3
+ 0.449999988079071044921875
+ 1
diff --git a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunset.xml b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunset.xml
index 05556e43a..3fe84a505 100644
--- a/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunset.xml
+++ b/indra/newview/app_settings/windlight/skies/%5BPyFX%5D%20Sunset.xml
@@ -23,16 +23,16 @@
cloud_color
- 0.09999998658895492553710938
- 0.09999998658895492553710938
- 0.09999998658895492553710938
- 0.0999999940395355224609375
+ 0
+ 0.02999999932944774627685547
+ 0.05999999865889549255371094
+ 0.05999999865889549255371094
cloud_pos_density1
1
1
- 0.1499999910593032836914063
+ 0.1199999973177909851074219
1
cloud_pos_density2
@@ -44,7 +44,7 @@
cloud_scale
- 0.0999999940395355224609375
+ 0.07000000029802322387695313
0
0
1
diff --git a/indra/newview/app_settings/windlight/water/Py%27s%20Default%20%2B%20Texture.xml b/indra/newview/app_settings/windlight/water/Py%27s%20Default%20%2B%20Texture.xml
index 1129333af..b945a41d8 100644
--- a/indra/newview/app_settings/windlight/water/Py%27s%20Default%20%2B%20Texture.xml
+++ b/indra/newview/app_settings/windlight/water/Py%27s%20Default%20%2B%20Texture.xml
@@ -1,16 +1,16 @@
diff --git a/indra/newview/app_settings/windlight/water/Py%27s%20Default.xml b/indra/newview/app_settings/windlight/water/Py%27s%20Default.xml
index 4b3fa5a4f..1c443156c 100644
--- a/indra/newview/app_settings/windlight/water/Py%27s%20Default.xml
+++ b/indra/newview/app_settings/windlight/water/Py%27s%20Default.xml
@@ -1,43 +1,43 @@
diff --git a/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%20%2B%20Texture.xml b/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%20%2B%20Texture.xml
new file mode 100644
index 000000000..edd3e9a97
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%20%2B%20Texture.xml
@@ -0,0 +1,43 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%202%20%2B%20Texture.xml b/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%202%20%2B%20Texture.xml
new file mode 100644
index 000000000..5eaa00845
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%202%20%2B%20Texture.xml
@@ -0,0 +1,43 @@
+
+
+
diff --git a/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%202.xml b/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%202.xml
new file mode 100644
index 000000000..6866eacad
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/Py%27s%20Ocean%202.xml
@@ -0,0 +1,43 @@
+
+
+