From c2ff5a28789a6343b445d48373c84096085303f7 Mon Sep 17 00:00:00 2001
From: callum_linden <callum@lindenlab.com>
Date: Fri, 8 Mar 2019 21:29:32 -0800
Subject: Runtime files required by CEF changed in this version of CEF. We add
 them to the cef-bin and dullahan 3p packages but they were not copied to the
 right place - now they are

---
 indra/newview/viewer_manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c0f642c852..fcb97ded8f 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -635,7 +635,7 @@ class WindowsManifest(ViewerManifest):
                 self.path("dullahan_host.exe")
                 self.path("natives_blob.bin")
                 self.path("snapshot_blob.bin")
-                self.path("widevinecdmadapter.dll")
+                self.path("v8_context_snapshot.bin")
 
             # MSVC DLLs needed for CEF and have to be in same directory as plugin
             with self.prefix(src=os.path.join(self.args['build'], os.pardir,
-- 
cgit v1.3


From 72f21b399e5a07ee162116f677e643b21e54d7bb Mon Sep 17 00:00:00 2001
From: "callum@gmail.com" <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

---
 autobuild.xml                                | 14 +++++++-------
 indra/media_plugins/cef/media_plugin_cef.cpp |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'indra')

diff --git a/autobuild.xml b/autobuild.xml
index 5b84256ab8..5f072512c1 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -580,9 +580,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>29973c47ad65c18e9c45b5e95e8d3364</string>
+              <string>23aeaf23e7db2484a1850017141860dd</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33962/282718/dullahan-1.1.1313_3.3626.1895.g7001d56-darwin64-525319.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34069/283470/dullahan-1.1.1320_3.3626.1895.g7001d56-darwin64-525361.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -592,9 +592,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>239dc2288ab12ccfdee6c0eb91539f49</string>
+              <string>71fa66203326aca918796e874976c080</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33964/282730/dullahan-1.1.1313_3.3626.1895.g7001d56-windows-525319.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34070/283477/dullahan-1.1.1320_3.3626.1895.g7001d56-windows-525361.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -604,16 +604,16 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>c86a97fa3de24057575e8942c402e720</string>
+              <string>c7162e4805f50a3609f5dc63d0cf2bc0</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/33963/282731/dullahan-1.1.1313_3.3626.1895.g7001d56-windows64-525319.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34071/283480/dullahan-1.1.1320_3.3626.1895.g7001d56-windows64-525361.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>1.1.1313_3.3626.1895.g7001d56</string>
+        <string>1.1.1320_3.3626.1895.g7001d56</string>
       </map>
       <key>elfio</key>
       <map>
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<std::string> custom_schemes(1, "secondlife");
 				mCEFLib->setCustomSchemes(custom_schemes);
-- 
cgit v1.3