diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-08-10 06:27:44 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-08-10 06:27:44 +0300 |
commit | 12836d5f9154ea9c76fd5e74bc4460af4691ae89 (patch) | |
tree | 040166c69e00fd1be532a0dc13a7e001bb61da67 /indra/newview/app_settings | |
parent | 08e31fc6423e0536fbeb780cd22506de53beb32a (diff) | |
parent | c40b8310b00f1d620a2f5a94f2514c8bf3531373 (diff) |
Merge remote-tracking branch 'origin/master' into DRTVWR-521-maint
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 1c6fcca0cf..96d8a548c8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -2076,17 +2076,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> |