From e0412a7d987e046c48f80992c3c7b2bdb3373201 Mon Sep 17 00:00:00 2001
From: merov <none@none>
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')

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 @@
-<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>0.8</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
-        <array>
-            <string>colorize</string>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>0.5</real>
-            <real>0.0</real>
-            <real>0.0</real>
-        </array>
-        <array>
-            <string>blend</string>
-            <real>10.0</real>
-            <real>0.0</real>
-        </array>
-        <array>
-            <string>colorize</string>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>0.1</real>
-            <real>0.1</real>
-            <real>0.0</real>
-        </array>
-    </array>
-</llsd>
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 @@
-<llsd>
-    <array>
-        <array>
-            <string>linearize</string>
-            <real>0.01</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
-        <array>
-            <string>contrast</string>
-            <real>0.8</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
-        <array>
-            <string>grayscale</string>
-        </array>
-    </array>
-</llsd>
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 @@
+<llsd>
+    <array>
+        <array>
+            <string>linearize</string>
+            <real>0.01</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
+            <string>contrast</string>
+            <real>0.8</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
+            <string>grayscale</string>
+        </array>
+    </array>
+</llsd>
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 @@
+<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>0.8</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
+            <string>colorize</string>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>0.5</real>
+            <real>0.0</real>
+            <real>0.0</real>
+        </array>
+        <array>
+            <string>blend</string>
+            <real>10.0</real>
+            <real>0.0</real>
+        </array>
+        <array>
+            <string>colorize</string>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>0.1</real>
+            <real>0.1</real>
+            <real>0.0</real>
+        </array>
+    </array>
+</llsd>
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 @@
-<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>grayscale</string>
-        </array>
-        <array>
-            <string>blend</string>
-            <real>0.0</real>
-            <real>0.0</real>
-        </array>
-        <array>
-            <string>screen</string>
-            <string>line</string>
-            <real>5.0</real>
-            <real>0.0</real>
-        </array>
-    </array>
-</llsd>
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 @@
+<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>grayscale</string>
+        </array>
+        <array>
+            <string>blend</string>
+            <real>0.0</real>
+            <real>0.0</real>
+        </array>
+        <array>
+            <string>screen</string>
+            <string>line</string>
+            <real>5.0</real>
+            <real>0.0</real>
+        </array>
+    </array>
+</llsd>
-- 
cgit v1.2.3