diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-08-31 11:51:38 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-08-31 11:51:38 -0700 |
| commit | 2154bccdc4ef79bc2d593daad85d1344e9177bcf (patch) | |
| tree | df202d7f19616648be5680ff145fd281c5d21f69 /indra/newview/llviewermedia.cpp | |
| parent | e62a4d4ec151e81f4dc68b29a009596d3d154d57 (diff) | |
| parent | 09394d3a9d72c701fe28c54d7c76d71ddf3ef765 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 384f7cd61d..31b22119cb 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1776,6 +1776,7 @@ void LLViewerMediaImpl::createMediaSource() LL_WARNS("Media") << "Failed to initialize media for mime type " << mMimeType << LL_ENDL; } } + } ////////////////////////////////////////////////////////////////////////////////////////// @@ -1880,7 +1881,10 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ // collect 'javascript enabled' setting from prefs and send to embedded browser bool javascript_enabled = gSavedSettings.getBOOL( "BrowserJavascriptEnabled" ); media_source->setJavascriptEnabled( javascript_enabled ); - + + bool media_plugin_debugging_enabled = gSavedSettings.getBOOL("MediaPluginDebugging"); + media_source->enableMediaPluginDebugging( media_plugin_debugging_enabled ); + media_source->setTarget(target); const std::string plugin_dir = gDirUtilp->getLLPluginDir(); |