diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-06 11:40:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-06 11:40:10 -0400 |
| commit | 336d3c15c426f1f29b85ed67d8fe5db93c2cc148 (patch) | |
| tree | 0904f442600a14d0569668663df61ecf7ac067a8 /indra/newview/app_settings | |
| parent | bbc1283848e01bfd5284293d044eec53cde10d0e (diff) | |
| parent | 7a7c6860e523a53285acda408d7798ffcd892778 (diff) | |
merge changes for viewer-development
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 3db2259c62..72edbb379f 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> |