Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 43 insertions, 0 deletions

diff --git a/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Claira.xml b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Claira.xml
new file mode 100644
index 0000000..d6476dd
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/%5BTOR%5D%20Claira.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.017000000923871994</real>
+    <key>fresnelOffset</key>
+        <real>0.69999998807907104</real>
+    <key>fresnelScale</key>
+        <real>0.59999996423721313</real>
+    <key>normScale</key>
+        <array>
+            <real>2</real>
+            <real>1</real>
+            <real>0</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.049999997019767761</real>
+    <key>scaleBelow</key>
+        <real>0.099999994039535522</real>
+    <key>underWaterFogMod</key>
+        <real>0</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>1</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-1.3300000429153442</real>
+            <real>-1.8799999952316284</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-1.8100000619888306</real>
+            <real>-1.3300000429153442</real>
+        </array>
+    </map>
+</llsd>