diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-08-10 06:43:37 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-08-10 06:43:37 +0300 |
| commit | 3f501ec2d0eea9c332531bdd2586145adf66a91e (patch) | |
| tree | 3bf3abd7e246fb9e5f221c27031e88bc0bc0153d /indra/newview/app_settings/settings.xml | |
| parent | e7821f1b4df1b88d84bf3ac1573c5c2518e4a57e (diff) | |
| parent | c40b8310b00f1d620a2f5a94f2514c8bf3531373 (diff) | |
Merge branch 'master' into DRTVWR-522-maint
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 25e69f1d49..898c5a5273 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2077,17 +2077,6 @@ <key>Value</key> <integer>1</integer> </map> - <key>BrowserPluginsEnabled</key> - <map> - <key>Comment</key> - <string>Enable Web plugins in the built-in Web browser?</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>1</integer> - </map> <key>ChatBarCustomWidth</key> <map> <key>Comment</key> |