diff options
| author | Callum Prentice <callum@mbp.local> | 2021-08-10 11:08:45 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@mbp.local> | 2021-08-10 11:08:45 -0700 |
| commit | 3a3296f371508c4a31a37053242ee69a574f22f0 (patch) | |
| tree | 83ee018b210d05258fd0ab6a491def74aa29cdfd /indra/newview/app_settings | |
| parent | 0c3b78105d49185f37eff60d9c167d17e6072fc8 (diff) | |
| parent | c40b8310b00f1d620a2f5a94f2514c8bf3531373 (diff) | |
Merge branch 'master' into DRTVWR-519 after Viewer release
Diffstat (limited to 'indra/newview/app_settings')
| -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 e2847fcae9..b37b280f6e 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2109,17 +2109,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> |