From 5342d0c570ef6c654b63a403d9aa7b51ef65f249 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Mon, 13 Jan 2014 14:36:42 -0800 Subject: ACME-1256 : Rename and cleanup in the default filters --- indra/newview/app_settings/filters/1970s color.xml | 41 ++++++++++++++++++++ .../newview/app_settings/filters/Black & white.xml | 21 ++++++++++ indra/newview/app_settings/filters/Brightscan.xml | 23 ----------- indra/newview/app_settings/filters/Grayscale.xml | 21 ---------- indra/newview/app_settings/filters/GreenGray.xml | 24 ------------ indra/newview/app_settings/filters/HLines.xml | 25 ------------ indra/newview/app_settings/filters/Heatwave.xml | 32 +++++++++++++++ indra/newview/app_settings/filters/Intense.xml | 8 ++++ indra/newview/app_settings/filters/Jules Verne.xml | 25 ++++++++++++ indra/newview/app_settings/filters/Overcast.xml | 24 ++++++++++++ indra/newview/app_settings/filters/RedV.xml | 32 --------------- indra/newview/app_settings/filters/Saturate30.xml | 8 ---- indra/newview/app_settings/filters/Sepia.xml | 26 +++++++++++++ indra/newview/app_settings/filters/SepiaV.xml | 26 ------------- indra/newview/app_settings/filters/Spotlight.xml | 45 ++++++++++++++++++++++ indra/newview/app_settings/filters/Video.xml | 23 +++++++++++ indra/newview/app_settings/filters/VividV.xml | 45 ---------------------- .../newview/app_settings/filters/VividYellowV.xml | 39 ------------------- indra/newview/app_settings/filters/YellowV.xml | 41 -------------------- .../skins/default/xui/en/panel_flickr_photo.xml | 4 -- 20 files changed, 245 insertions(+), 288 deletions(-) create mode 100644 indra/newview/app_settings/filters/1970s color.xml create mode 100644 indra/newview/app_settings/filters/Black & white.xml delete mode 100755 indra/newview/app_settings/filters/Brightscan.xml delete mode 100644 indra/newview/app_settings/filters/Grayscale.xml delete mode 100644 indra/newview/app_settings/filters/GreenGray.xml delete mode 100644 indra/newview/app_settings/filters/HLines.xml create mode 100644 indra/newview/app_settings/filters/Heatwave.xml create mode 100644 indra/newview/app_settings/filters/Intense.xml create mode 100644 indra/newview/app_settings/filters/Jules Verne.xml create mode 100644 indra/newview/app_settings/filters/Overcast.xml delete mode 100644 indra/newview/app_settings/filters/RedV.xml delete mode 100644 indra/newview/app_settings/filters/Saturate30.xml create mode 100644 indra/newview/app_settings/filters/Sepia.xml delete mode 100644 indra/newview/app_settings/filters/SepiaV.xml create mode 100644 indra/newview/app_settings/filters/Spotlight.xml create mode 100755 indra/newview/app_settings/filters/Video.xml delete mode 100644 indra/newview/app_settings/filters/VividV.xml delete mode 100644 indra/newview/app_settings/filters/VividYellowV.xml delete mode 100644 indra/newview/app_settings/filters/YellowV.xml (limited to 'indra/newview') diff --git a/indra/newview/app_settings/filters/1970s color.xml b/indra/newview/app_settings/filters/1970s color.xml new file mode 100644 index 0000000000..0dab2489a0 --- /dev/null +++ b/indra/newview/app_settings/filters/1970s color.xml @@ -0,0 +1,41 @@ + + + + linearize + 0.1 + 1.0 + 1.0 + 1.0 + + + contrast + 0.8 + 1.0 + 1.0 + 1.0 + + + colorize + 1.0 + 1.0 + 1.0 + 0.5 + 0.0 + 0.0 + + + blend + 10.0 + 0.0 + + + colorize + 1.0 + 1.0 + 1.0 + 0.1 + 0.1 + 0.0 + + + diff --git a/indra/newview/app_settings/filters/Black & white.xml b/indra/newview/app_settings/filters/Black & white.xml new file mode 100644 index 0000000000..101ed8233a --- /dev/null +++ b/indra/newview/app_settings/filters/Black & white.xml @@ -0,0 +1,21 @@ + + + + linearize + 0.01 + 1.0 + 1.0 + 1.0 + + + contrast + 0.8 + 1.0 + 1.0 + 1.0 + + + grayscale + + + diff --git a/indra/newview/app_settings/filters/Brightscan.xml b/indra/newview/app_settings/filters/Brightscan.xml deleted file mode 100755 index 8b10687ef5..0000000000 --- a/indra/newview/app_settings/filters/Brightscan.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - linearize - 0.01 - 1.0 - 1.0 - 1.0 - - - lines - 10.0 - 0.0 - - - brighten - 100.0 - 1.0 - 1.0 - 1.0 - - - diff --git a/indra/newview/app_settings/filters/Grayscale.xml b/indra/newview/app_settings/filters/Grayscale.xml deleted file mode 100644 index 101ed8233a..0000000000 --- a/indra/newview/app_settings/filters/Grayscale.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - linearize - 0.01 - 1.0 - 1.0 - 1.0 - - - contrast - 0.8 - 1.0 - 1.0 - 1.0 - - - grayscale - - - diff --git a/indra/newview/app_settings/filters/GreenGray.xml b/indra/newview/app_settings/filters/GreenGray.xml deleted file mode 100644 index dce5ab3e9e..0000000000 --- a/indra/newview/app_settings/filters/GreenGray.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - linearize - 0.1 - 1.0 - 1.0 - 1.0 - - - colorize - 1.0 - 1.0 - 1.0 - 0.0 - 0.3 - 0.0 - - - saturate - 0.35 - - - diff --git a/indra/newview/app_settings/filters/HLines.xml b/indra/newview/app_settings/filters/HLines.xml deleted file mode 100644 index ddff4d1977..0000000000 --- a/indra/newview/app_settings/filters/HLines.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - linearize - 0.1 - 1.0 - 1.0 - 1.0 - - - grayscale - - - blend - 0.0 - 0.0 - - - screen - line - 5.0 - 0.0 - - - diff --git a/indra/newview/app_settings/filters/Heatwave.xml b/indra/newview/app_settings/filters/Heatwave.xml new file mode 100644 index 0000000000..5c47ca0f84 --- /dev/null +++ b/indra/newview/app_settings/filters/Heatwave.xml @@ -0,0 +1,32 @@ + + + + linearize + 0.1 + 1.0 + 1.0 + 1.0 + + + contrast + 0.8 + 1.0 + 1.0 + 1.0 + + + fade + 4.0 + 0.5 + + + colorize + 1.0 + 0.0 + 1.0 + 0.4 + 0.0 + 0.2 + + + diff --git a/indra/newview/app_settings/filters/Intense.xml b/indra/newview/app_settings/filters/Intense.xml new file mode 100644 index 0000000000..b77f07a037 --- /dev/null +++ b/indra/newview/app_settings/filters/Intense.xml @@ -0,0 +1,8 @@ + + + + saturate + 3.0 + + + diff --git a/indra/newview/app_settings/filters/Jules Verne.xml b/indra/newview/app_settings/filters/Jules Verne.xml new file mode 100644 index 0000000000..ddff4d1977 --- /dev/null +++ b/indra/newview/app_settings/filters/Jules Verne.xml @@ -0,0 +1,25 @@ + + + + linearize + 0.1 + 1.0 + 1.0 + 1.0 + + + grayscale + + + blend + 0.0 + 0.0 + + + screen + line + 5.0 + 0.0 + + + diff --git a/indra/newview/app_settings/filters/Overcast.xml b/indra/newview/app_settings/filters/Overcast.xml new file mode 100644 index 0000000000..dce5ab3e9e --- /dev/null +++ b/indra/newview/app_settings/filters/Overcast.xml @@ -0,0 +1,24 @@ + + + + linearize + 0.1 + 1.0 + 1.0 + 1.0 + + + colorize + 1.0 + 1.0 + 1.0 + 0.0 + 0.3 + 0.0 + + + saturate + 0.35 + + + diff --git a/indra/newview/app_settings/filters/RedV.xml b/indra/newview/app_settings/filters/RedV.xml deleted file mode 100644 index 5c47ca0f84..0000000000 --- a/indra/newview/app_settings/filters/RedV.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - linearize - 0.1 - 1.0 - 1.0 - 1.0 - - - contrast - 0.8 - 1.0 - 1.0 - 1.0 - - - fade - 4.0 - 0.5 - - - colorize - 1.0 - 0.0 - 1.0 - 0.4 - 0.0 - 0.2 - - - diff --git a/indra/newview/app_settings/filters/Saturate30.xml b/indra/newview/app_settings/filters/Saturate30.xml deleted file mode 100644 index b77f07a037..0000000000 --- a/indra/newview/app_settings/filters/Saturate30.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - saturate - 3.0 - - - diff --git a/indra/newview/app_settings/filters/Sepia.xml b/indra/newview/app_settings/filters/Sepia.xml new file mode 100644 index 0000000000..d26df608b9 --- /dev/null +++ b/indra/newview/app_settings/filters/Sepia.xml @@ -0,0 +1,26 @@ + + + + linearize + 0.01 + 1.0 + 1.0 + 1.0 + + + contrast + 0.8 + 1.0 + 1.0 + 1.0 + + + fade + 4.0 + 0.5 + + + sepia + + + diff --git a/indra/newview/app_settings/filters/SepiaV.xml b/indra/newview/app_settings/filters/SepiaV.xml deleted file mode 100644 index d26df608b9..0000000000 --- a/indra/newview/app_settings/filters/SepiaV.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - linearize - 0.01 - 1.0 - 1.0 - 1.0 - - - contrast - 0.8 - 1.0 - 1.0 - 1.0 - - - fade - 4.0 - 0.5 - - - sepia - - - diff --git a/indra/newview/app_settings/filters/Spotlight.xml b/indra/newview/app_settings/filters/Spotlight.xml new file mode 100644 index 0000000000..203130bdee --- /dev/null +++ b/indra/newview/app_settings/filters/Spotlight.xml @@ -0,0 +1,45 @@ + + + + linearize + 0.1 + 1.0 + 1.0 + 1.0 + + + contrast + 0.8 + 1.0 + 1.0 + 1.0 + + + saturate + 1.5 + + + fade + 1.0 + 0.25 + + + saturate + 0.8 + + + contrast + 1.1 + 1.0 + 1.0 + 1.0 + + + brighten + 30 + 1.0 + 1.0 + 1.0 + + + diff --git a/indra/newview/app_settings/filters/Video.xml b/indra/newview/app_settings/filters/Video.xml new file mode 100755 index 0000000000..8b10687ef5 --- /dev/null +++ b/indra/newview/app_settings/filters/Video.xml @@ -0,0 +1,23 @@ + + + + linearize + 0.01 + 1.0 + 1.0 + 1.0 + + + lines + 10.0 + 0.0 + + + brighten + 100.0 + 1.0 + 1.0 + 1.0 + + + diff --git a/indra/newview/app_settings/filters/VividV.xml b/indra/newview/app_settings/filters/VividV.xml deleted file mode 100644 index 203130bdee..0000000000 --- a/indra/newview/app_settings/filters/VividV.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - linearize - 0.1 - 1.0 - 1.0 - 1.0 - - - contrast - 0.8 - 1.0 - 1.0 - 1.0 - - - saturate - 1.5 - - - fade - 1.0 - 0.25 - - - saturate - 0.8 - - - contrast - 1.1 - 1.0 - 1.0 - 1.0 - - - brighten - 30 - 1.0 - 1.0 - 1.0 - - - 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 @@ - - - - linearize - 0.1 - 1.0 - 1.0 - 1.0 - - - contrast - 1.1 - 1.0 - 1.0 - 1.0 - - - fade - 1.0 - 0.25 - - - colorize - 1.0 - 1.0 - 1.0 - 0.3 - 0.2 - 0.0 - - - contrast - 1.1 - 1.0 - 1.0 - 1.0 - - - diff --git a/indra/newview/app_settings/filters/YellowV.xml b/indra/newview/app_settings/filters/YellowV.xml deleted file mode 100644 index 0dab2489a0..0000000000 --- a/indra/newview/app_settings/filters/YellowV.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - linearize - 0.1 - 1.0 - 1.0 - 1.0 - - - contrast - 0.8 - 1.0 - 1.0 - 1.0 - - - colorize - 1.0 - 1.0 - 1.0 - 0.5 - 0.0 - 0.0 - - - blend - 10.0 - 0.0 - - - colorize - 1.0 - 1.0 - 1.0 - 0.1 - 0.1 - 0.0 - - - 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" /> -