From dca057c6656d98ee05c2fc98dd912d4fd5d35505 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 25 Jul 2014 10:16:38 +0200
Subject: Changed: Snapshot floater layout. Changed: Snapshots to disk default
 to 'Custom' (Window Resolution) Added: Big Auto-scaling integrated image
 Preview. Can be toggled. Added: Fixed german translations for the new floater
 layout. Removed: Need to have SnapshotFiltersEnabled to see the filter
 dropdown. Removed: SnapshotFiltersEnabled debug.

---
 indra/newview/app_settings/settings.xml | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 03b953b6cc..7ebda3eea6 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11452,17 +11452,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>SnapshotFiltersEnabled</key>
-    <map>
-        <key>Comment</key>
-        <string>Enable filters in the Snapshot Advanced panel (experimental).</string>
-        <key>Persist</key>
-        <integer>1</integer>
-        <key>Type</key>
-        <string>Boolean</string>
-        <key>Value</key>
-        <integer>0</integer>
-    </map>
     <key>SnapshotFormat</key>
     <map>
       <key>Comment</key>
-- 
cgit v1.2.3


From c865a7c418ded427d60a3e5f12f5909435b236ec Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Wed, 30 Jul 2014 04:57:38 +0200
Subject: STORM-2046: Changed: Defaulted snapshot panel to "extended" state.

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 7ebda3eea6..aaf12272f4 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -80,7 +80,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>AgentPause</key>
     <map>
-- 
cgit v1.2.3


From beb471287eb0dfad55866209bc294f628b58d658 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sat, 9 Aug 2014 02:21:17 +0200
Subject: STORM-2065: Added: 'Scanlines' filter, we now got a 'Video' one for
 that poorly recorded bright video style and one that looks like only
 scanlines were added.

---
 indra/newview/app_settings/filters/Scanlines.xml | 41 ++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 indra/newview/app_settings/filters/Scanlines.xml

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/filters/Scanlines.xml b/indra/newview/app_settings/filters/Scanlines.xml
new file mode 100644
index 0000000000..9f0c3ac318
--- /dev/null
+++ b/indra/newview/app_settings/filters/Scanlines.xml
@@ -0,0 +1,41 @@
+<llsd>
+    <array>
+        <array>
+            <string>linearize</string>
+            <real>0.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
+            <string>saturate</string>
+            <real>2.0</real>
+        </array>
+        <array>
+            <string>stencil</string>
+            <string>uniform</string>
+            <string>blend</string>
+            <real>0.0</real>
+            <real>0.5</real>
+        </array>
+        <array>
+            <string>screen</string>
+            <string>line</string>
+            <real>0.02</real>
+            <real>0.02</real>
+        </array>
+        <array>
+            <string>gamma</string>
+            <real>1.75</real>
+            <real>1.0</real>
+            <real>1.0</real>
+            <real>1.0</real>
+        </array>
+        <array>
+            <string>blur</string>
+        </array>
+        <array>
+            <string>blur</string>
+        </array>
+    </array>
+</llsd>
-- 
cgit v1.2.3


From afc6f271a67a8e012de86844be51d6de646f43f7 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sun, 10 Aug 2014 21:14:16 +0200
Subject: STORM-2064: Changed: 'Scanlines' filter to a original picture like
 look with scanlines.

---
 indra/newview/app_settings/filters/Scanlines.xml | 25 +++++++-----------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/filters/Scanlines.xml b/indra/newview/app_settings/filters/Scanlines.xml
index 9f0c3ac318..e9ba2889fa 100644
--- a/indra/newview/app_settings/filters/Scanlines.xml
+++ b/indra/newview/app_settings/filters/Scanlines.xml
@@ -7,26 +7,18 @@
             <real>1.0</real>
             <real>1.0</real>
         </array>
-        <array>
-            <string>saturate</string>
-            <real>2.0</real>
-        </array>
         <array>
             <string>stencil</string>
-            <string>uniform</string>
-            <string>blend</string>
+            <string>scanlines</string>
+            <string>add-back</string>
             <real>0.0</real>
-            <real>0.5</real>
-        </array>
-        <array>
-            <string>screen</string>
-            <string>line</string>
-            <real>0.02</real>
-            <real>0.02</real>
+            <real>1.0</real>
+            <real>0.015</real>
+            <real>0</real>
         </array>
         <array>
             <string>gamma</string>
-            <real>1.75</real>
+            <real>0.5</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
@@ -34,8 +26,5 @@
         <array>
             <string>blur</string>
         </array>
-        <array>
-            <string>blur</string>
-        </array>
     </array>
-</llsd>
+</llsd>
\ No newline at end of file
-- 
cgit v1.2.3


From 8b51aa1f646658669857638eb4050518f95b2fc2 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sun, 10 Aug 2014 21:16:22 +0200
Subject: Changed: 'Black and White' filter to proper b&w only. No corrections,
 just plain greyscale.

---
 indra/newview/app_settings/filters/BlackAndWhite.xml | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/filters/BlackAndWhite.xml b/indra/newview/app_settings/filters/BlackAndWhite.xml
index 101ed8233a..7894628d29 100644
--- a/indra/newview/app_settings/filters/BlackAndWhite.xml
+++ b/indra/newview/app_settings/filters/BlackAndWhite.xml
@@ -1,19 +1,5 @@
 <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>
-- 
cgit v1.2.3


From 31519b6fed053174a96413c5cfc763e55b059a9b Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Sun, 10 Aug 2014 21:16:44 +0200
Subject: Changed: 'Sepia' filter to proper sepia only. No corrections, just
 plain sepia colors.

---
 indra/newview/app_settings/filters/Sepia.xml | 25 -------------------------
 1 file changed, 25 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/filters/Sepia.xml b/indra/newview/app_settings/filters/Sepia.xml
index 3d577b2998..81d7caf0eb 100644
--- a/indra/newview/app_settings/filters/Sepia.xml
+++ b/indra/newview/app_settings/filters/Sepia.xml
@@ -1,30 +1,5 @@
 <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>stencil</string>
-            <string>vignette</string>
-            <string>fade</string>
-            <real>0.5</real>
-            <real>1.0</real>
-            <real>0.0</real>
-            <real>0.0</real>
-            <real>1.0</real>
-            <real>4.0</real>
-        </array>
         <array>
             <string>sepia</string>
         </array>
-- 
cgit v1.2.3


From 0d46af3d38eeeb295c0b12393668755871042661 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 15 Aug 2014 18:42:17 +0200
Subject: STORM-2064: Changed: Renamed 'Scanlines' filter to 'Video' and
 removed the old 'Video' one.

---
 indra/newview/app_settings/filters/Scanlines.xml | 30 ------------------------
 indra/newview/app_settings/filters/Video.xml     | 23 +++++++-----------
 2 files changed, 8 insertions(+), 45 deletions(-)
 delete mode 100644 indra/newview/app_settings/filters/Scanlines.xml

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/filters/Scanlines.xml b/indra/newview/app_settings/filters/Scanlines.xml
deleted file mode 100644
index e9ba2889fa..0000000000
--- a/indra/newview/app_settings/filters/Scanlines.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<llsd>
-    <array>
-        <array>
-            <string>linearize</string>
-            <real>0.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
-        <array>
-            <string>stencil</string>
-            <string>scanlines</string>
-            <string>add-back</string>
-            <real>0.0</real>
-            <real>1.0</real>
-            <real>0.015</real>
-            <real>0</real>
-        </array>
-        <array>
-            <string>gamma</string>
-            <real>0.5</real>
-            <real>1.0</real>
-            <real>1.0</real>
-            <real>1.0</real>
-        </array>
-        <array>
-            <string>blur</string>
-        </array>
-    </array>
-</llsd>
\ No newline at end of file
diff --git a/indra/newview/app_settings/filters/Video.xml b/indra/newview/app_settings/filters/Video.xml
index fe17f3950a..441a506d40 100755
--- a/indra/newview/app_settings/filters/Video.xml
+++ b/indra/newview/app_settings/filters/Video.xml
@@ -9,27 +9,23 @@
         </array>
         <array>
             <string>darken</string>
-            <real>0.15</real>
+            <real>0.05</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
         </array>
         <array>
             <string>stencil</string>
-            <string>uniform</string>
-            <string>add</string>
-            <real>0.0</real>
-            <real>0.5</real>
-        </array>
-        <array>
-            <string>screen</string>
-            <string>line</string>
-            <real>0.02</real>
+            <string>scanlines</string>
+            <string>add-back</string>
             <real>0.0</real>
+            <real>0.25</real>
+            <real>0.025</real>
+            <real>0</real>
         </array>
         <array>
             <string>gamma</string>
-            <real>0.25</real>
+            <real>0.0</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
@@ -37,8 +33,5 @@
         <array>
             <string>blur</string>
         </array>
-        <array>
-            <string>blur</string>
-        </array>
     </array>
-</llsd>
+</llsd>
\ No newline at end of file
-- 
cgit v1.2.3


From 2605ad9c01355ffc2b45b3d0ec74c4da451423f6 Mon Sep 17 00:00:00 2001
From: NiranV <NiranV.Dean@googlemail.com>
Date: Fri, 15 Aug 2014 21:25:31 +0200
Subject: STORM-2064: Changed: Reverted previous changes since Merov has
 clarified that it is intended behavior.

---
 indra/newview/app_settings/filters/Video.xml | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 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 441a506d40..fe17f3950a 100755
--- a/indra/newview/app_settings/filters/Video.xml
+++ b/indra/newview/app_settings/filters/Video.xml
@@ -9,23 +9,27 @@
         </array>
         <array>
             <string>darken</string>
-            <real>0.05</real>
+            <real>0.15</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
         </array>
         <array>
             <string>stencil</string>
-            <string>scanlines</string>
-            <string>add-back</string>
+            <string>uniform</string>
+            <string>add</string>
             <real>0.0</real>
-            <real>0.25</real>
-            <real>0.025</real>
-            <real>0</real>
+            <real>0.5</real>
         </array>
         <array>
-            <string>gamma</string>
+            <string>screen</string>
+            <string>line</string>
+            <real>0.02</real>
             <real>0.0</real>
+        </array>
+        <array>
+            <string>gamma</string>
+            <real>0.25</real>
             <real>1.0</real>
             <real>1.0</real>
             <real>1.0</real>
@@ -33,5 +37,8 @@
         <array>
             <string>blur</string>
         </array>
+        <array>
+            <string>blur</string>
+        </array>
     </array>
-</llsd>
\ No newline at end of file
+</llsd>
-- 
cgit v1.2.3