diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-07-12 12:50:34 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-07-12 12:50:34 -0700 |
| commit | 3602d64a09fb068129cccd4f7993c0d658cc4669 (patch) | |
| tree | 4ecae7d0d80ee749df7ca7e28a77a5368e64584d /indra/newview/llviewermedia.cpp | |
| parent | 7ff743a13856d1e883baaa8294480d9973bfedfb (diff) | |
Fix for SL-15559 PDF files do not load in CEF v91
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 9a1403f892..556c12bafa 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1748,6 +1748,10 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ 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); |