From f60314f22758daa22d096f2166367258d761d8b4 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Sat, 24 Oct 2009 07:58:31 +0800
Subject: EXT-1305    Hook up Script Error preferences -- reviewed by james

---
 indra/newview/app_settings/settings.xml | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 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 eb045349c2..3682d48577 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7340,17 +7340,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>ScriptErrorsAsChat</key>
-    <map>
-      <key>Comment</key>
-      <string>Display script errors and warning in chat history</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>ScriptHelpFollowsCursor</key>
     <map>
       <key>Comment</key>
@@ -7664,6 +7653,28 @@
       <string>Boolean</string>
       <key>Value</key>
       <integer>1</integer>   
+    </map>
+	<key>ShowScriptErrors</key>
+    <map>
+      <key>Comment</key>
+      <string>Show script errors</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+	<key>ShowScriptErrorsLocation</key>
+    <map>
+      <key>Comment</key>
+      <string>Show script error in chat or window</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>S32</string>
+      <key>Value</key>
+      <integer>0</integer>
     </map>
     <key>ShowSnapshotButton</key>                
     <map>
-- 
cgit v1.2.3


From 830fa3ebccebea67758b299c5f490d57705bf8c3 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Tue, 27 Oct 2009 18:06:43 +0800
Subject: disable media title to make it read only at all time

---
 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 3682d48577..718efa9dcb 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -76,7 +76,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>AnimateTextures</key>
     <map>
-- 
cgit v1.2.3


From 13184abdc3b7ed1801dc7e0b82b2b618c080047f Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Tue, 27 Oct 2009 18:32:55 +0800
Subject: EXT-760 Move Tap tap hold to run to Preferences > Advanced , and make
 the default to false

---
 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 718efa9dcb..3682d48577 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -76,7 +76,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>AnimateTextures</key>
     <map>
-- 
cgit v1.2.3