diff options
| author | Richard Linden <none@none> | 2011-06-02 13:35:15 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-06-02 13:35:15 -0700 |
| commit | 960e8c05cb4fbda322d262ee20e85e568089732c (patch) | |
| tree | 8b8a2657e41f85c3c3e62752458e467b9761467c /indra/newview/app_settings | |
| parent | 361384ebb9f41dbccbaab779a085edb773f0a734 (diff) | |
| parent | b530648dd4c5fbf9e566401b4262865047de2e4a (diff) | |
Automated merge with http://hg.secondlife.com/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 eb6c77971b..cf5f522519 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>Enable or disable the viewer to Javascript bridge object.</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>BlockAvatarAppearanceMessages</key> <map> <key>Comment</key> |