diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-07 13:42:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-07 13:42:46 -0400 |
| commit | 3311b1bffc8d14f2d5b1ab0d0fbe91b04ee17df8 (patch) | |
| tree | beff520bbdca9f7a8aeeb7d4fc21b4a16b8b510c /indra/newview/app_settings | |
| parent | 88407a0f0c19f1ee36c176f2fdc2117646d65b80 (diff) | |
| parent | bde49506e5b1a854f832f6f47781eac35853b1a0 (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> |