25 files changed, 97 insertions, 34 deletions
diff --git a/indra/integration_tests/llimage_libtest/1970colorize.xml b/indra/integration_tests/llimage_libtest/filters/1970colorize.xml
index 0dab2489a0..0dab2489a0 100644
--- a/indra/integration_tests/llimage_libtest/1970colorize.xml
+++ b/indra/integration_tests/llimage_libtest/filters/1970colorize.xml
diff --git a/indra/integration_tests/llimage_libtest/blur.xml b/indra/integration_tests/llimage_libtest/filters/blur.xml
index addd056855..addd056855 100644
--- a/indra/integration_tests/llimage_libtest/blur.xml
+++ b/indra/integration_tests/llimage_libtest/filters/blur.xml
diff --git a/indra/integration_tests/llimage_libtest/brighten.xml b/indra/integration_tests/llimage_libtest/filters/brighten.xml
index 9b4232229f..9b4232229f 100755
--- a/indra/integration_tests/llimage_libtest/brighten.xml
+++ b/indra/integration_tests/llimage_libtest/filters/brighten.xml
diff --git a/indra/integration_tests/llimage_libtest/colorize.xml b/indra/integration_tests/llimage_libtest/filters/colorize.xml
index 72e58b0ffe..72e58b0ffe 100644
--- a/indra/integration_tests/llimage_libtest/colorize.xml
+++ b/indra/integration_tests/llimage_libtest/filters/colorize.xml
diff --git a/indra/integration_tests/llimage_libtest/contrast.xml b/indra/integration_tests/llimage_libtest/filters/contrast.xml
index 00746b8a9e..00746b8a9e 100644
--- a/indra/integration_tests/llimage_libtest/contrast.xml
+++ b/indra/integration_tests/llimage_libtest/filters/contrast.xml
diff --git a/indra/integration_tests/llimage_libtest/darken.xml b/indra/integration_tests/llimage_libtest/filters/darken.xml
index 5cec3589b6..5cec3589b6 100755
--- a/indra/integration_tests/llimage_libtest/darken.xml
+++ b/indra/integration_tests/llimage_libtest/filters/darken.xml
diff --git a/indra/integration_tests/llimage_libtest/edges.xml b/indra/integration_tests/llimage_libtest/filters/edges.xml
index a66b81d01e..a66b81d01e 100644
--- a/indra/integration_tests/llimage_libtest/edges.xml
+++ b/indra/integration_tests/llimage_libtest/filters/edges.xml
diff --git a/indra/integration_tests/llimage_libtest/gamma.xml b/indra/integration_tests/llimage_libtest/filters/gamma.xml
index 19af09b046..19af09b046 100644
--- a/indra/integration_tests/llimage_libtest/gamma.xml
+++ b/indra/integration_tests/llimage_libtest/filters/gamma.xml
diff --git a/indra/integration_tests/llimage_libtest/grayscale.xml b/indra/integration_tests/llimage_libtest/filters/grayscale.xml
index 984312c4fd..984312c4fd 100644
--- a/indra/integration_tests/llimage_libtest/grayscale.xml
+++ b/indra/integration_tests/llimage_libtest/filters/grayscale.xml
diff --git a/indra/integration_tests/llimage_libtest/horizontalscreen.xml b/indra/integration_tests/llimage_libtest/filters/horizontalscreen.xml
index ddff4d1977..21cab70e54 100644
--- a/indra/integration_tests/llimage_libtest/horizontalscreen.xml
+++ b/indra/integration_tests/llimage_libtest/filters/horizontalscreen.xml
@@ -2,7 +2,7 @@
     <array>
         <array>
             <string>linearize</string>
-            <real>0.1</real>
+            <real>0.0</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
@@ -11,14 +11,9 @@
             <string>grayscale</string>
         </array>
         <array>
-            <string>blend</string>
-            <real>0.0</real>
-            <real>0.0</real>
-        </array>
-        <array>
             <string>screen</string>
             <string>line</string>
-            <real>5.0</real>
+            <real>0.015</real>
             <real>0.0</real>
         </array>
     </array>
diff --git a/indra/integration_tests/llimage_libtest/linearize.xml b/indra/integration_tests/llimage_libtest/filters/linearize.xml
index 23d0290e07..23d0290e07 100755
--- a/indra/integration_tests/llimage_libtest/linearize.xml
+++ b/indra/integration_tests/llimage_libtest/filters/linearize.xml
diff --git a/indra/integration_tests/llimage_libtest/newsscreen.xml b/indra/integration_tests/llimage_libtest/filters/newsscreen.xml
index 8247c34500..50ed27c6db 100755
--- a/indra/integration_tests/llimage_libtest/newsscreen.xml
+++ b/indra/integration_tests/llimage_libtest/filters/newsscreen.xml
@@ -2,7 +2,7 @@
     <array>
         <array>
             <string>linearize</string>
-            <real>0.1</real>
+            <real>0.0</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
@@ -11,14 +11,9 @@
             <string>grayscale</string>
         </array>
         <array>
-            <string>blend</string>
-            <real>0.0</real>
-            <real>0.0</real>
-        </array>
-        <array>
             <string>screen</string>
             <string>2Dsine</string>
-            <real>5.0</real>
+            <real>0.015</real>
             <real>0.0</real>
         </array>
     </array>
diff --git a/indra/integration_tests/llimage_libtest/filters/posterize.xml b/indra/integration_tests/llimage_libtest/filters/posterize.xml
new file mode 100755
index 0000000000..4d03df3c66
--- /dev/null
+++ b/indra/integration_tests/llimage_libtest/filters/posterize.xml
@@ -0,0 +1,11 @@
+<llsd>
+    <array>
+        <array>
+            <string>posterize</string>
+            <real>10.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/integration_tests/llimage_libtest/rotatecolors180.xml b/indra/integration_tests/llimage_libtest/filters/rotatecolors180.xml
index e25029720f..e25029720f 100644
--- a/indra/integration_tests/llimage_libtest/rotatecolors180.xml
+++ b/indra/integration_tests/llimage_libtest/filters/rotatecolors180.xml
diff --git a/indra/integration_tests/llimage_libtest/saturate.xml b/indra/integration_tests/llimage_libtest/filters/saturate.xml
index b77f07a037..b77f07a037 100644
--- a/indra/integration_tests/llimage_libtest/saturate.xml
+++ b/indra/integration_tests/llimage_libtest/filters/saturate.xml
diff --git a/indra/integration_tests/llimage_libtest/sepia.xml b/indra/integration_tests/llimage_libtest/filters/sepia.xml
index 0304ead015..0304ead015 100644
--- a/indra/integration_tests/llimage_libtest/sepia.xml
+++ b/indra/integration_tests/llimage_libtest/filters/sepia.xml
diff --git a/indra/integration_tests/llimage_libtest/sharpen.xml b/indra/integration_tests/llimage_libtest/filters/sharpen.xml
index 6d3f9ae1a2..6d3f9ae1a2 100644
--- a/indra/integration_tests/llimage_libtest/sharpen.xml
+++ b/indra/integration_tests/llimage_libtest/filters/sharpen.xml
diff --git a/indra/integration_tests/llimage_libtest/slantedscreen.xml b/indra/integration_tests/llimage_libtest/filters/slantedscreen.xml
index 63ad01d51d..6cd1a96185 100644
--- a/indra/integration_tests/llimage_libtest/slantedscreen.xml
+++ b/indra/integration_tests/llimage_libtest/filters/slantedscreen.xml
@@ -2,7 +2,7 @@
     <array>
         <array>
             <string>linearize</string>
-            <real>0.1</real>
+            <real>0.0</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
@@ -11,14 +11,9 @@
             <string>grayscale</string>
         </array>
         <array>
-            <string>blend</string>
-            <real>0.0</real>
-            <real>0.0</real>
-        </array>
-        <array>
             <string>screen</string>
             <string>line</string>
-            <real>5.0</real>
+            <real>0.015</real>
             <real>45.0</real>
         </array>
     </array>
diff --git a/indra/integration_tests/llimage_libtest/spotlight.xml b/indra/integration_tests/llimage_libtest/filters/spotlight.xml
index 203130bdee..203130bdee 100644
--- a/indra/integration_tests/llimage_libtest/spotlight.xml
+++ b/indra/integration_tests/llimage_libtest/filters/spotlight.xml
diff --git a/indra/integration_tests/llimage_libtest/filters/stencilgradient.xml b/indra/integration_tests/llimage_libtest/filters/stencilgradient.xml
new file mode 100644
index 0000000000..d22809a9bf
--- /dev/null
+++ b/indra/integration_tests/llimage_libtest/filters/stencilgradient.xml
@@ -0,0 +1,24 @@
+<llsd>
+    <array>
+        <array>
+            <string>stencil</string>
+            <string>gradient</string>
+            <string>blend</string>
+            <real>0.0</real>
+            <real>1.0</real>
+            <real>0.0</real>
+            <real>-1.0</real>
+            <real>0.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
+            <string>colorize</string>
+            <real>1.0</real>
+            <real>0.0</real>
+            <real>0.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/integration_tests/llimage_libtest/filters/stencilscanlines.xml b/indra/integration_tests/llimage_libtest/filters/stencilscanlines.xml
new file mode 100644
index 0000000000..3ce428503d
--- /dev/null
+++ b/indra/integration_tests/llimage_libtest/filters/stencilscanlines.xml
@@ -0,0 +1,22 @@
+<llsd>
+    <array>
+        <array>
+            <string>stencil</string>
+            <string>scanlines</string>
+            <string>blend</string>
+            <real>0.0</real>
+            <real>0.5</real>
+            <real>0.1</real>
+            <real>45.0</real>
+        </array>
+        <array>
+            <string>colorize</string>
+            <real>1.0</real>
+            <real>0.0</real>
+            <real>0.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/integration_tests/llimage_libtest/posterize.xml b/indra/integration_tests/llimage_libtest/filters/stenciluniform.xml
index f026278f9e..7d72f0ed93 100755..100644
--- a/indra/integration_tests/llimage_libtest/posterize.xml
+++ b/indra/integration_tests/llimage_libtest/filters/stenciluniform.xml
@@ -1,15 +1,17 @@
 <llsd>
     <array>
         <array>
-            <string>linearize</string>
+            <string>stencil</string>
+            <string>uniform</string>
+            <string>blend</string>
             <real>0.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>0.5</real>
         </array>
         <array>
-            <string>posterize</string>
-            <real>10.0</real>
+            <string>colorize</string>
+            <real>1.0</real>
+            <real>0.0</real>
+            <real>0.0</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
diff --git a/indra/integration_tests/llimage_libtest/filters/stencilvignette.xml b/indra/integration_tests/llimage_libtest/filters/stencilvignette.xml
new file mode 100644
index 0000000000..d30637fef5
--- /dev/null
+++ b/indra/integration_tests/llimage_libtest/filters/stencilvignette.xml
@@ -0,0 +1,24 @@
+<llsd>
+    <array>
+        <array>
+            <string>stencil</string>
+            <string>vignette</string>
+            <string>blend</string>
+            <real>0.0</real>
+            <real>0.5</real>
+            <real>0.0</real>
+            <real>0.0</real>
+            <real>1.0</real>
+            <real>10.0</real>
+        </array>
+        <array>
+            <string>colorize</string>
+            <real>1.0</real>
+            <real>0.0</real>
+            <real>0.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/integration_tests/llimage_libtest/verticalscreen.xml b/indra/integration_tests/llimage_libtest/filters/verticalscreen.xml
index 71e48df656..0768d1d7e1 100644
--- a/indra/integration_tests/llimage_libtest/verticalscreen.xml
+++ b/indra/integration_tests/llimage_libtest/filters/verticalscreen.xml
@@ -2,7 +2,7 @@
     <array>
         <array>
             <string>linearize</string>
-            <real>0.1</real>
+            <real>0.0</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
@@ -11,14 +11,9 @@
             <string>grayscale</string>
         </array>
         <array>
-            <string>blend</string>
-            <real>0.0</real>
-            <real>0.0</real>
-        </array>
-        <array>
             <string>screen</string>
             <string>line</string>
-            <real>5.0</real>
+            <real>0.015</real>
             <real>90.0</real>
         </array>
     </array>
diff --git a/indra/integration_tests/llimage_libtest/video.xml b/indra/integration_tests/llimage_libtest/filters/video.xml
index 8b10687ef5..8b10687ef5 100755
--- a/indra/integration_tests/llimage_libtest/video.xml
+++ b/indra/integration_tests/llimage_libtest/filters/video.xml