From 5342d0c570ef6c654b63a403d9aa7b51ef65f249 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Mon, 13 Jan 2014 14:36:42 -0800
Subject: [PATCH] ACME-1256 : Rename and cleanup in the default filters
---
.../filters/{YellowV.xml => 1970s color.xml} | 0
.../{Grayscale.xml => Black & white.xml} | 0
.../filters/{RedV.xml => Heatwave.xml} | 0
.../filters/{Saturate30.xml => Intense.xml} | 0
.../filters/{HLines.xml => Jules Verne.xml} | 0
.../filters/{GreenGray.xml => Overcast.xml} | 0
.../filters/{SepiaV.xml => Sepia.xml} | 0
.../filters/{VividV.xml => Spotlight.xml} | 0
.../filters/{Brightscan.xml => Video.xml} | 0
.../app_settings/filters/VividYellowV.xml | 39 -------------------
.../default/xui/en/panel_flickr_photo.xml | 4 --
11 files changed, 43 deletions(-)
rename indra/newview/app_settings/filters/{YellowV.xml => 1970s color.xml} (100%)
rename indra/newview/app_settings/filters/{Grayscale.xml => Black & white.xml} (100%)
rename indra/newview/app_settings/filters/{RedV.xml => Heatwave.xml} (100%)
rename indra/newview/app_settings/filters/{Saturate30.xml => Intense.xml} (100%)
rename indra/newview/app_settings/filters/{HLines.xml => Jules Verne.xml} (100%)
rename indra/newview/app_settings/filters/{GreenGray.xml => Overcast.xml} (100%)
rename indra/newview/app_settings/filters/{SepiaV.xml => Sepia.xml} (100%)
rename indra/newview/app_settings/filters/{VividV.xml => Spotlight.xml} (100%)
rename indra/newview/app_settings/filters/{Brightscan.xml => Video.xml} (100%)
delete mode 100644 indra/newview/app_settings/filters/VividYellowV.xml
diff --git a/indra/newview/app_settings/filters/YellowV.xml b/indra/newview/app_settings/filters/1970s color.xml
similarity index 100%
rename from indra/newview/app_settings/filters/YellowV.xml
rename to 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
similarity index 100%
rename from indra/newview/app_settings/filters/Grayscale.xml
rename to 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
similarity index 100%
rename from indra/newview/app_settings/filters/RedV.xml
rename to 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
similarity index 100%
rename from indra/newview/app_settings/filters/Saturate30.xml
rename to 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
similarity index 100%
rename from indra/newview/app_settings/filters/HLines.xml
rename to 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
similarity index 100%
rename from indra/newview/app_settings/filters/GreenGray.xml
rename to 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
similarity index 100%
rename from indra/newview/app_settings/filters/SepiaV.xml
rename to 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
similarity index 100%
rename from indra/newview/app_settings/filters/VividV.xml
rename to 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
similarity index 100%
rename from indra/newview/app_settings/filters/Brightscan.xml
rename to 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 2da27e53c14..00000000000
--- 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 28e3557e154..47ddecdf38a 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"
--
GitLab