diff options
| author | Anchor <none@none> | 2019-03-19 14:31:38 -0700 |
|---|---|---|
| committer | Anchor <none@none> | 2019-03-19 14:31:38 -0700 |
| commit | 83fe55c429181a2adb67346db79becf00d501536 (patch) | |
| tree | b56ed860cb6aa9066a35867f41b2e2ff2b4c18d8 | |
| parent | 2cd1a22587b26e7b034e3100ebf46f244d576bff (diff) | |
| parent | 72f21b399e5a07ee162116f677e643b21e54d7bb (diff) | |
Merge from viewer-release-cve-2019-5786
| -rw-r--r-- | autobuild.xml | 14 | ||||
| -rw-r--r-- | indra/media_plugins/cef/media_plugin_cef.cpp | 1 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/autobuild.xml b/autobuild.xml index 9b7ff39334..5f072512c1 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ <key>archive</key> <map> <key>hash</key> - <string>118987b1a5b56214cfdbd0c763e180da</string> + <string>23aeaf23e7db2484a1850017141860dd</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15127/97748/dullahan-1.1.1080_3.3325.1750.gaabe4c4-darwin64-513449.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>2ecc71350b30a1057091b9cd7af18b1c</string> + <string>71fa66203326aca918796e874976c080</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15128/97755/dullahan-1.1.1080_3.3325.1750.gaabe4c4-windows-513449.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>2ed3e49388514dafb907c59a209d580e</string> + <string>c7162e4805f50a3609f5dc63d0cf2bc0</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15129/97760/dullahan-1.1.1080_3.3325.1750.gaabe4c4-windows64-513449.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.1080_3.3325.1750.gaabe4c4</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); 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, |