diff options
author | Kent Quirk <q@lindenlab.com> | 2010-03-19 15:36:00 -0400 |
---|---|---|
committer | Kent Quirk <q@lindenlab.com> | 2010-03-19 15:36:00 -0400 |
commit | e25b39b94bf013b30bb81c8c2d2934ec17e0f77b (patch) | |
tree | 994527bfcf7f509f6dd00d43d00d636d45283300 /indra/newview/app_settings | |
parent | 4a90be79caae5f1aff029c4e14f520cf709cb31f (diff) | |
parent | 53cf87ba50d5adaee79be3dfafb0f7809f24a809 (diff) |
Merge
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 97c8cbfa7b..9f474a39bc 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1563,6 +1563,28 @@ <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>CreateToolCopyCenters</key> <map> <key>Comment</key> |