From 72f21b399e5a07ee162116f677e643b21e54d7bb Mon Sep 17 00:00:00 2001 From: "callum@gmail.com" Date: Mon, 18 Mar 2019 15:36:16 -0700 Subject: Pull in a change to Dullahan that allows user to specify flag that lets video/audio autoplay like it did before Chrome 70? (Dullahan v1.1.1320). Also sets a flag in media plugin CEF code to change the settings from false (default) to true --- indra/media_plugins/cef/media_plugin_cef.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra') diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 2bd5526a86..66b316df90 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -519,6 +519,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string) settings.webgl_enabled = true; settings.log_file = mCefLogFile; settings.log_verbose = mCefLogVerbose; + settings.autoplay_without_gesture = true; std::vector custom_schemes(1, "secondlife"); mCEFLib->setCustomSchemes(custom_schemes); -- cgit v1.2.3 From ee39ebd523455a32234cf3d362ca96ebdcd4d86b Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Wed, 20 Mar 2019 19:40:14 +0200 Subject: Backed out changeset: 29f763ea2f9b The fix caused SL-10357 --- indra/newview/pipeline.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 7be5c86679..e8c9909f8c 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -2514,8 +2514,8 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl LLSpatialPartition* part = region->getSpatialPartition(i); if (part) { - if (LLViewerRegion::PARTITION_BRIDGE == i || hasRenderType(part->mDrawableType)) - { //pass PARTITION BRIDGE because LLDrawable can be moved to this partition + if (hasRenderType(part->mDrawableType)) + { part->cull(camera); } } -- cgit v1.2.3 From 5cf18cb867be567bf921f0b94a78fd822e4112ad Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 2 Apr 2019 14:34:12 -0400 Subject: increment viewer version to 6.1.2 --- indra/newview/VIEWER_VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index f3b5af39e4..5e3254243a 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -6.1.1 +6.1.2 -- cgit v1.2.3