diff --git a/autobuild.xml b/autobuild.xml
index 4c52a6199b..9547191046 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -833,26 +833,14 @@
name
darwin64
- linux
-
linux64
archive
hash
- 48d316c0ceb898f7577015df75b6d303
+ 9efa40655f23bc9875e96d04a63f37bf
url
- http://downloads.phoenixviewer.com/dullahan-1.1.1320_3.3626.1895.g7001d56-linux64-191221910.tar.bz2
+ http://downloads.phoenixviewer.com/dullahan-1.6.4.202005061828_81.3.1_gb2b49f1_chromium-81.0.4044.113-linux64-201281557.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 f75d57bf91..3738341bae 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -41,6 +41,7 @@
#include
#include "dullahan.h"
+#include "dullahan_version.h"
////////////////////////////////////////////////////////////////////////////////
//
@@ -509,7 +510,9 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
settings.background_color = 0xffffffff;
settings.cache_enabled = true;
settings.cache_path = mCachePath;
+#if (DULLAHAN_VERSION_MAJOR*100+DULLAHAN_VERSION_MINOR) < 106
settings.cookie_store_path = mCookiePath;
+#endif
settings.cookies_enabled = mCookiesEnabled;
settings.disable_gpu = mDisableGPU;
settings.flash_enabled = mPluginsEnabled;
@@ -664,8 +667,10 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
else if (message_name == "scroll_event")
{
// Mouse coordinates for cef to be able to scroll 'containers'
- //S32 x = message_in.getValueS32("x");
- //S32 y = message_in.getValueS32("y");
+#if (DULLAHAN_VERSION_MAJOR*100+DULLAHAN_VERSION_MINOR) >= 106
+ S32 x = message_in.getValueS32("x");
+ S32 y = message_in.getValueS32("y");
+#endif
// Wheel's clicks
S32 delta_x = message_in.getValueS32("clicks_x");
S32 delta_y = message_in.getValueS32("clicks_y");
@@ -673,8 +678,11 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
delta_x *= -scaling_factor;
delta_y *= -scaling_factor;
- // mCEFLib->mouseWheel(x, y, delta_x, delta_y);
+#if (DULLAHAN_VERSION_MAJOR*100+DULLAHAN_VERSION_MINOR) >= 106
+ mCEFLib->mouseWheel(x, y, delta_x, delta_y);
+#else
mCEFLib->mouseWheel(delta_x, delta_y);
+#endif
}
else if (message_name == "text_event")
{
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 10e6207056..29035a7adc 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -144,6 +144,7 @@
#include "llexception.h"
//#if !LL_LINUX
#include "cef/dullahan.h"
+#include "cef/dullahan_version.h"
#include "vlc/libvlc_version.h"
//#endif // LL_LINUX
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index b3e07abc07..6646237766 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1892,7 +1892,11 @@ class LinuxManifest(ViewerManifest):
with self.prefix(src=os.path.join(pkgdir, 'bin', 'release'), dst="bin"):
self.path( "chrome-sandbox" )
self.path( "dullahan_host" )
- self.path( "natives_blob.bin" )
+ self.fs_try_path( "natives_blob.bin" )
+ self.path( "snapshot_blob.bin" )
+ self.path( "v8_context_snapshot.bin" )
+ with self.prefix(src=os.path.join(pkgdir, 'bin', 'release'), dst="lib"):
+ self.fs_try_path( "natives_blob.bin" )
self.path( "snapshot_blob.bin" )
self.path( "v8_context_snapshot.bin" )
@@ -1903,6 +1907,13 @@ class LinuxManifest(ViewerManifest):
self.path( "cef_200_percent.pak" )
self.path( "devtools_resources.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( "icudtl.dat" )
with self.prefix(src=os.path.join(pkgdir, 'resources', 'locales'), dst=os.path.join('bin', 'locales')):
self.path("am.pak")