From 86442d1f8beae66890231c12ddc1cd9e1f1a6170 Mon Sep 17 00:00:00 2001 From: Cho Date: Tue, 12 Nov 2013 01:43:00 +0000 Subject: added Flickr and Twitter FUI buttons for ACME-1179 --- indra/newview/app_settings/commands.xml | 20 ++++++++++++++++++++ indra/newview/app_settings/toolbars.xml | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 60c942094a..6c9b67ac0b 100755 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -226,6 +226,26 @@ is_running_function="Floater.IsOpen" is_running_parameters="social" /> + + - @@ -22,5 +21,6 @@ + -- cgit v1.2.3 From 9946965c4decd59793adcaa39c70dbf9778d61dd Mon Sep 17 00:00:00 2001 From: Cho Date: Tue, 12 Nov 2013 20:07:54 +0000 Subject: replaced Flickr and Twitter FUI icons for ACME-1181 --- indra/newview/app_settings/commands.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 6c9b67ac0b..f4e9cc0136 100755 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -228,7 +228,7 @@ /> Date: Thu, 5 Dec 2013 00:28:28 +0000 Subject: Renamed floater_social to floater_facebook for ACME-1205 --- indra/newview/app_settings/commands.xml | 12 ++++++------ indra/newview/app_settings/settings.xml | 2 +- indra/newview/app_settings/toolbars.xml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index f4e9cc0136..7b329e2092 100755 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -216,15 +216,15 @@ is_running_function="Floater.IsOpen" is_running_parameters="snapshot" /> - SocialPhotoResolution Comment - Default resolution when sharing photo using the social floater + Default resolution when sharing photo using the social floaters Persist 1 Type diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml index c65b79affb..d61aee9a14 100755 --- a/indra/newview/app_settings/toolbars.xml +++ b/indra/newview/app_settings/toolbars.xml @@ -21,6 +21,6 @@ - + -- cgit v1.2.3 From 0696ac9384d89fbfe234ecf664642e04891a89d4 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 7 Jan 2014 16:21:17 -0800 Subject: ACME-1236 : WIP : Add filter files to app_settings/filters (not loaded yet) --- indra/newview/app_settings/filters/Gotham.xml | 30 ++++++++++++++++++++++++ indra/newview/app_settings/filters/Hefe.xml | 23 ++++++++++++++++++ indra/newview/app_settings/filters/Inkwell.xml | 14 +++++++++++ indra/newview/app_settings/filters/Lomofi.xml | 23 ++++++++++++++++++ indra/newview/app_settings/filters/Poprocket.xml | 25 ++++++++++++++++++++ indra/newview/app_settings/filters/Sutro.xml | 19 +++++++++++++++ indra/newview/app_settings/filters/Toaster.xml | 23 ++++++++++++++++++ 7 files changed, 157 insertions(+) create mode 100755 indra/newview/app_settings/filters/Gotham.xml create mode 100755 indra/newview/app_settings/filters/Hefe.xml create mode 100755 indra/newview/app_settings/filters/Inkwell.xml create mode 100755 indra/newview/app_settings/filters/Lomofi.xml create mode 100755 indra/newview/app_settings/filters/Poprocket.xml create mode 100755 indra/newview/app_settings/filters/Sutro.xml create mode 100755 indra/newview/app_settings/filters/Toaster.xml (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/filters/Gotham.xml b/indra/newview/app_settings/filters/Gotham.xml new file mode 100755 index 0000000000..eb0725e6bf --- /dev/null +++ b/indra/newview/app_settings/filters/Gotham.xml @@ -0,0 +1,30 @@ + + + + linearize + 0.0 + 1.0 + 1.0 + 1.0 + + + gamma + 1.5 + 1.0 + 1.0 + 1.0 + + + colorize + 0.0 + 0.0 + 0.0 + 0.0 + 0.0 + 1.0 + + + grayscale + + + diff --git a/indra/newview/app_settings/filters/Hefe.xml b/indra/newview/app_settings/filters/Hefe.xml new file mode 100755 index 0000000000..527aaee847 --- /dev/null +++ b/indra/newview/app_settings/filters/Hefe.xml @@ -0,0 +1,23 @@ + + + + linearize + 0.0 + 1.0 + 1.0 + 1.0 + + + blend + 4.0 + 0.5 + + + contrast + 2.0 + 1.0 + 1.0 + 1.0 + + + diff --git a/indra/newview/app_settings/filters/Inkwell.xml b/indra/newview/app_settings/filters/Inkwell.xml new file mode 100755 index 0000000000..77c88b5fbb --- /dev/null +++ b/indra/newview/app_settings/filters/Inkwell.xml @@ -0,0 +1,14 @@ + + + + linearize + 0.05 + 1.0 + 1.0 + 1.0 + + + grayscale + + + diff --git a/indra/newview/app_settings/filters/Lomofi.xml b/indra/newview/app_settings/filters/Lomofi.xml new file mode 100755 index 0000000000..f5ec911e59 --- /dev/null +++ b/indra/newview/app_settings/filters/Lomofi.xml @@ -0,0 +1,23 @@ + + + + blend + 4.0 + 0.0 + + + linearize + 0.2 + 1.0 + 1.0 + 1.0 + + + brighten + 20.0 + 1.0 + 1.0 + 1.0 + + + diff --git a/indra/newview/app_settings/filters/Poprocket.xml b/indra/newview/app_settings/filters/Poprocket.xml new file mode 100755 index 0000000000..7e64003908 --- /dev/null +++ b/indra/newview/app_settings/filters/Poprocket.xml @@ -0,0 +1,25 @@ + + + + linearize + 0.0 + 1.0 + 1.0 + 1.0 + + + fade + 4.0 + 0.5 + + + colorize + 1.0 + 0.0 + 0.0 + 0.4 + 0.0 + 0.0 + + + diff --git a/indra/newview/app_settings/filters/Sutro.xml b/indra/newview/app_settings/filters/Sutro.xml new file mode 100755 index 0000000000..3b0a58f01e --- /dev/null +++ b/indra/newview/app_settings/filters/Sutro.xml @@ -0,0 +1,19 @@ + + + + linearize + 0.05 + 1.0 + 1.0 + 1.0 + + + fade + 4.0 + 0.5 + + + sepia + + + diff --git a/indra/newview/app_settings/filters/Toaster.xml b/indra/newview/app_settings/filters/Toaster.xml new file mode 100755 index 0000000000..170a1183ed --- /dev/null +++ b/indra/newview/app_settings/filters/Toaster.xml @@ -0,0 +1,23 @@ + + + + contrast + 0.8 + 1.0 + 1.0 + 1.0 + + + fade + 4.0 + 0.5 + + + brighten + 10.0 + 1.0 + 1.0 + 1.0 + + + -- cgit v1.2.3 From 1c705489c47e038200c5e0493b4a310bef10a0e1 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 8 Jan 2014 15:42:52 -0800 Subject: ACME-1236 : WIP : Added Newspaper filter to the bank of filters --- indra/newview/app_settings/filters/Newspaper.xml | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100755 indra/newview/app_settings/filters/Newspaper.xml (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/filters/Newspaper.xml b/indra/newview/app_settings/filters/Newspaper.xml new file mode 100755 index 0000000000..7480325542 --- /dev/null +++ b/indra/newview/app_settings/filters/Newspaper.xml @@ -0,0 +1,25 @@ + + + + linearize + 0.2 + 1.0 + 1.0 + 1.0 + + + grayscale + + + blend + 0.0 + 0.0 + + + screen + 2Dsine + 15.0 + 0.0 + + + -- cgit v1.2.3 From 7d8e4020750683412c9f56edf847fd830402aa0f Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 9 Jan 2014 17:25:01 -0800 Subject: ACME-1244 : WIP : Move files around and introduced an llimagefiltersmanager to get the filters --- indra/newview/app_settings/filters/Gotham.xml | 30 --------------- 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/Hefe.xml | 23 ----------- indra/newview/app_settings/filters/Inkwell.xml | 14 ------- indra/newview/app_settings/filters/Lomofi.xml | 23 ----------- indra/newview/app_settings/filters/Newspaper.xml | 4 +- indra/newview/app_settings/filters/Poprocket.xml | 25 ------------ indra/newview/app_settings/filters/RedV.xml | 32 +++++++++++++++ indra/newview/app_settings/filters/Saturate30.xml | 8 ++++ indra/newview/app_settings/filters/SepiaV.xml | 26 +++++++++++++ indra/newview/app_settings/filters/Sutro.xml | 19 --------- indra/newview/app_settings/filters/Toaster.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 ++++++++++++++++++++ 17 files changed, 263 insertions(+), 159 deletions(-) delete mode 100755 indra/newview/app_settings/filters/Gotham.xml create mode 100755 indra/newview/app_settings/filters/Grayscale.xml create mode 100755 indra/newview/app_settings/filters/GreenGray.xml create mode 100755 indra/newview/app_settings/filters/HLines.xml delete mode 100755 indra/newview/app_settings/filters/Hefe.xml delete mode 100755 indra/newview/app_settings/filters/Inkwell.xml delete mode 100755 indra/newview/app_settings/filters/Lomofi.xml delete mode 100755 indra/newview/app_settings/filters/Poprocket.xml create mode 100755 indra/newview/app_settings/filters/RedV.xml create mode 100755 indra/newview/app_settings/filters/Saturate30.xml create mode 100755 indra/newview/app_settings/filters/SepiaV.xml delete mode 100755 indra/newview/app_settings/filters/Sutro.xml delete mode 100755 indra/newview/app_settings/filters/Toaster.xml create mode 100755 indra/newview/app_settings/filters/VividV.xml create mode 100755 indra/newview/app_settings/filters/VividYellowV.xml create mode 100755 indra/newview/app_settings/filters/YellowV.xml (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/filters/Gotham.xml b/indra/newview/app_settings/filters/Gotham.xml deleted file mode 100755 index eb0725e6bf..0000000000 --- a/indra/newview/app_settings/filters/Gotham.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - linearize - 0.0 - 1.0 - 1.0 - 1.0 - - - gamma - 1.5 - 1.0 - 1.0 - 1.0 - - - colorize - 0.0 - 0.0 - 0.0 - 0.0 - 0.0 - 1.0 - - - grayscale - - - diff --git a/indra/newview/app_settings/filters/Grayscale.xml b/indra/newview/app_settings/filters/Grayscale.xml new file mode 100755 index 0000000000..101ed8233a --- /dev/null +++ b/indra/newview/app_settings/filters/Grayscale.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/GreenGray.xml b/indra/newview/app_settings/filters/GreenGray.xml new file mode 100755 index 0000000000..dce5ab3e9e --- /dev/null +++ b/indra/newview/app_settings/filters/GreenGray.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/HLines.xml b/indra/newview/app_settings/filters/HLines.xml new file mode 100755 index 0000000000..ddff4d1977 --- /dev/null +++ b/indra/newview/app_settings/filters/HLines.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/Hefe.xml b/indra/newview/app_settings/filters/Hefe.xml deleted file mode 100755 index 527aaee847..0000000000 --- a/indra/newview/app_settings/filters/Hefe.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - linearize - 0.0 - 1.0 - 1.0 - 1.0 - - - blend - 4.0 - 0.5 - - - contrast - 2.0 - 1.0 - 1.0 - 1.0 - - - diff --git a/indra/newview/app_settings/filters/Inkwell.xml b/indra/newview/app_settings/filters/Inkwell.xml deleted file mode 100755 index 77c88b5fbb..0000000000 --- a/indra/newview/app_settings/filters/Inkwell.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - linearize - 0.05 - 1.0 - 1.0 - 1.0 - - - grayscale - - - diff --git a/indra/newview/app_settings/filters/Lomofi.xml b/indra/newview/app_settings/filters/Lomofi.xml deleted file mode 100755 index f5ec911e59..0000000000 --- a/indra/newview/app_settings/filters/Lomofi.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - blend - 4.0 - 0.0 - - - linearize - 0.2 - 1.0 - 1.0 - 1.0 - - - brighten - 20.0 - 1.0 - 1.0 - 1.0 - - - diff --git a/indra/newview/app_settings/filters/Newspaper.xml b/indra/newview/app_settings/filters/Newspaper.xml index 7480325542..8247c34500 100755 --- a/indra/newview/app_settings/filters/Newspaper.xml +++ b/indra/newview/app_settings/filters/Newspaper.xml @@ -2,7 +2,7 @@ linearize - 0.2 + 0.1 1.0 1.0 1.0 @@ -18,7 +18,7 @@ screen 2Dsine - 15.0 + 5.0 0.0 diff --git a/indra/newview/app_settings/filters/Poprocket.xml b/indra/newview/app_settings/filters/Poprocket.xml deleted file mode 100755 index 7e64003908..0000000000 --- a/indra/newview/app_settings/filters/Poprocket.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - linearize - 0.0 - 1.0 - 1.0 - 1.0 - - - fade - 4.0 - 0.5 - - - colorize - 1.0 - 0.0 - 0.0 - 0.4 - 0.0 - 0.0 - - - diff --git a/indra/newview/app_settings/filters/RedV.xml b/indra/newview/app_settings/filters/RedV.xml new file mode 100755 index 0000000000..5c47ca0f84 --- /dev/null +++ b/indra/newview/app_settings/filters/RedV.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/Saturate30.xml b/indra/newview/app_settings/filters/Saturate30.xml new file mode 100755 index 0000000000..b77f07a037 --- /dev/null +++ b/indra/newview/app_settings/filters/Saturate30.xml @@ -0,0 +1,8 @@ + + + + saturate + 3.0 + + + diff --git a/indra/newview/app_settings/filters/SepiaV.xml b/indra/newview/app_settings/filters/SepiaV.xml new file mode 100755 index 0000000000..d26df608b9 --- /dev/null +++ b/indra/newview/app_settings/filters/SepiaV.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/Sutro.xml b/indra/newview/app_settings/filters/Sutro.xml deleted file mode 100755 index 3b0a58f01e..0000000000 --- a/indra/newview/app_settings/filters/Sutro.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - linearize - 0.05 - 1.0 - 1.0 - 1.0 - - - fade - 4.0 - 0.5 - - - sepia - - - diff --git a/indra/newview/app_settings/filters/Toaster.xml b/indra/newview/app_settings/filters/Toaster.xml deleted file mode 100755 index 170a1183ed..0000000000 --- a/indra/newview/app_settings/filters/Toaster.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - contrast - 0.8 - 1.0 - 1.0 - 1.0 - - - fade - 4.0 - 0.5 - - - brighten - 10.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 new file mode 100755 index 0000000000..203130bdee --- /dev/null +++ b/indra/newview/app_settings/filters/VividV.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/VividYellowV.xml b/indra/newview/app_settings/filters/VividYellowV.xml new file mode 100755 index 0000000000..2da27e53c1 --- /dev/null +++ b/indra/newview/app_settings/filters/VividYellowV.xml @@ -0,0 +1,39 @@ + + + + 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 new file mode 100755 index 0000000000..0dab2489a0 --- /dev/null +++ b/indra/newview/app_settings/filters/YellowV.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 + + + -- cgit v1.2.3 From 0c7cab771cb7972ed44eedf0c16133ef082eb9e1 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 9 Jan 2014 21:58:30 -0800 Subject: ACME-1236 : Add lines as a new type of vignette and Brightscan as an example --- indra/newview/app_settings/filters/Brightscan.xml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100755 indra/newview/app_settings/filters/Brightscan.xml (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/filters/Brightscan.xml b/indra/newview/app_settings/filters/Brightscan.xml new file mode 100755 index 0000000000..8b10687ef5 --- /dev/null +++ b/indra/newview/app_settings/filters/Brightscan.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 + + + -- cgit v1.2.3 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 -------------------- 19 files changed, 245 insertions(+), 284 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/app_settings') 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 - - - -- cgit v1.2.3 From 349e5565348ea68d0e74af605876ac373b6805c3 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Wed, 15 Jan 2014 09:42:34 -0800 Subject: ACME-1245 : Tweak a bit the Video.xml filter --- indra/newview/app_settings/filters/Video.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/filters/Video.xml b/indra/newview/app_settings/filters/Video.xml index 8b10687ef5..144f340f12 100755 --- a/indra/newview/app_settings/filters/Video.xml +++ b/indra/newview/app_settings/filters/Video.xml @@ -2,7 +2,14 @@ linearize - 0.01 + 0.0 + 1.0 + 1.0 + 1.0 + + + darken + 15.0 1.0 1.0 1.0 @@ -14,7 +21,7 @@ brighten - 100.0 + 30.0 1.0 1.0 1.0 -- cgit v1.2.3 From e0412a7d987e046c48f80992c3c7b2bdb3373201 Mon Sep 17 00:00:00 2001 From: merov Date: Thu, 16 Jan 2014 22:46:37 +0000 Subject: ACME-1237 : Rename filters so that it doesn't trip Windows NSIS script installer (ridiculous...) --- indra/newview/app_settings/filters/1970s color.xml | 41 ---------------------- .../newview/app_settings/filters/Black & white.xml | 21 ----------- .../newview/app_settings/filters/BlackAndWhite.xml | 21 +++++++++++ indra/newview/app_settings/filters/Colors1970.xml | 41 ++++++++++++++++++++++ indra/newview/app_settings/filters/Jules Verne.xml | 25 ------------- indra/newview/app_settings/filters/JulesVerne.xml | 25 +++++++++++++ 6 files changed, 87 insertions(+), 87 deletions(-) delete mode 100644 indra/newview/app_settings/filters/1970s color.xml delete mode 100644 indra/newview/app_settings/filters/Black & white.xml create mode 100644 indra/newview/app_settings/filters/BlackAndWhite.xml create mode 100644 indra/newview/app_settings/filters/Colors1970.xml delete mode 100644 indra/newview/app_settings/filters/Jules Verne.xml create mode 100644 indra/newview/app_settings/filters/JulesVerne.xml (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/filters/1970s color.xml b/indra/newview/app_settings/filters/1970s color.xml deleted file mode 100644 index 0dab2489a0..0000000000 --- a/indra/newview/app_settings/filters/1970s color.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/app_settings/filters/Black & white.xml b/indra/newview/app_settings/filters/Black & white.xml deleted file mode 100644 index 101ed8233a..0000000000 --- a/indra/newview/app_settings/filters/Black & white.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/BlackAndWhite.xml b/indra/newview/app_settings/filters/BlackAndWhite.xml new file mode 100644 index 0000000000..101ed8233a --- /dev/null +++ b/indra/newview/app_settings/filters/BlackAndWhite.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/Colors1970.xml b/indra/newview/app_settings/filters/Colors1970.xml new file mode 100644 index 0000000000..0dab2489a0 --- /dev/null +++ b/indra/newview/app_settings/filters/Colors1970.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/Jules Verne.xml b/indra/newview/app_settings/filters/Jules Verne.xml deleted file mode 100644 index ddff4d1977..0000000000 --- a/indra/newview/app_settings/filters/Jules Verne.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/JulesVerne.xml b/indra/newview/app_settings/filters/JulesVerne.xml new file mode 100644 index 0000000000..ddff4d1977 --- /dev/null +++ b/indra/newview/app_settings/filters/JulesVerne.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 + + + -- cgit v1.2.3 From 88b65f32c7c09264e801178e75975db28d42a54c Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 21 Jan 2014 22:16:39 -0800 Subject: ACME-1236 : Modifies the 10 shipped filters to use the new stencils and resolution independent filters --- indra/newview/app_settings/filters/Colors1970.xml | 10 ++++++++-- indra/newview/app_settings/filters/Heatwave.xml | 8 +++++++- indra/newview/app_settings/filters/JulesVerne.xml | 8 +++++++- indra/newview/app_settings/filters/Newspaper.xml | 8 +++++++- indra/newview/app_settings/filters/Sepia.xml | 8 +++++++- indra/newview/app_settings/filters/Spotlight.xml | 10 ++++++++-- indra/newview/app_settings/filters/Video.xml | 12 ++++++++---- 7 files changed, 52 insertions(+), 12 deletions(-) (limited to 'indra/newview/app_settings') 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 @@ 1.0 1.0 1.0 - 0.5 + 0.3 0.0 0.0 + stencil + vignette blend - 10.0 0.0 + 1.0 + 0.0 + 0.0 + 1.0 + 10.0 colorize 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 @@ 1.0 + stencil + vignette fade - 4.0 0.5 + 1.0 + 0.0 + 0.0 + 1.0 + 4.0 colorize 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 @@ grayscale + stencil + vignette blend 0.0 + 1.0 + 0.0 0.0 + 1.0 + 1.0 screen line - 5.0 + 0.01 0.0 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 @@ grayscale + stencil + vignette blend 0.0 + 1.0 + 0.0 0.0 + 1.0 + 1.0 screen 2Dsine - 5.0 + 0.01 0.0 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 @@ 1.0 + stencil + vignette fade - 4.0 0.5 + 1.0 + 0.0 + 0.0 + 1.0 + 4.0 sepia 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 @@ 1.5 + stencil + vignette fade + 0.75 1.0 - 0.25 + 0.0 + 0.0 + 1.0 + 5.0 saturate @@ -36,7 +42,7 @@ brighten - 30 + 0.1 1.0 1.0 1.0 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 @@ darken - 15.0 + 0.1 1.0 1.0 1.0 - lines - 10.0 + stencil + scanlines + blend + 0.0 + 1.0 + 0.01 0.0 brighten - 30.0 + 0.1 1.0 1.0 1.0 -- cgit v1.2.3 From a355659513a29f5b36207a57351797d18023966d Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Mon, 3 Feb 2014 15:55:17 -0800 Subject: ACME-1294 : Tweak the JuleVerne, Newspaper and Video filters so to be more legible --- indra/newview/app_settings/filters/JulesVerne.xml | 4 ++-- indra/newview/app_settings/filters/Newspaper.xml | 4 ++-- indra/newview/app_settings/filters/Video.xml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/filters/JulesVerne.xml b/indra/newview/app_settings/filters/JulesVerne.xml index b0d4f8e9cd..35bc657c11 100644 --- a/indra/newview/app_settings/filters/JulesVerne.xml +++ b/indra/newview/app_settings/filters/JulesVerne.xml @@ -14,8 +14,8 @@ stencil vignette blend - 0.0 1.0 + 0.1 0.0 0.0 1.0 @@ -24,7 +24,7 @@ screen line - 0.01 + 0.02 0.0 diff --git a/indra/newview/app_settings/filters/Newspaper.xml b/indra/newview/app_settings/filters/Newspaper.xml index b02a553dfa..8441decf3b 100755 --- a/indra/newview/app_settings/filters/Newspaper.xml +++ b/indra/newview/app_settings/filters/Newspaper.xml @@ -14,8 +14,8 @@ stencil vignette blend - 0.0 1.0 + 0.1 0.0 0.0 1.0 @@ -24,7 +24,7 @@ screen 2Dsine - 0.01 + 0.02 0.0 diff --git a/indra/newview/app_settings/filters/Video.xml b/indra/newview/app_settings/filters/Video.xml index 09c4c79638..aa65536235 100755 --- a/indra/newview/app_settings/filters/Video.xml +++ b/indra/newview/app_settings/filters/Video.xml @@ -9,7 +9,7 @@ darken - 0.1 + 0.2 1.0 1.0 1.0 @@ -20,12 +20,12 @@ blend 0.0 1.0 - 0.01 + 0.02 0.0 brighten - 0.1 + 0.2 1.0 1.0 1.0 -- cgit v1.2.3 From 73c9e42fafc0ad21af1ed38735c0ed9212640dd2 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 7 Feb 2014 16:27:42 -0800 Subject: ACME-1314 : Fix screen filter to make it less harsh on edges, modify Jules Verne and Newspaper filters as a result --- indra/newview/app_settings/filters/JulesVerne.xml | 11 ----------- indra/newview/app_settings/filters/Newspaper.xml | 11 ----------- 2 files changed, 22 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/filters/JulesVerne.xml b/indra/newview/app_settings/filters/JulesVerne.xml index 35bc657c11..981e221da9 100644 --- a/indra/newview/app_settings/filters/JulesVerne.xml +++ b/indra/newview/app_settings/filters/JulesVerne.xml @@ -10,17 +10,6 @@ grayscale - - stencil - vignette - blend - 1.0 - 0.1 - 0.0 - 0.0 - 1.0 - 1.0 - screen line diff --git a/indra/newview/app_settings/filters/Newspaper.xml b/indra/newview/app_settings/filters/Newspaper.xml index 8441decf3b..6cfe319281 100755 --- a/indra/newview/app_settings/filters/Newspaper.xml +++ b/indra/newview/app_settings/filters/Newspaper.xml @@ -10,17 +10,6 @@ grayscale - - stencil - vignette - blend - 1.0 - 0.1 - 0.0 - 0.0 - 1.0 - 1.0 - screen 2Dsine -- cgit v1.2.3 From bf0f20ef44de89c5852bfcfca29693b2c09f6a9c Mon Sep 17 00:00:00 2001 From: Cho Date: Wed, 12 Feb 2014 19:45:52 +0000 Subject: Changed Flickr link text for ACME-1320 --- indra/newview/app_settings/filters/Video.xml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/filters/Video.xml b/indra/newview/app_settings/filters/Video.xml index aa65536235..fe17f3950a 100755 --- a/indra/newview/app_settings/filters/Video.xml +++ b/indra/newview/app_settings/filters/Video.xml @@ -9,26 +9,36 @@ darken - 0.2 + 0.15 1.0 1.0 1.0 stencil - scanlines - blend + uniform + add 0.0 - 1.0 + 0.5 + + + screen + line 0.02 0.0 - brighten - 0.2 + gamma + 0.25 1.0 1.0 1.0 + + blur + + + blur + -- cgit v1.2.3 From a5366f06edf5aa1b75328e26011989eba7c601ca Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Thu, 13 Feb 2014 15:15:05 -0800 Subject: ACME-1277 : Final set of filters, added a SnapshotFiltersEnabled debug setting --- .../newview/app_settings/filters/Autocontrast.xml | 11 ++ indra/newview/app_settings/filters/Heatwave.xml | 38 ------ indra/newview/app_settings/filters/JulesVerne.xml | 20 ---- indra/newview/app_settings/filters/LensFlare.xml | 131 +++++++++++++++++++++ indra/newview/app_settings/filters/Miniature.xml | 118 +++++++++++++++++++ indra/newview/app_settings/filters/Overcast.xml | 24 ---- indra/newview/app_settings/filters/Spotlight.xml | 38 +++--- indra/newview/app_settings/filters/Toycamera.xml | 46 ++++++++ indra/newview/app_settings/settings.xml | 11 ++ 9 files changed, 334 insertions(+), 103 deletions(-) create mode 100755 indra/newview/app_settings/filters/Autocontrast.xml delete mode 100644 indra/newview/app_settings/filters/Heatwave.xml delete mode 100644 indra/newview/app_settings/filters/JulesVerne.xml create mode 100644 indra/newview/app_settings/filters/LensFlare.xml create mode 100755 indra/newview/app_settings/filters/Miniature.xml delete mode 100644 indra/newview/app_settings/filters/Overcast.xml create mode 100755 indra/newview/app_settings/filters/Toycamera.xml (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/filters/Autocontrast.xml b/indra/newview/app_settings/filters/Autocontrast.xml new file mode 100755 index 0000000000..ec3d7561bd --- /dev/null +++ b/indra/newview/app_settings/filters/Autocontrast.xml @@ -0,0 +1,11 @@ + + + + linearize + 0.01 + 1.0 + 1.0 + 1.0 + + + diff --git a/indra/newview/app_settings/filters/Heatwave.xml b/indra/newview/app_settings/filters/Heatwave.xml deleted file mode 100644 index a99f41c833..0000000000 --- a/indra/newview/app_settings/filters/Heatwave.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - linearize - 0.1 - 1.0 - 1.0 - 1.0 - - - contrast - 0.8 - 1.0 - 1.0 - 1.0 - - - stencil - vignette - fade - 0.5 - 1.0 - 0.0 - 0.0 - 1.0 - 4.0 - - - colorize - 1.0 - 0.0 - 1.0 - 0.4 - 0.0 - 0.2 - - - diff --git a/indra/newview/app_settings/filters/JulesVerne.xml b/indra/newview/app_settings/filters/JulesVerne.xml deleted file mode 100644 index 981e221da9..0000000000 --- a/indra/newview/app_settings/filters/JulesVerne.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - linearize - 0.1 - 1.0 - 1.0 - 1.0 - - - grayscale - - - screen - line - 0.02 - 0.0 - - - diff --git a/indra/newview/app_settings/filters/LensFlare.xml b/indra/newview/app_settings/filters/LensFlare.xml new file mode 100644 index 0000000000..0b5af9c82b --- /dev/null +++ b/indra/newview/app_settings/filters/LensFlare.xml @@ -0,0 +1,131 @@ + + + + linearize + 0.01 + 1.0 + 1.0 + 1.0 + + + stencil + gradient + add + 1.0 + 0.0 + -1.0 + 1.0 + 1.0 + -1.0 + + + colorize + 1.0 + 1.0 + 1.0 + 0.1 + 0.1 + 0.0 + + + stencil + vignette + add + 0.0 + 1.0 + -1.0 + 1.0 + 1.5 + 5.0 + + + colorize + 1.0 + 1.0 + 1.0 + 0.6 + 0.0 + 0.0 + + + stencil + vignette + add + 0.0 + 1.0 + -1.0 + 1.0 + 1.0 + 5.0 + + + colorize + 1.0 + 1.0 + 1.0 + 0.6 + 0.6 + 0.0 + + + stencil + vignette + add + 0.0 + 0.5 + 0.5 + -0.5 + 0.10 + 20.0 + + + colorize + 1.0 + 1.0 + 1.0 + 0.7 + 0.0 + 0.0 + + + stencil + vignette + add + 0.0 + 0.5 + 0.6 + -0.6 + 0.05 + 20.0 + + + colorize + 1.0 + 1.0 + 1.0 + 0.7 + 0.0 + 0.0 + + + stencil + vignette + add + 0.0 + 0.5 + 0.4 + -0.4 + 0.025 + 20.0 + + + colorize + 1.0 + 1.0 + 1.0 + 0.7 + 0.0 + 0.0 + + + diff --git a/indra/newview/app_settings/filters/Miniature.xml b/indra/newview/app_settings/filters/Miniature.xml new file mode 100755 index 0000000000..9aa8a87c6f --- /dev/null +++ b/indra/newview/app_settings/filters/Miniature.xml @@ -0,0 +1,118 @@ + + + + linearize + 0.02 + 1.0 + 1.0 + 1.0 + + + contrast + 1.02 + 1.0 + 1.0 + 1.0 + + + saturate + 1.2 + + + stencil + vignette + blend + 0.0 + 0.25 + 0.0 + 0.0 + 0.25 + 2.0 + + + sharpen + + + stencil + gradient + blend + 1.0 + 0.0 + 0.0 + -1.0 + 0.0 + -0.25 + + + blur + + + blur + + + blur + + + blur + + + blur + + + blur + + + blur + + + blur + + + blur + + + blur + + + stencil + gradient + blend + 1.0 + 0.0 + 0.0 + 1.0 + 0.0 + 0.25 + + + blur + + + blur + + + blur + + + blur + + + blur + + + blur + + + blur + + + blur + + + blur + + + blur + + + \ No newline at end of file diff --git a/indra/newview/app_settings/filters/Overcast.xml b/indra/newview/app_settings/filters/Overcast.xml deleted file mode 100644 index dce5ab3e9e..0000000000 --- a/indra/newview/app_settings/filters/Overcast.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/Spotlight.xml b/indra/newview/app_settings/filters/Spotlight.xml index 044b2c0b3a..0e2e0ad68c 100644 --- a/indra/newview/app_settings/filters/Spotlight.xml +++ b/indra/newview/app_settings/filters/Spotlight.xml @@ -2,47 +2,43 @@ linearize - 0.1 + 0.0 + 1.0 1.0 1.0 + + + stencil + vignette + add + 0.0 + 0.4 + 0.0 + 0.0 1.0 + 2.0 contrast - 0.8 1.0 1.0 1.0 - - - saturate - 1.5 + 1.0 stencil vignette - fade - 0.75 - 1.0 + add + -0.8 + 0.0 0.0 0.0 1.0 - 5.0 - - - saturate - 0.8 + 2.0 contrast - 1.1 - 1.0 - 1.0 1.0 - - - brighten - 0.1 1.0 1.0 1.0 diff --git a/indra/newview/app_settings/filters/Toycamera.xml b/indra/newview/app_settings/filters/Toycamera.xml new file mode 100755 index 0000000000..4e76f6b2fb --- /dev/null +++ b/indra/newview/app_settings/filters/Toycamera.xml @@ -0,0 +1,46 @@ + + + + stencil + vignette + fade + 0.0 + 1.0 + 0.0 + 0.0 + 1.2 + 3.0 + + + linearize + 0.05 + 1.0 + 1.0 + 1.0 + + + grayscale + + + contrast + 1.1 + 1.0 + 1.0 + 1.0 + + + stencil + vignette + blend + 1.0 + 0.0 + 0.0 + 0.0 + 0.5 + 2.0 + + + blur + + + \ No newline at end of file diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index afc4ac617c..43c82c3005 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -11268,6 +11268,17 @@ Value 0 + SnapshotFiltersEnabled + + Comment + Enable filters in the Snapshot Advanced panel (experimental). + Persist + 1 + Type + Boolean + Value + 0 + SnapshotFormat Comment -- cgit v1.2.3 From 7bab501b816ec42ccada9b26e0cb112b74bd633c Mon Sep 17 00:00:00 2001 From: Cho Date: Fri, 14 Feb 2014 22:05:44 +0000 Subject: Reduced intensity of light leak on Lens Flare filter for ACME-1277 --- indra/newview/app_settings/filters/LensFlare.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/filters/LensFlare.xml b/indra/newview/app_settings/filters/LensFlare.xml index 0b5af9c82b..e9aef6eea4 100644 --- a/indra/newview/app_settings/filters/LensFlare.xml +++ b/indra/newview/app_settings/filters/LensFlare.xml @@ -11,7 +11,7 @@ stencil gradient add - 1.0 + 0.5 0.0 -1.0 1.0 @@ -32,7 +32,7 @@ vignette add 0.0 - 1.0 + 0.5 -1.0 1.0 1.5 @@ -52,7 +52,7 @@ vignette add 0.0 - 1.0 + 0.5 -1.0 1.0 1.0 -- cgit v1.2.3