From fa9d0e4a6c04cc3d6c76588099ccc36c7bfdbdd5 Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Tue, 25 May 2010 11:05:58 +0300
Subject: EXT-6685 FIXED Enabled by default option of logging script errors
 into separate window. reviewed by Mike Antipov at
 https://codereview.productengine.com/secondlife/r/429/

--HG--
branch : product-engine
---
 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 418032c554..6d8f417921 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8171,7 +8171,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>ShowObjectRenderingCost</key>                
     <map>
-- 
cgit v1.2.3


From 4bd0291dffdb4f17f70705f7465ccbdbf6da8a93 Mon Sep 17 00:00:00 2001
From: Callum Prentice <callum@lindenlab.com>
Date: Tue, 25 May 2010 16:06:40 -0700
Subject: Merge

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml
index d7bb64ce8a..16e39fc1c4 100644
--- a/indra/newview/app_settings/logcontrol.xml
+++ b/indra/newview/app_settings/logcontrol.xml
@@ -25,6 +25,7 @@
 							<string>AppCache</string>
 							<string>Window</string>
 							<string>RenderInit</string>
+							<string>MediaAuth</string>
 						</array>
 				</map>
 				<map>
-- 
cgit v1.2.3