diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-04 07:50:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-04 07:50:12 -0400 |
| commit | 2c9a914d7d45b056c845f5b7dba6713ff5c597ae (patch) | |
| tree | f51dc1ff803a43e980c574d556076eed8717e161 /indra/newview/app_settings | |
| parent | 19250ff490eba3ef5e713e10eed4243150691f25 (diff) | |
| parent | d034bdcae74225af23ae29fbe9ba4a78ac7de5a7 (diff) | |
merge changes for storm-1318
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index eb6c77971b..fc7fd2dd8a 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>(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>0</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>BlockAvatarAppearanceMessages</key> <map> <key>Comment</key> |