diff --git a/autobuild.xml b/autobuild.xml
index 6a71eadbff9e0853ea9139ad0abd03155c3eb7a9..c25d995334169e072da49b2871901aa5b01264c8 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -614,16 +614,18 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>d85a32d905b199534e8feafa34b28e39</string>
+ <string>3a1bf9b1ded325f872fefa4ade23efd8</string>
+ <key>hash_algorithm</key>
+ <string>md5</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/62332/588168/dullahan-1.7.0.202006241556_81.3.10_gb223419_chromium-81.0.4044.138-windows64-544091.tar.bz2</string>
+ <string>https://pkg.alchemyviewer.org/repository/autobuild-external/dullahan/windows64/dullahan-1.7.0.202009180903_85.3.9_gb045a6e_chromium-85.0.4183.102-windows64-342.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
- <string>1.7.0.202006240858_81.3.10_gb223419_chromium-81.0.4044.138</string>
+ <string>1.7.0.202009180903_85.3.9_gb045a6e_chromium-85.0.4183.102</string>
</map>
<key>elfio</key>
<map>
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 6712a1f6bd250689fffec81cd1af4033fd685137..d7423eb1ffc44679624048fdc98b1162ed92cc87 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -856,6 +856,18 @@ void LLPluginClassMedia::paste()
sendMessage(message);
}
+void LLPluginClassMedia::setCEFProgramDirs(const std::string& helper_path,
+ const std::string& resources_path,
+ const std::string& locales_path)
+{
+ LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "set_cef_data_path");
+ message.setValue("helper_path", helper_path);
+ message.setValue("resources_path", resources_path);
+ message.setValue("locales_path", locales_path);
+
+ sendMessage(message);
+}
+
void LLPluginClassMedia::setUserDataPath(const std::string &user_data_path_cache,
const std::string &user_data_path_cookies,
const std::string &user_data_path_cef_log)
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index 9d11ee0421d92f4b2efdaa28a8f800195be9aaa4..99d5e8cb692aa90f35b92196b443daf1709712ae 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -195,6 +195,7 @@ class LLPluginClassMedia : public LLPluginProcessParentOwner
bool canPaste() const { return mCanPaste; };
// These can be called before init(), and they will be queued and sent before the media init message.
+ void setCEFProgramDirs(const std::string& helper_path, const std::string& resources_path = std::string(), const std::string& locales_path = std::string());
void setUserDataPath(const std::string &user_data_path_cache, const std::string &user_data_path_cookies, const std::string &user_data_path_cef_log);
void setLanguageCode(const std::string &language_code);
void setPluginsEnabled(const bool enabled);
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index bc967c9bcaf487db130af3123e201b7bd04699f3..ecd48daee2f893490dd7e01fccdd1f641f2fc207 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -83,6 +83,9 @@ class MediaPluginCEF :
void checkEditState();
void setVolume();
+ std::string mHelperPath;
+ std::string mResourcesPath;
+ std::string mLocalesPath;
bool mEnableMediaPluginDebugging;
std::string mHostLanguage;
bool mCookiesEnabled;
@@ -534,14 +537,12 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
settings.disable_network_service = mDisableNetworkService;
settings.use_mock_keychain = mUseMockKeyChain;
#endif
- settings.flash_enabled = mPluginsEnabled;
settings.flip_mouse_y = false;
settings.flip_pixels_y = true;
settings.frame_rate = 60;
settings.force_wave_audio = true;
settings.initial_height = 1024;
settings.initial_width = 1024;
- settings.java_enabled = false;
settings.javascript_enabled = mJavascriptEnabled;
settings.media_stream_enabled = false; // MAINT-6060 - WebRTC media removed until we can add granualrity/query UI
settings.plugins_enabled = mPluginsEnabled;
@@ -551,6 +552,11 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
settings.log_verbose = mCefLogVerbose;
settings.autoplay_without_gesture = true;
+ // Set subprocess helper and cef app data paths
+ settings.browser_subprocess_path = mHelperPath;
+ settings.resources_dir_path = mResourcesPath;
+ settings.locales_dir_path = mLocalesPath;
+
std::vector<std::string> custom_schemes(1, "secondlife");
mCEFLib->setCustomSchemes(custom_schemes);
@@ -580,6 +586,16 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
message.setValueBoolean("coords_opengl", true);
sendMessage(message);
}
+ else if (message_name == "set_cef_data_path")
+ {
+ std::string data_path_helper = message_in.getValue("helper_path");
+ std::string data_path_resources = message_in.getValue("resources_path");
+ std::string data_path_locales = message_in.getValue("locales_path");
+
+ mHelperPath = data_path_helper;
+ mResourcesPath = data_path_resources;
+ mLocalesPath = data_path_locales;
+ }
else if (message_name == "set_user_data_path")
{
std::string user_data_path_cache = message_in.getValue("cache_path");
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 3ccb7977ab1abcc339c38cb467c831f2d622d2a9..22b433b854d8d92bf5a68e5e4331758f1ae69e6f 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1754,6 +1754,10 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
{
media_source = new LLPluginClassMedia(owner);
media_source->setSize(default_width, default_height);
+#if LL_WINDOWS
+ std::string subprocess_folder = gDirUtilp->getLLPluginDir() + gDirUtilp->getDirDelimiter();
+ media_source->setCEFProgramDirs(subprocess_folder);
+#endif
media_source->setUserDataPath(user_data_path_cache, user_data_path_cookies, user_data_path_cef_log);
media_source->setLanguageCode(LLUI::getLanguage());
media_source->setZoomFactor(zoom_factor);
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index e03944ade76e380abc17e7c3a48a760076c4a445..fecc9b0baefdb8a89aa800a7f57ce3e79a03a4d4 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -630,6 +630,11 @@ def construct(self):
self.path("snapshot_blob.bin")
self.path("v8_context_snapshot.bin")
+ # CEF software renderer files
+ with self.prefix(src=os.path.join(pkgdir, 'bin', config, 'swiftshader'), dst='swiftshader'):
+ self.path("libEGL.dll")
+ self.path("libGLESv2.dll")
+
# CEF files common to all configurations
with self.prefix(src=os.path.join(pkgdir, 'resources')):
self.path("cef.pak")