diff options
| author | callum_linden <callum@lindenlab.com> | 2019-06-11 20:28:54 -0700 |
|---|---|---|
| committer | callum_linden <callum@lindenlab.com> | 2019-06-11 20:28:54 -0700 |
| commit | d278699b7b358a744cd33ff4b7bec700e10b3e6a (patch) | |
| tree | 0b9040467d616380945bcf3b85d1d6c8a7ab407c /indra/media_plugins/cef | |
| parent | 36ad4c07091bf68d63d8e02ccfe53deb67bd79b7 (diff) | |
Pull in CEF 75.0.1+gb5e74dd+chromium-75.0.3770.80 and Dullahan 1.2.x along with some minor compatibility changes
Diffstat (limited to 'indra/media_plugins/cef')
| -rw-r--r-- | indra/media_plugins/cef/media_plugin_cef.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index e05dd3f793..6f0ae0b83b 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -96,7 +96,6 @@ private: bool mCanCopy; bool mCanPaste; std::string mCachePath; - std::string mCookiePath; std::string mCefLogFile; bool mCefLogVerbose; std::vector<std::string> mPickedFiles; @@ -128,7 +127,6 @@ MediaPluginBase(host_send_func, host_user_data) mCanCopy = false; mCanPaste = false; mCachePath = ""; - mCookiePath = ""; mCefLogFile = ""; mCefLogVerbose = false; mPickedFiles.clear(); @@ -509,7 +507,6 @@ void MediaPluginCEF::receiveMessage(const char* message_string) settings.background_color = 0xff282828; settings.cache_enabled = true; settings.cache_path = mCachePath; - settings.cookie_store_path = mCookiePath; settings.cookies_enabled = mCookiesEnabled; settings.disable_gpu = mDisableGPU; settings.flash_enabled = mPluginsEnabled; @@ -559,7 +556,6 @@ void MediaPluginCEF::receiveMessage(const char* message_string) std::string user_data_path_cookies = message_in.getValue("cookies_path"); mCachePath = user_data_path_cache + "cef_cache"; - mCookiePath = user_data_path_cookies + "cef_cookies"; mCefLogFile = message_in.getValue("cef_log_file"); mCefLogVerbose = message_in.getValueBoolean("cef_verbose_log"); } |