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

7 files changed, 301 insertions, 0 deletions

diff --git a/indra/newview/app_settings/windlight/water/Default.xml b/indra/newview/app_settings/windlight/water/Default.xml
new file mode 100644
index 0000000000..dce4148c7d
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/Default.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.040000002831220627</real>
+    <key>fresnelOffset</key>
+        <real>0.5</real>
+    <key>fresnelScale</key>
+        <real>0.39999997615814209</real>
+    <key>normScale</key>
+        <array>
+            <integer>2</integer>
+            <integer>2</integer>
+            <integer>2</integer>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.029999999329447746</real>
+    <key>scaleBelow</key>
+        <real>0.20000000298023224</real>
+    <key>underWaterFogMod</key>
+        <real>0.25</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.015686275437474251</real>
+            <real>0.14901961386203766</real>
+            <real>0.25098040699958801</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>16</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>1.0499997138977051</real>
+            <real>-0.42000007629394531</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>1.1099996566772461</real>
+            <real>-1.1600000858306885</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/water/Glassy.xml b/indra/newview/app_settings/windlight/water/Glassy.xml
new file mode 100644
index 0000000000..01183e4687
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/Glassy.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.003000000026077032089233398</real>
+    <key>fresnelOffset</key>
+        <real>0.579999983310699462890625</real>
+    <key>fresnelScale</key>
+        <real>0.0999999940395355224609375</real>
+    <key>normScale</key>
+        <array>
+            <integer>2</integer>
+            <integer>2</integer>
+            <integer>2</integer>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.07999999821186065673828125</real>
+    <key>scaleBelow</key>
+        <real>0.2000000029802322387695312</real>
+    <key>underWaterFogMod</key>
+        <real>0.25</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.04999999701976776123046875</real>
+            <real>0.37999999523162841796875</real>
+            <real>0.5299999713897705078125</real>
+            <real>0.5299999713897705078125</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>1</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.5</real>
+            <real>-0.1700000017881393432617188</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.579999983310699462890625</real>
+            <real>-0.670000016689300537109375</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/water/Murky.xml b/indra/newview/app_settings/windlight/water/Murky.xml
new file mode 100644
index 0000000000..1d9e022422
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/Murky.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0030000000260770321</real>
+    <key>fresnelOffset</key>
+        <real>0.39999997615814209</real>
+    <key>fresnelScale</key>
+        <real>0.5</real>
+    <key>normScale</key>
+        <array>
+            <integer>2</integer>
+            <integer>2</integer>
+            <integer>2</integer>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.079999998211860657</real>
+    <key>scaleBelow</key>
+        <real>0.20000000298023224</real>
+    <key>underWaterFogMod</key>
+        <real>0.76999998092651367</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.08999999612569809</real>
+            <real>0.17000000178813934</real>
+            <real>0.20999999344348907</real>
+            <real>0.20999999344348907</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>16</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.5</real>
+            <real>-0.17000000178813934</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.57999998331069946</real>
+            <real>-0.67000001668930054</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/water/Pond.xml b/indra/newview/app_settings/windlight/water/Pond.xml
new file mode 100644
index 0000000000..59e3c441ea
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/Pond.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0030000000260770321</real>
+    <key>fresnelOffset</key>
+        <real>0.50999999046325684</real>
+    <key>fresnelScale</key>
+        <real>0.099999994039535522</real>
+    <key>normScale</key>
+        <array>
+            <integer>2</integer>
+            <integer>2</integer>
+            <integer>2</integer>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.079999998211860657</real>
+    <key>scaleBelow</key>
+        <real>0.20000000298023224</real>
+    <key>underWaterFogMod</key>
+        <real>0.25</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.059999998658895493</real>
+            <real>0.37999999523162842</real>
+            <real>0.52999997138977051</real>
+            <real>0.52999997138977051</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>2.1000001430511475</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.5</real>
+            <real>-0.17000000178813934</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.57999998331069946</real>
+            <real>-0.67000001668930054</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml b/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml
new file mode 100644
index 0000000000..6dbc4e8719
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0030000000260770321</real>
+    <key>fresnelOffset</key>
+        <real>0.57999998331069946</real>
+    <key>fresnelScale</key>
+        <real>0.099999994039535522</real>
+    <key>normScale</key>
+        <array>
+            <real>10</real>
+            <real>10</real>
+            <real>10</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>470626e3-ac38-8554-d49b-90311c0176a9</uuid>
+    <key>scaleAbove</key>
+        <real>0.91999995708465576</real>
+    <key>scaleBelow</key>
+        <real>0.93999999761581421</real>
+    <key>underWaterFogMod</key>
+        <real>0.25</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.049999997019767761</real>
+            <real>0.37999999523162842</real>
+            <real>0.52999997138977051</real>
+            <real>0.52999997138977051</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>3.2000000476837158</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.5</real>
+            <real>-0.17000000178813934</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.57999998331069946</real>
+            <real>-0.67000001668930054</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/water/Second%20Plague.xml b/indra/newview/app_settings/windlight/water/Second%20Plague.xml
new file mode 100644
index 0000000000..137483ab64
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/Second%20Plague.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.017000000923871994</real>
+    <key>fresnelOffset</key>
+        <real>0.37000000476837158</real>
+    <key>fresnelScale</key>
+        <real>0</real>
+    <key>normScale</key>
+        <array>
+            <integer>2</integer>
+            <integer>2</integer>
+            <integer>2</integer>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.079999998211860657</real>
+    <key>scaleBelow</key>
+        <real>0.20000000298023224</real>
+    <key>underWaterFogMod</key>
+        <real>0.85999995470046997</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.48999997973442078</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0.48999997973442078</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>20</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.5</real>
+            <real>-0.17000000178813934</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.57999998331069946</real>
+            <real>-0.67000001668930054</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/water/Valdez.xml b/indra/newview/app_settings/windlight/water/Valdez.xml
new file mode 100644
index 0000000000..eb70a142e0
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/Valdez.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0020000000949949026</real>
+    <key>fresnelOffset</key>
+        <real>0.28999999165534973</real>
+    <key>fresnelScale</key>
+        <real>0</real>
+    <key>normScale</key>
+        <array>
+            <integer>2</integer>
+            <integer>2</integer>
+            <integer>2</integer>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.079999998211860657</real>
+    <key>scaleBelow</key>
+        <real>0.20000000298023224</real>
+    <key>underWaterFogMod</key>
+        <real>1</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>1024</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.5</real>
+            <real>-0.17000000178813934</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.57999998331069946</real>
+            <real>-0.67000001668930054</real>
+        </array>
+    </map>
+</llsd>