diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-07 15:52:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-07 15:52:35 -0400 |
| commit | 58e8ee5f9169818894f34bf1bfdd4efe46482e37 (patch) | |
| tree | a245dd8f468343c9a1ddd57fe1a3156338846f93 /indra/newview/app_settings | |
| parent | 4ebfc47e40692b16a057321a9c8b6f28e1601cdd (diff) | |
| parent | 3311b1bffc8d14f2d5b1ab0d0fbe91b04ee17df8 (diff) | |
merge latest builds from project integration repo
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 199ce9c30d..505f3ed767 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> |