diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-10-13 21:56:36 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-10-13 21:56:36 +0000 |
| commit | 0fa3d7705fb6a42410d1578b1fab5b7952a59e7c (patch) | |
| tree | 72c71a57659a7068f291426cb5235cb68d3436c9 /indra/newview/llviewermedia.cpp | |
| parent | 492ea7c3a03d5ef0d3679b873a44c08baaced0f1 (diff) | |
| parent | e989b79dae7b7128c6ce4580b6731dcd3347b94e (diff) | |
Merged in DV528-merge-6.4.24 (pull request #729)
DRTVWR-528 merge up to v 6.4.24
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 73d0a83a0d..d35dbda907 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1745,14 +1745,14 @@ 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); + // As of SL-15559 PDF files do not load in CEF v91 we enable plugins + // but explicitly disable Flash (PDF support in CEF is now treated as a plugin) + media_source->setPluginsEnabled(true); + bool media_plugin_debugging_enabled = gSavedSettings.getBOOL("MediaPluginDebugging"); media_source->enableMediaPluginDebugging( media_plugin_debugging_enabled || clean_browser); |