ACME-1236 : Modifies the 10 shipped filters to use the new stencils and resolution independent filters

7 files changed, 52 insertions, 12 deletions

diff --git a/indra/newview/app_settings/filters/Colors1970.xml b/indra/newview/app_settings/filters/Colors1970.xml
index 0dab2489a0..730d907fa7 100644
--- a/indra/newview/app_settings/filters/Colors1970.xml
+++ b/indra/newview/app_settings/filters/Colors1970.xml
@@ -19,14 +19,20 @@
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
-            <real>0.5</real>
+            <real>0.3</real>
             <real>0.0</real>
             <real>0.0</real>
         </array>
         <array>
+            <string>stencil</string>
+            <string>vignette</string>
             <string>blend</string>
-            <real>10.0</real>
             <real>0.0</real>
+            <real>1.0</real>
+            <real>0.0</real>
+            <real>0.0</real>
+            <real>1.0</real>
+            <real>10.0</real>
         </array>
         <array>
             <string>colorize</string>
diff --git a/indra/newview/app_settings/filters/Heatwave.xml b/indra/newview/app_settings/filters/Heatwave.xml
index 5c47ca0f84..a99f41c833 100644
--- a/indra/newview/app_settings/filters/Heatwave.xml
+++ b/indra/newview/app_settings/filters/Heatwave.xml
@@ -15,9 +15,15 @@
             <real>1.0</real>
         </array>
         <array>
+            <string>stencil</string>
+            <string>vignette</string>
             <string>fade</string>
-            <real>4.0</real>
             <real>0.5</real>
+            <real>1.0</real>
+            <real>0.0</real>
+            <real>0.0</real>
+            <real>1.0</real>
+            <real>4.0</real>
         </array>
         <array>
             <string>colorize</string>
diff --git a/indra/newview/app_settings/filters/JulesVerne.xml b/indra/newview/app_settings/filters/JulesVerne.xml
index ddff4d1977..b0d4f8e9cd 100644
--- a/indra/newview/app_settings/filters/JulesVerne.xml
+++ b/indra/newview/app_settings/filters/JulesVerne.xml
@@ -11,14 +11,20 @@
             <string>grayscale</string>
         </array>
         <array>
+            <string>stencil</string>
+            <string>vignette</string>
             <string>blend</string>
             <real>0.0</real>
+            <real>1.0</real>
+            <real>0.0</real>
             <real>0.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
         </array>
         <array>
             <string>screen</string>
             <string>line</string>
-            <real>5.0</real>
+            <real>0.01</real>
             <real>0.0</real>
         </array>
     </array>
diff --git a/indra/newview/app_settings/filters/Newspaper.xml b/indra/newview/app_settings/filters/Newspaper.xml
index 8247c34500..b02a553dfa 100755
--- a/indra/newview/app_settings/filters/Newspaper.xml
+++ b/indra/newview/app_settings/filters/Newspaper.xml
@@ -11,14 +11,20 @@
             <string>grayscale</string>
         </array>
         <array>
+            <string>stencil</string>
+            <string>vignette</string>
             <string>blend</string>
             <real>0.0</real>
+            <real>1.0</real>
+            <real>0.0</real>
             <real>0.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
         </array>
         <array>
             <string>screen</string>
             <string>2Dsine</string>
-            <real>5.0</real>
+            <real>0.01</real>
             <real>0.0</real>
         </array>
     </array>
diff --git a/indra/newview/app_settings/filters/Sepia.xml b/indra/newview/app_settings/filters/Sepia.xml
index d26df608b9..3d577b2998 100644
--- a/indra/newview/app_settings/filters/Sepia.xml
+++ b/indra/newview/app_settings/filters/Sepia.xml
@@ -15,9 +15,15 @@
             <real>1.0</real>
         </array>
         <array>
+            <string>stencil</string>
+            <string>vignette</string>
             <string>fade</string>
-            <real>4.0</real>
             <real>0.5</real>
+            <real>1.0</real>
+            <real>0.0</real>
+            <real>0.0</real>
+            <real>1.0</real>
+            <real>4.0</real>
         </array>
         <array>
             <string>sepia</string>
diff --git a/indra/newview/app_settings/filters/Spotlight.xml b/indra/newview/app_settings/filters/Spotlight.xml
index 203130bdee..044b2c0b3a 100644
--- a/indra/newview/app_settings/filters/Spotlight.xml
+++ b/indra/newview/app_settings/filters/Spotlight.xml
@@ -19,9 +19,15 @@
             <real>1.5</real>
         </array>
         <array>
+            <string>stencil</string>
+            <string>vignette</string>
             <string>fade</string>
+            <real>0.75</real>
             <real>1.0</real>
-            <real>0.25</real>
+            <real>0.0</real>
+            <real>0.0</real>
+            <real>1.0</real>
+            <real>5.0</real>
         </array>
         <array>
             <string>saturate</string>
@@ -36,7 +42,7 @@
         </array>
         <array>
             <string>brighten</string>
-            <real>30</real>
+            <real>0.1</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
diff --git a/indra/newview/app_settings/filters/Video.xml b/indra/newview/app_settings/filters/Video.xml
index 144f340f12..09c4c79638 100755
--- a/indra/newview/app_settings/filters/Video.xml
+++ b/indra/newview/app_settings/filters/Video.xml
@@ -9,19 +9,23 @@
         </array>
         <array>
             <string>darken</string>
-            <real>15.0</real>
+            <real>0.1</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
         </array>
         <array>
-            <string>lines</string>
-            <real>10.0</real>
+            <string>stencil</string>
+            <string>scanlines</string>
+            <string>blend</string>
+            <real>0.0</real>
+            <real>1.0</real>
+            <real>0.01</real>
             <real>0.0</real>
         </array>
         <array>
             <string>brighten</string>
-            <real>30.0</real>
+            <real>0.1</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>