diff --git a/autobuild.xml b/autobuild.xml index f14d924f1c..45a139ee7f 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -850,9 +850,9 @@ archive hash - 2b29e6435ea9487bc2019a28b8287d6a + c183575032398b5750d41b69f1b875ff url - http://3p.firestormviewer.org/dullahan-1.8.0.202011061705_81.3.10_gb223419_chromium-81.0.4044.138-linux64-203111605.tar.bz2 + http://3p.firestormviewer.org/dullahan-1.12.2.202109112139_91.1.23_g04c8d56_chromium-91.0.4472.164-linux64-212541938.tar.bz2 name linux64 diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index bbd3c85ec1..647e3dec38 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -533,9 +533,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string) mCEFLib->setOnCursorChangedCallback(std::bind(&MediaPluginCEF::onCursorChangedCallback, this, std::placeholders::_1)); mCEFLib->setOnRequestExitCallback(std::bind(&MediaPluginCEF::onRequestExitCallback, this)); mCEFLib->setOnJSDialogCallback(std::bind(&MediaPluginCEF::onJSDialogCallback, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); -#ifndef LL_LINUX mCEFLib->setOnJSBeforeUnloadCallback(std::bind(&MediaPluginCEF::onJSBeforeUnloadCallback, this)); -#endif dullahan::dullahan_settings settings; #if LL_WINDOWS diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 0bb50ace7a..bbdf6007f6 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1917,18 +1917,12 @@ class LinuxManifest(ViewerManifest): self.path( "v8_context_snapshot.bin" ) with self.prefix(src=os.path.join(pkgdir, 'resources'), dst="bin"): - self.path( "cef.pak" ) - self.path( "cef_extensions.pak" ) - self.path( "cef_100_percent.pak" ) - self.path( "cef_200_percent.pak" ) - self.path( "devtools_resources.pak" ) + self.path( "chrome_100_percent.pak" ) + self.path( "chrome_200_percent.pak" ) self.path( "icudtl.dat" ) with self.prefix(src=os.path.join(pkgdir, 'resources'), dst="lib"): - self.path( "cef.pak" ) - self.path( "cef_extensions.pak" ) - self.path( "cef_100_percent.pak" ) - self.path( "cef_200_percent.pak" ) - self.path( "devtools_resources.pak" ) + self.path( "chrome_100_percent.pak" ) + self.path( "chrome_200_percent.pak" ) self.path( "icudtl.dat" ) with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst=os.path.join('bin', 'locales')):