Pull merge from viewer-acme-dev

12 files changed, 174 insertions, 70 deletions

diff --git a/indra/newview/app_settings/filters/Hefe.xml b/indra/newview/app_settings/filters/Grayscale.xml
index 527aaee847..101ed8233a 100755..100644
--- a/indra/newview/app_settings/filters/Hefe.xml
+++ b/indra/newview/app_settings/filters/Grayscale.xml
@@ -2,22 +2,20 @@
     <array>
         <array>
             <string>linearize</string>
-            <real>0.0</real>
+            <real>0.01</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
         </array>
         <array>
-            <string>blend</string>
-            <real>4.0</real>
-            <real>0.5</real>
-        </array>
-        <array>
             <string>contrast</string>
-            <real>2.0</real>
+            <real>0.8</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
         </array>
+        <array>
+            <string>grayscale</string>
+        </array>
     </array>
 </llsd>
diff --git a/indra/newview/app_settings/filters/Lomofi.xml b/indra/newview/app_settings/filters/GreenGray.xml
index f5ec911e59..dce5ab3e9e 100755..100644
--- a/indra/newview/app_settings/filters/Lomofi.xml
+++ b/indra/newview/app_settings/filters/GreenGray.xml
@@ -1,23 +1,24 @@
 <llsd>
     <array>
         <array>
-            <string>blend</string>
-            <real>4.0</real>
-            <real>0.0</real>
-        </array>
-        <array>
             <string>linearize</string>
-            <real>0.2</real>
+            <real>0.1</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
         </array>
         <array>
-            <string>brighten</string>
-            <real>20.0</real>
+            <string>colorize</string>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
+            <real>0.0</real>
+            <real>0.3</real>
+            <real>0.0</real>
+        </array>
+        <array>
+            <string>saturate</string>
+            <real>0.35</real>
         </array>
     </array>
 </llsd>
diff --git a/indra/newview/app_settings/filters/Gotham.xml b/indra/newview/app_settings/filters/HLines.xml
index eb0725e6bf..ddff4d1977 100755..100644
--- a/indra/newview/app_settings/filters/Gotham.xml
+++ b/indra/newview/app_settings/filters/HLines.xml
@@ -2,29 +2,24 @@
     <array>
         <array>
             <string>linearize</string>
-            <real>0.0</real>
+            <real>0.1</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
         </array>
         <array>
-            <string>gamma</string>
-            <real>1.5</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
+            <string>grayscale</string>
         </array>
         <array>
-            <string>colorize</string>
-            <real>0.0</real>
+            <string>blend</string>
             <real>0.0</real>
             <real>0.0</real>
-            <real>0.0</real>
-            <real>0.0</real>
-            <real>1.0</real>
         </array>
         <array>
-            <string>grayscale</string>
+            <string>screen</string>
+            <string>line</string>
+            <real>5.0</real>
+            <real>0.0</real>
         </array>
     </array>
 </llsd>
diff --git a/indra/newview/app_settings/filters/Inkwell.xml b/indra/newview/app_settings/filters/Inkwell.xml
deleted file mode 100755
index 77c88b5fbb..0000000000
--- a/indra/newview/app_settings/filters/Inkwell.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<llsd>
-    <array>
-        <array>
-            <string>linearize</string>
-            <real>0.05</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
-        <array>
-            <string>grayscale</string>
-        </array>
-    </array>
-</llsd>
diff --git a/indra/newview/app_settings/filters/Newspaper.xml b/indra/newview/app_settings/filters/Newspaper.xml
index 7480325542..8247c34500 100755
--- a/indra/newview/app_settings/filters/Newspaper.xml
+++ b/indra/newview/app_settings/filters/Newspaper.xml
@@ -2,7 +2,7 @@
     <array>
         <array>
             <string>linearize</string>
-            <real>0.2</real>
+            <real>0.1</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
@@ -18,7 +18,7 @@
         <array>
             <string>screen</string>
             <string>2Dsine</string>
-            <real>15.0</real>
+            <real>5.0</real>
             <real>0.0</real>
         </array>
     </array>
diff --git a/indra/newview/app_settings/filters/Poprocket.xml b/indra/newview/app_settings/filters/RedV.xml
index 7e64003908..5c47ca0f84 100755..100644
--- a/indra/newview/app_settings/filters/Poprocket.xml
+++ b/indra/newview/app_settings/filters/RedV.xml
@@ -2,7 +2,14 @@
     <array>
         <array>
             <string>linearize</string>
-            <real>0.0</real>
+            <real>0.1</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
+            <string>contrast</string>
+            <real>0.8</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
@@ -16,10 +23,10 @@
             <string>colorize</string>
             <real>1.0</real>
             <real>0.0</real>
-            <real>0.0</real>
+            <real>1.0</real>
             <real>0.4</real>
             <real>0.0</real>
-            <real>0.0</real>
+            <real>0.2</real>
         </array>
     </array>
 </llsd>
diff --git a/indra/newview/app_settings/filters/Saturate30.xml b/indra/newview/app_settings/filters/Saturate30.xml
new file mode 100644
index 0000000000..b77f07a037
--- /dev/null
+++ b/indra/newview/app_settings/filters/Saturate30.xml
@@ -0,0 +1,8 @@
+<llsd>
+    <array>
+        <array>
+            <string>saturate</string>
+            <real>3.0</real>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/newview/app_settings/filters/Toaster.xml b/indra/newview/app_settings/filters/SepiaV.xml
index 170a1183ed..d26df608b9 100755..100644
--- a/indra/newview/app_settings/filters/Toaster.xml
+++ b/indra/newview/app_settings/filters/SepiaV.xml
@@ -1,6 +1,13 @@
 <llsd>
     <array>
         <array>
+            <string>linearize</string>
+            <real>0.01</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
             <string>contrast</string>
             <real>0.8</real>
             <real>1.0</real>
@@ -13,11 +20,7 @@
             <real>0.5</real>
         </array>
         <array>
-            <string>brighten</string>
-            <real>10.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
+            <string>sepia</string>
         </array>
     </array>
 </llsd>
diff --git a/indra/newview/app_settings/filters/Sutro.xml b/indra/newview/app_settings/filters/Sutro.xml
deleted file mode 100755
index 3b0a58f01e..0000000000
--- a/indra/newview/app_settings/filters/Sutro.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<llsd>
-    <array>
-        <array>
-            <string>linearize</string>
-            <real>0.05</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
-        <array>
-            <string>fade</string>
-            <real>4.0</real>
-            <real>0.5</real>
-        </array>
-        <array>
-            <string>sepia</string>
-        </array>
-    </array>
-</llsd>
diff --git a/indra/newview/app_settings/filters/VividV.xml b/indra/newview/app_settings/filters/VividV.xml
new file mode 100644
index 0000000000..203130bdee
--- /dev/null
+++ b/indra/newview/app_settings/filters/VividV.xml
@@ -0,0 +1,45 @@
+<llsd>
+    <array>
+        <array>
+            <string>linearize</string>
+            <real>0.1</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
+            <string>contrast</string>
+            <real>0.8</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
+            <string>saturate</string>
+            <real>1.5</real>
+        </array>
+        <array>
+            <string>fade</string>
+            <real>1.0</real>
+            <real>0.25</real>
+        </array>
+        <array>
+            <string>saturate</string>
+            <real>0.8</real>
+        </array>
+        <array>
+            <string>contrast</string>
+            <real>1.1</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
+            <string>brighten</string>
+            <real>30</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/newview/app_settings/filters/VividYellowV.xml b/indra/newview/app_settings/filters/VividYellowV.xml
new file mode 100644
index 0000000000..2da27e53c1
--- /dev/null
+++ b/indra/newview/app_settings/filters/VividYellowV.xml
@@ -0,0 +1,39 @@
+<llsd>
+    <array>
+        <array>
+            <string>linearize</string>
+            <real>0.1</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
+            <string>contrast</string>
+            <real>1.1</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
+            <string>fade</string>
+            <real>1.0</real>
+            <real>0.25</real>
+        </array>
+        <array>
+            <string>colorize</string>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>0.3</real>
+            <real>0.2</real>
+            <real>0.0</real>
+        </array>
+        <array>
+            <string>contrast</string>
+            <real>1.1</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/newview/app_settings/filters/YellowV.xml b/indra/newview/app_settings/filters/YellowV.xml
new file mode 100644
index 0000000000..0dab2489a0
--- /dev/null
+++ b/indra/newview/app_settings/filters/YellowV.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <array>
+        <array>
+            <string>linearize</string>
+            <real>0.1</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
+            <string>contrast</string>
+            <real>0.8</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
+            <string>colorize</string>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>0.5</real>
+            <real>0.0</real>
+            <real>0.0</real>
+        </array>
+        <array>
+            <string>blend</string>
+            <real>10.0</real>
+            <real>0.0</real>
+        </array>
+        <array>
+            <string>colorize</string>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>0.1</real>
+            <real>0.1</real>
+            <real>0.0</real>
+        </array>
+    </array>
+</llsd>