livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linux; Update CEF.

master
Nicky 2021-09-12 01:24:08 +02:00
parent 9ae0f9c857
commit 035befac70
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autobuild.xml
View File

@ -850,9 +850,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>2b29e6435ea9487bc2019a28b8287d6a</string>
<string>c183575032398b5750d41b69f1b875ff</string>
<key>url</key>
<string>http://3p.firestormviewer.org/dullahan-1.8.0.202011061705_81.3.10_gb223419_chromium-81.0.4044.138-linux64-203111605.tar.bz2</string>
<string>http://3p.firestormviewer.org/dullahan-1.12.2.202109112139_91.1.23_g04c8d56_chromium-91.0.4472.164-linux64-212541938.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>

2
indra/media_plugins/cef/media_plugin_cef.cpp
View File

@ -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

14
indra/newview/viewer_manifest.py
View File

@ -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')):