diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-02-13 15:17:37 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-02-13 15:17:37 -0800 |
| commit | cce9595826c8257ff0bacb0800eef3b72093543f (patch) | |
| tree | 3f12fe1e67dd75b694cc4c20c06e4e945161001f | |
| parent | a5366f06edf5aa1b75328e26011989eba7c601ca (diff) | |
| parent | 170b5aed71446bf891ef4095812ccbfba7f4bab1 (diff) | |
Pull merge from lindenlab/viewer-acme
| -rwxr-xr-x | indra/integration_tests/llimage_libtest/filters/pixelate.xml | 21 | ||||
| -rwxr-xr-x | indra/integration_tests/llimage_libtest/filters/video.xml | 31 |
2 files changed, 45 insertions, 7 deletions
diff --git a/indra/integration_tests/llimage_libtest/filters/pixelate.xml b/indra/integration_tests/llimage_libtest/filters/pixelate.xml index 4c9e8255fe..f643419aa0 100755 --- a/indra/integration_tests/llimage_libtest/filters/pixelate.xml +++ b/indra/integration_tests/llimage_libtest/filters/pixelate.xml @@ -1,6 +1,23 @@ <llsd> <array> <array> + <string>blur</string> + </array> + <array> + <string>darken</string> + <real>0.1</real> + <real>1.0</real> + <real>1.0</real> + <real>1.0</real> + </array> + <array> + <string>contrast</string> + <real>0.9</real> + <real>1.0</real> + <real>1.0</real> + <real>1.0</real> + </array> + <array> <string>linearize</string> <real>0.01</real> <real>1.0</real> @@ -9,10 +26,10 @@ </array> <array> <string>posterize</string> - <real>5.0</real> + <real>4.0</real> <real>1.0</real> <real>1.0</real> <real>1.0</real> </array> </array> -</llsd> +</llsd>
\ No newline at end of file diff --git a/indra/integration_tests/llimage_libtest/filters/video.xml b/indra/integration_tests/llimage_libtest/filters/video.xml index 8b10687ef5..fe17f3950a 100755 --- a/indra/integration_tests/llimage_libtest/filters/video.xml +++ b/indra/integration_tests/llimage_libtest/filters/video.xml @@ -2,22 +2,43 @@ <array> <array> <string>linearize</string> - <real>0.01</real> + <real>0.0</real> <real>1.0</real> <real>1.0</real> <real>1.0</real> </array> <array> - <string>lines</string> - <real>10.0</real> + <string>darken</string> + <real>0.15</real> + <real>1.0</real> + <real>1.0</real> + <real>1.0</real> + </array> + <array> + <string>stencil</string> + <string>uniform</string> + <string>add</string> <real>0.0</real> + <real>0.5</real> </array> <array> - <string>brighten</string> - <real>100.0</real> + <string>screen</string> + <string>line</string> + <real>0.02</real> + <real>0.0</real> + </array> + <array> + <string>gamma</string> + <real>0.25</real> <real>1.0</real> <real>1.0</real> <real>1.0</real> </array> + <array> + <string>blur</string> + </array> + <array> + <string>blur</string> + </array> </array> </llsd> |