diff options
| -rw-r--r-- | autobuild.xml | 10 | ||||
| -rw-r--r-- | indra/media_plugins/cef/media_plugin_cef.cpp | 12 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 6 |
3 files changed, 22 insertions, 6 deletions
diff --git a/autobuild.xml b/autobuild.xml index f7edff294f..5842062378 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -592,9 +592,9 @@ <key>archive</key> <map> <key>hash</key> - <string>515950c911a53ff910b18c7c417ea984</string> + <string>6cb70830d145147a3286aaa80b09a21e</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/72460/699870/dullahan-1.7.0.202011161603_81.3.10_gb223419_chromium-81.0.4044.138-windows-552313.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77816/736910/dullahan-1.10.0.202103031657_89.0.5_gc1f90d8_chromium-89.0.4389.40-windows-556509.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -604,16 +604,16 @@ <key>archive</key> <map> <key>hash</key> - <string>f1dccbdfe0603f488eeee4c8f518c959</string> + <string>68429cb4095468255737e78d1d4a0a5e</string> <key>url</key> - <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/72459/699874/dullahan-1.7.0.202011161603_81.3.10_gb223419_chromium-81.0.4044.138-windows64-552313.tar.bz2</string> + <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/77815/736914/dullahan-1.10.0.202103031657_89.0.5_gc1f90d8_chromium-89.0.4389.40-windows64-556509.tar.bz2</string> </map> <key>name</key> <string>windows64</string> </map> </map> <key>version</key> - <string>1.7.0.202011161603_81.3.10_gb223419_chromium-81.0.4044.138</string> + <string>1.10.0.202103031657_89.0.5_gc1f90d8_chromium-89.0.4389.40</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 0bb62d79ff..c658f35480 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -525,8 +525,18 @@ void MediaPluginCEF::receiveMessage(const char* message_string) mCEFLib->setOnJSDialogCallback(std::bind(&MediaPluginCEF::onJSDialogCallback, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); dullahan::dullahan_settings settings; +#if LL_WINDOWS + // As of CEF version 83+, for Windows versions, we need to tell CEF + // where the host helper process is since this DLL is not in the same + // dir as the executable that loaded it (SLPlugin.exe). The code in + // Dullahan that tried to figure out the location automatically uses + // the location of the exe which isn't helpful so we tell it explicitly. + char cur_dir_str[MAX_PATH]; + GetCurrentDirectoryA(MAX_PATH, cur_dir_str); + settings.host_process_path = std::string(cur_dir_str); +#endif settings.accept_language_list = mHostLanguage; - settings.background_color = 0xffffffff; + settings.background_color = 0xff282828; // close to Viewer background color settings.cache_enabled = true; settings.root_cache_path = mRootCachePath; settings.cache_path = mCachePath; diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 6d231040f7..3ce3aae469 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -611,6 +611,12 @@ class WindowsManifest(ViewerManifest): self.path("msvcp140.dll") self.path("vcruntime140.dll") + # as of CEF 88, this (apparently software rendering support) + # folder is required - likely a Chromium bug - but including + # for now until the root cause is found - it's tiny + with self.prefix(src=os.path.join(pkgdir, 'bin', 'release')): + self.path("swiftshader/") + # CEF files common to all configurations with self.prefix(src=os.path.join(pkgdir, 'resources')): self.path("cef.pak") |