diff options
| author | Richard Linden <none@none> | 2011-05-25 18:14:55 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-25 18:14:55 -0700 |
| commit | 2595d53ded032964623007fa957510d5f1570e29 (patch) | |
| tree | 02b24547a3ca408298b58373f106bb9862fea4be /indra/newview/app_settings | |
| parent | fda331bb801918aab3eb5b7026f7e868eca248a2 (diff) | |
| parent | 55a9991812a1f58774fe9b885f588dafcb52d2af (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 78db307d64..33ecfd3afc 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> |