summaryrefslogtreecommitdiff
path: root/indra/media_plugins
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2021-05-13 20:29:01 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2021-05-13 20:29:01 +0300
commita442f8b4513f385952f586f2950645ac5050556f (patch)
tree1042e00dea1198015be5937fde8f0c4439a1e34d /indra/media_plugins
parent9626649f902cd9d5d7cbf1e8fbbd81a2952706c8 (diff)
Revert "Merge branch 'DRTVWR-531' into DRTVWR-516-maint"
This reverts commit 07456abe92ab24f373b238f6bd64087c078b7fc3, reversing changes made to 8a33636e8f56f8d1229b3f76ed6205ce8087048d.
Diffstat (limited to 'indra/media_plugins')
-rw-r--r--indra/media_plugins/cef/media_plugin_cef.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index c658f35480..0bb62d79ff 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -525,18 +525,8 @@ 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 = 0xff282828; // close to Viewer background color
+ settings.background_color = 0xffffffff;
settings.cache_enabled = true;
settings.root_cache_path = mRootCachePath;
settings.cache_path = mCachePath;