11 files changed, 0 insertions, 43 deletions
diff --git a/indra/newview/app_settings/filters/YellowV.xml b/indra/newview/app_settings/filters/1970s color.xml
index 0dab2489a0..0dab2489a0 100644
--- a/indra/newview/app_settings/filters/YellowV.xml
+++ b/indra/newview/app_settings/filters/1970s color.xml
diff --git a/indra/newview/app_settings/filters/Grayscale.xml b/indra/newview/app_settings/filters/Black & white.xml
index 101ed8233a..101ed8233a 100644
--- a/indra/newview/app_settings/filters/Grayscale.xml
+++ b/indra/newview/app_settings/filters/Black & white.xml
diff --git a/indra/newview/app_settings/filters/RedV.xml b/indra/newview/app_settings/filters/Heatwave.xml
index 5c47ca0f84..5c47ca0f84 100644
--- a/indra/newview/app_settings/filters/RedV.xml
+++ b/indra/newview/app_settings/filters/Heatwave.xml
diff --git a/indra/newview/app_settings/filters/Saturate30.xml b/indra/newview/app_settings/filters/Intense.xml
index b77f07a037..b77f07a037 100644
--- a/indra/newview/app_settings/filters/Saturate30.xml
+++ b/indra/newview/app_settings/filters/Intense.xml
diff --git a/indra/newview/app_settings/filters/HLines.xml b/indra/newview/app_settings/filters/Jules Verne.xml
index ddff4d1977..ddff4d1977 100644
--- a/indra/newview/app_settings/filters/HLines.xml
+++ b/indra/newview/app_settings/filters/Jules Verne.xml
diff --git a/indra/newview/app_settings/filters/GreenGray.xml b/indra/newview/app_settings/filters/Overcast.xml
index dce5ab3e9e..dce5ab3e9e 100644
--- a/indra/newview/app_settings/filters/GreenGray.xml
+++ b/indra/newview/app_settings/filters/Overcast.xml
diff --git a/indra/newview/app_settings/filters/SepiaV.xml b/indra/newview/app_settings/filters/Sepia.xml
index d26df608b9..d26df608b9 100644
--- a/indra/newview/app_settings/filters/SepiaV.xml
+++ b/indra/newview/app_settings/filters/Sepia.xml
diff --git a/indra/newview/app_settings/filters/VividV.xml b/indra/newview/app_settings/filters/Spotlight.xml
index 203130bdee..203130bdee 100644
--- a/indra/newview/app_settings/filters/VividV.xml
+++ b/indra/newview/app_settings/filters/Spotlight.xml
diff --git a/indra/newview/app_settings/filters/Brightscan.xml b/indra/newview/app_settings/filters/Video.xml
index 8b10687ef5..8b10687ef5 100755
--- a/indra/newview/app_settings/filters/Brightscan.xml
+++ b/indra/newview/app_settings/filters/Video.xml
diff --git a/indra/newview/app_settings/filters/VividYellowV.xml b/indra/newview/app_settings/filters/VividYellowV.xml
deleted file mode 100644
index 2da27e53c1..0000000000
--- a/indra/newview/app_settings/filters/VividYellowV.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<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/skins/default/xui/en/panel_flickr_photo.xml b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
index 28e3557e15..47ddecdf38 100644
--- a/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
+++ b/indra/newview/skins/default/xui/en/panel_flickr_photo.xml
@@ -53,10 +53,6 @@
                  label="No Filter"
                  name="NoFilter"
                  value="NoFilter" />
-                <combo_box.item
-                 label="Gray Scale"
-                 name="GrayScale"
-                 value="GrayScale" />
             </combo_box>
             <panel
                 height="150"