diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-05-14 15:21:06 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-05-14 15:21:06 -0700 |
| commit | c705126d0be0b6a60d0e8e23bf8919e08e0db967 (patch) | |
| tree | 6e5a7e2010f0405efe657a93896d62e640f928e4 /indra/newview/llviewermedia.cpp | |
| parent | e41412eddaa5e8fcc808018aadc844dd68c6c247 (diff) | |
Fixes SL-14897 Disable Flash support in the embedded browser
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 9ed2df2759..9a1403f892 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1744,10 +1744,6 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ bool cookies_enabled = gSavedSettings.getBOOL( "CookiesEnabled" ); media_source->cookies_enabled( cookies_enabled || clean_browser); - // collect 'plugins enabled' setting from prefs and send to embedded browser - bool plugins_enabled = gSavedSettings.getBOOL( "BrowserPluginsEnabled" ); - media_source->setPluginsEnabled( plugins_enabled || clean_browser); - // collect 'javascript enabled' setting from prefs and send to embedded browser bool javascript_enabled = gSavedSettings.getBOOL( "BrowserJavascriptEnabled" ); media_source->setJavascriptEnabled( javascript_enabled || clean_browser); |