From e4a9704d4157151442accca1116ad70f7f63ae95 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Fri, 13 May 2011 17:08:43 -0700
Subject: EXP-676 FIX As a web developer, I want to access information about
 the current state of the SL client, such as avatar location

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e6c2dc4413..8ecfccf727 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -708,6 +708,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>BrowserEnableJSObject</key>
+    <map>
+      <key>Comment</key>
+      <string>Enable or disable the viewer to Javascript bridge object.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>BlockAvatarAppearanceMessages</key>
         <map>
         <key>Comment</key>
-- 
cgit v1.2.3


From d034bdcae74225af23ae29fbe9ba4a78ac7de5a7 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Fri, 3 Jun 2011 10:59:26 -0700
Subject:  (EXP-871) FIX Add a WARNING to comment for BrowserEnableJSObject and
 set to no persist between sessions

---
 indra/newview/app_settings/settings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index cf5f522519..fc7fd2dd8a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -711,9 +711,9 @@
     <key>BrowserEnableJSObject</key>
     <map>
       <key>Comment</key>
-      <string>Enable or disable the viewer to Javascript bridge object.</string>
+      <string>(WARNING: Advanced feature. Use if you are aware of the implications). Enable or disable the viewer to Javascript bridge object.</string>
       <key>Persist</key>
-      <integer>1</integer>
+      <integer>0</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-- 
cgit v1.2.3