diff --git a/autobuild.xml b/autobuild.xml index 0ca1a1b966..deffea3ec5 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -850,9 +850,9 @@ archive hash - 71fa66203326aca918796e874976c080 + 43c03679c3847754b407532efe5d4392 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34070/283477/dullahan-1.1.1320_3.3626.1895.g7001d56-windows-525361.tar.bz2 + http://downloads.phoenixviewer.com/dullahan-1.7.0.202005292352_81.3.10_gb223419_chromium-81.0.4044.138-windows-201512310.tar.bz2 name windows @@ -862,9 +862,9 @@ archive hash - c7162e4805f50a3609f5dc63d0cf2bc0 + 13574736220c05de847980f851f42827 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34071/283480/dullahan-1.1.1320_3.3626.1895.g7001d56-windows64-525361.tar.bz2 + http://downloads.phoenixviewer.com/dullahan-1.7.0.202005292352_81.3.10_gb223419_chromium-81.0.4044.138-windows64-201512301.tar.bz2 name windows64 diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 900fe7974b..ee8f72daf1 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -516,7 +516,13 @@ void MediaPluginCEF::receiveMessage(const char* message_string) settings.flip_mouse_y = false; settings.flip_pixels_y = true; settings.frame_rate = 60; - settings.force_wave_audio = true; + + // With the latest CEF this does more worse than good. It will allow the viewer to control the audio level (apparently); But it will also break a lot of sites (among then twitch, netflix, spotify). + // Right now with the choice between lots of broken sites or volumes for me it's rather the sites being usable. + // settings.force_wave_audio = true; + settings.force_wave_audio = false; + // + settings.initial_height = 1024; settings.initial_width = 1024; settings.java_enabled = false; diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 73d182862c..3294b9e1bf 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -690,13 +690,13 @@ class WindowsManifest(ViewerManifest): config = 'debug' if self.args['configuration'].lower() == 'debug' else 'release' with self.prefix(src=os.path.join(pkgdir, 'bin', config)): self.path("chrome_elf.dll") - self.path("d3dcompiler_43.dll") + self.fs_try_path("d3dcompiler_43.dll") # d3dcompiler_43.dll was removed in the latest cef versions self.path("d3dcompiler_47.dll") self.path("libcef.dll") self.path("libEGL.dll") self.path("libGLESv2.dll") self.path("dullahan_host.exe") - self.path("natives_blob.bin") + self.fs_try_path("natives_blob.bin") # natives_blob.bin was removed in the latest cef versions self.path("snapshot_blob.bin") self.path("v8_context_snapshot.bin")