From cfc5236e643618822e66bfc77dc912036bcb57cb Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Wed, 18 Jul 2012 15:49:47 -0500
Subject: MAINT-628 Fix for seams in high res snapshots when lighting and
 shadows is enabled.

---
 indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl | 1 -
 1 file changed, 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl b/indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
index e02a7b405b..2cef8f2a5d 100644
--- a/indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
+++ b/indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
@@ -2093,7 +2093,6 @@ uniform sampler2D diffuseMap;
 uniform vec2 rcp_screen_res;
 uniform vec4 rcp_frame_opt;
 uniform vec4 rcp_frame_opt2;
-uniform vec2 screen_res;
 VARYING vec2 vary_fragcoord;
 VARYING vec2 vary_tc;
 
-- 
cgit v1.2.3


From 5d32e23a11f272a2cdf8b6aac106534b6814ea98 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 12 Jul 2012 22:35:51 -0700
Subject: SH-3275 WIP Run viewer metrics for object update messages improved
 update logging API and output format

---
 indra/newview/app_settings/logcontrol.xml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index 64122bbb6c..8636ba1090 100644
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -48,6 +48,24 @@
 						-->
 						</array>
 				</map>
-			</array>
+        <map>
+          <key>level</key>
+          <string>NONE</string>
+          <key>functions</key>
+          <array>
+          </array>
+          <key>classes</key>
+          <array>
+            <string>LLViewerStatsRecorder</string>
+          </array>
+          <key>files</key>
+          <array>
+          </array>
+          <key>tags</key>
+          <array>
+
+          </array>
+        </map>
+      </array>
 	</map>
 </llsd>
-- 
cgit v1.2.3


From 5564fcb271d993b1b8a98fae7f832f47f1236fd4 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 16 Jul 2012 19:15:46 -0700
Subject: SH-3275 WIP Run viewer metrics for object update messages clean up of
 llstats stuff

---
 indra/newview/app_settings/logcontrol.xml | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index 8636ba1090..92a241857e 100644
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -48,24 +48,6 @@
 						-->
 						</array>
 				</map>
-        <map>
-          <key>level</key>
-          <string>NONE</string>
-          <key>functions</key>
-          <array>
-          </array>
-          <key>classes</key>
-          <array>
-            <string>LLViewerStatsRecorder</string>
-          </array>
-          <key>files</key>
-          <array>
-          </array>
-          <key>tags</key>
-          <array>
-
-          </array>
-        </map>
       </array>
 	</map>
 </llsd>
-- 
cgit v1.2.3


From eb9f84be17d28d7c41d24376261fa3c085331e15 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 8 Aug 2012 15:28:05 +0300
Subject: MAINT-44 FIXED Change value for MiniMapAutoCenter in settings.xml to
 persist after restart

---
 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 9e2c529eb3..f896b1ec64 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -5168,7 +5168,7 @@
       <key>Comment</key>
       <string>Center the focal point of the minimap.</string>
       <key>Persist</key>
-      <integer>0</integer>
+      <integer>1</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-- 
cgit v1.2.3