1 files changed, 89 insertions, 12 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 916abcb..91ed5c2 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2782,6 +2782,39 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>BrowserCookiesEnabled</key>
+  <map>
+    <key>Comment</key>
+    <string>Accept cookies from Web sites?</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>BrowserJavascriptEnabled</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable Javascript in the built-in Web browser?</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>BrowserPluginsEnabled</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable Web plugins in the built-in Web browser?</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>BrowserProxyAddress</key>
   <map>
     <key>Comment</key>
@@ -4187,17 +4220,6 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-  <key>CookiesEnabled</key>
-  <map>
-    <key>Comment</key>
-    <string>Accept cookies from Web sites?</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
   <key>CreateToolCopyCenters</key>
   <map>
     <key>Comment</key>
@@ -4297,6 +4319,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>DebugPluginDisableTimeout</key>
+  <map>
+    <key>Comment</key>
+    <string>Disable the code which watches for plugins that are crashed or hung</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>DebugShowColor</key>
   <map>
     <key>Comment</key>
@@ -7786,7 +7819,40 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>MemoryLogFrequency</key>
+  <key>MediaControlFadeTime</key>
+  <map>
+    <key>Comment</key>
+    <string>Amount of time (in seconds) that the media control fades</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>1.5</real>
+  </map>
+  <key>MediaControlTimeout</key>
+  <map>
+    <key>Comment</key>
+    <string>Amount of time (in seconds) for media controls to fade with no mouse activity</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>3.0</real>
+  </map>
+  <key>MediaOnAPrimUI</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether or not to show the "link sharing" UI</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>MemoryLogFrequency</key>
         <map>
         <key>Comment</key>
             <string>Seconds between display of Memory in log (0 for never)</string>
@@ -8553,6 +8619,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>PluginAttachDebuggerToPlugins</key>
+    <map>
+      <key>Comment</key>
+      <string>If true, attach a debugger session to each plugin process as it's launched.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>PrecachingDelay</key>
     <map>
       <key>Comment</key>