From 7bce446b28fc7f7f93b2c4927dac2f9da0835264 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 10 Jun 2019 14:09:31 -0700 Subject: Changes from @andreyk for improved mouse scroll wheel performance and pull in new Dullahan with CEF 74.1.19_gb62bacf_chromium-74.0.3729.157 --- autobuild.xml | 14 +++++++------- indra/llplugin/llpluginclassmedia.cpp | 4 +++- indra/llplugin/llpluginclassmedia.h | 2 +- indra/media_plugins/cef/media_plugin_cef.cpp | 7 +++++-- indra/newview/llmediactrl.cpp | 5 ++++- indra/newview/llpanelprimmediacontrols.cpp | 16 ++++++++-------- indra/newview/llviewermedia.cpp | 4 ++-- indra/newview/llviewermedia.h | 2 +- indra/newview/llviewermediafocus.cpp | 7 +------ 9 files changed, 32 insertions(+), 29 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 5f072512c1..88900a4f29 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - 23aeaf23e7db2484a1850017141860dd + c3c10098d8c9c86bd3392c3441591554 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34069/283470/dullahan-1.1.1320_3.3626.1895.g7001d56-darwin64-525361.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38807/327515/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-darwin64-527989.tar.bz2 name darwin64 @@ -592,9 +592,9 @@ archive hash - 71fa66203326aca918796e874976c080 + f8a1da6f464b3a19d2e087525ab97855 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34070/283477/dullahan-1.1.1320_3.3626.1895.g7001d56-windows-525361.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38808/327521/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-windows-527989.tar.bz2 name windows @@ -604,16 +604,16 @@ archive hash - c7162e4805f50a3609f5dc63d0cf2bc0 + bd481e6adfe1280fef7d9f840133421e url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/34071/283480/dullahan-1.1.1320_3.3626.1895.g7001d56-windows64-525361.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38809/327525/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-windows64-527989.tar.bz2 name windows64 version - 1.1.1320_3.3626.1895.g7001d56 + 1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157 elfio diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 9d447b0f37..cdf2ddde6c 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -656,12 +656,14 @@ bool LLPluginClassMedia::keyEvent(EKeyEventType type, int key_code, MASK modifie return result; } -void LLPluginClassMedia::scrollEvent(int x, int y, MASK modifiers) +void LLPluginClassMedia::scrollEvent(int x, int y, int clicks_x, int clicks_y, MASK modifiers) { LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "scroll_event"); message.setValueS32("x", x); message.setValueS32("y", y); + message.setValueS32("clicks_x", clicks_x); + message.setValueS32("clicks_y", clicks_y); message.setValue("modifiers", translateModifiers(modifiers)); sendMessage(message); diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 4f52afb317..9d11ee0421 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -118,7 +118,7 @@ public: bool keyEvent(EKeyEventType type, int key_code, MASK modifiers, LLSD native_key_data); - void scrollEvent(int x, int y, MASK modifiers); + void scrollEvent(int x, int y, int clicks_x, int clicks_y, MASK modifiers); // enable/disable media plugin debugging messages and info spam void enableMediaPluginDebugging( bool enable ); diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 66b316df90..40b480a84e 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -652,10 +652,13 @@ void MediaPluginCEF::receiveMessage(const char* message_string) { S32 x = message_in.getValueS32("x"); S32 y = message_in.getValueS32("y"); + S32 delta_x = message_in.getValueS32("clicks_x"); + S32 delta_y = message_in.getValueS32("clicks_y"); const int scaling_factor = 40; - y *= -scaling_factor; + delta_x *= -scaling_factor; + delta_y *= -scaling_factor; - mCEFLib->mouseWheel(x, y); + mCEFLib->mouseWheel(x, y, delta_x, delta_y); } else if (message_name == "text_event") { diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 7f6955d08c..1d3a026049 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -202,7 +202,10 @@ BOOL LLMediaCtrl::handleScrollWheel( S32 x, S32 y, S32 clicks ) { if (LLPanel::handleScrollWheel(x, y, clicks)) return TRUE; if (mMediaSource && mMediaSource->hasMedia()) - mMediaSource->getMediaPlugin()->scrollEvent(0, clicks, gKeyboard->currentMask(TRUE)); + { + convertInputCoords(x, y); + mMediaSource->scrollWheel(x, y, 0, clicks, gKeyboard->currentMask(TRUE)); + } return TRUE; } diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index 5f413fc3c0..c74c2e0fd8 100644 --- a/indra/newview/llpanelprimmediacontrols.cpp +++ b/indra/newview/llpanelprimmediacontrols.cpp @@ -547,17 +547,17 @@ void LLPanelPrimMediaControls::updateShape() switch (mScrollState) { case SCROLL_UP: - media_impl->scrollWheel(0, -1, MASK_NONE); + media_impl->scrollWheel(0, 0, 0, -1, MASK_NONE); break; case SCROLL_DOWN: - media_impl->scrollWheel(0, 1, MASK_NONE); + media_impl->scrollWheel(0, 0, 0, 1, MASK_NONE); break; case SCROLL_LEFT: - media_impl->scrollWheel(1, 0, MASK_NONE); + media_impl->scrollWheel(0, 0, 1, 0, MASK_NONE); // media_impl->handleKeyHere(KEY_LEFT, MASK_NONE); break; case SCROLL_RIGHT: - media_impl->scrollWheel(-1, 0, MASK_NONE); + media_impl->scrollWheel(0, 0, -1, 0, MASK_NONE); // media_impl->handleKeyHere(KEY_RIGHT, MASK_NONE); break; case SCROLL_NONE: @@ -1134,7 +1134,7 @@ void LLPanelPrimMediaControls::onScrollUp(void* user_data) if(impl) { - impl->scrollWheel(0, -1, MASK_NONE); + impl->scrollWheel(0, 0, 0, -1, MASK_NONE); } } void LLPanelPrimMediaControls::onScrollUpHeld(void* user_data) @@ -1151,7 +1151,7 @@ void LLPanelPrimMediaControls::onScrollRight(void* user_data) if(impl) { - impl->scrollWheel(-1, 0, MASK_NONE); + impl->scrollWheel(0, 0, -1, 0, MASK_NONE); // impl->handleKeyHere(KEY_RIGHT, MASK_NONE); } } @@ -1170,7 +1170,7 @@ void LLPanelPrimMediaControls::onScrollLeft(void* user_data) if(impl) { - impl->scrollWheel(1, 0, MASK_NONE); + impl->scrollWheel(0, 0, 1, 0, MASK_NONE); // impl->handleKeyHere(KEY_LEFT, MASK_NONE); } } @@ -1189,7 +1189,7 @@ void LLPanelPrimMediaControls::onScrollDown(void* user_data) if(impl) { - impl->scrollWheel(0, 1, MASK_NONE); + impl->scrollWheel(0, 0, 0, 1, MASK_NONE); } } void LLPanelPrimMediaControls::onScrollDownHeld(void* user_data) diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index d8745b1eca..faad6bdb82 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -2322,14 +2322,14 @@ void LLViewerMediaImpl::mouseDoubleClick(S32 x, S32 y, MASK mask, S32 button) } ////////////////////////////////////////////////////////////////////////////////////////// -void LLViewerMediaImpl::scrollWheel(S32 x, S32 y, MASK mask) +void LLViewerMediaImpl::scrollWheel(S32 x, S32 y, S32 scroll_x, S32 scroll_y, MASK mask) { scaleMouse(&x, &y); mLastMouseX = x; mLastMouseY = y; if (mMediaSource) { - mMediaSource->scrollEvent(x, y, mask); + mMediaSource->scrollEvent(x, y, scroll_x, scroll_y, mask); } } diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index e2e758befb..bea024e952 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -230,7 +230,7 @@ public: void mouseMove(const LLVector2& texture_coords, MASK mask); void mouseDoubleClick(const LLVector2& texture_coords, MASK mask); void mouseDoubleClick(S32 x, S32 y, MASK mask, S32 button = 0); - void scrollWheel(S32 x, S32 y, MASK mask); + void scrollWheel(S32 x, S32 y, S32 scroll_x, S32 scroll_y, MASK mask); void mouseCapture(); void navigateBack(); diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp index 59165c1d71..b86d678196 100644 --- a/indra/newview/llviewermediafocus.cpp +++ b/indra/newview/llviewermediafocus.cpp @@ -377,12 +377,7 @@ BOOL LLViewerMediaFocus::handleScrollWheel(S32 x, S32 y, S32 clicks) LLViewerMediaImpl* media_impl = getFocusedMediaImpl(); if(media_impl && media_impl->hasMedia()) { - // the scrollEvent() API's x and y are not the same as handleScrollWheel's x and y. - // The latter is the position of the mouse at the time of the event - // The former is the 'scroll amount' in x and y, respectively. - // All we have for 'scroll amount' here is 'clicks'. - // We're also not passed the keyboard modifier mask, but we can get that from gKeyboard. - media_impl->getMediaPlugin()->scrollEvent(0, clicks, gKeyboard->currentMask(TRUE)); + media_impl->scrollWheel(x, y, 0, clicks, gKeyboard->currentMask(TRUE)); retval = TRUE; } return retval; -- cgit v1.2.3 From ffae378ab14f38d9ce26b6c79105244c30b9507a Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Tue, 11 Jun 2019 17:38:04 +0300 Subject: SOCIAL-231 Show tooltips for links and images im media browser --- indra/llplugin/llpluginclassmedia.cpp | 4 ++++ indra/media_plugins/cef/media_plugin_cef.cpp | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index cdf2ddde6c..5df64b8e3b 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -1130,6 +1130,10 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) mDebugMessageLevel = message.getValue("message_level"); mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_DEBUG_MESSAGE); } + else if (message_name == "tooltip_text") + { + mHoverText = message.getValue("tooltip"); + } else { LL_WARNS("Plugin") << "Unknown " << message_name << " class message: " << message_name << LL_ENDL; diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 40b480a84e..e05dd3f793 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -62,6 +62,7 @@ private: void onConsoleMessageCallback(std::string message, std::string source, int line); void onStatusMessageCallback(std::string value); void onTitleChangeCallback(std::string title); + void onTooltipCallback(std::string text); void onLoadStartCallback(); void onRequestExitCallback(); void onLoadEndCallback(int httpStatusCode); @@ -208,6 +209,12 @@ void MediaPluginCEF::onTitleChangeCallback(std::string title) sendMessage(message); } +void MediaPluginCEF::onTooltipCallback(std::string text) +{ + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "tooltip_text"); + message.setValue("tooltip", text); + sendMessage(message); +} //////////////////////////////////////////////////////////////////////////////// // void MediaPluginCEF::onLoadStartCallback() @@ -486,6 +493,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string) mCEFLib->setOnConsoleMessageCallback(std::bind(&MediaPluginCEF::onConsoleMessageCallback, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); mCEFLib->setOnStatusMessageCallback(std::bind(&MediaPluginCEF::onStatusMessageCallback, this, std::placeholders::_1)); mCEFLib->setOnTitleChangeCallback(std::bind(&MediaPluginCEF::onTitleChangeCallback, this, std::placeholders::_1)); + mCEFLib->setOnTooltipCallback(std::bind(&MediaPluginCEF::onTooltipCallback, this, std::placeholders::_1)); mCEFLib->setOnLoadStartCallback(std::bind(&MediaPluginCEF::onLoadStartCallback, this)); mCEFLib->setOnLoadEndCallback(std::bind(&MediaPluginCEF::onLoadEndCallback, this, std::placeholders::_1)); mCEFLib->setOnLoadErrorCallback(std::bind(&MediaPluginCEF::onLoadError, this, std::placeholders::_1, std::placeholders::_2)); -- cgit v1.2.3 From 36ad4c07091bf68d63d8e02ccfe53deb67bd79b7 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Tue, 11 Jun 2019 11:26:04 -0700 Subject: add new version of Dullahan (1.1.2222) to support tool tips feature added my @Maxim --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 88900a4f29..e61c62f8dc 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - c3c10098d8c9c86bd3392c3441591554 + d7b0c8910632f50ae8d21c5d68cdaca8 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38807/327515/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-darwin64-527989.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38862/328055/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-darwin64-528032.tar.bz2 name darwin64 @@ -592,9 +592,9 @@ archive hash - f8a1da6f464b3a19d2e087525ab97855 + 9237b8e73999b539a9b2466941d02b79 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38808/327521/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-windows-527989.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38863/328061/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-windows-528032.tar.bz2 name windows @@ -604,16 +604,16 @@ archive hash - bd481e6adfe1280fef7d9f840133421e + 3aef2dad2664a535d561ab4b235944db url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38809/327525/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-windows64-527989.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38864/328065/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-windows64-528032.tar.bz2 name windows64 version - 1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157 + 1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157 elfio -- cgit v1.2.3 From d278699b7b358a744cd33ff4b7bec700e10b3e6a Mon Sep 17 00:00:00 2001 From: callum_linden Date: Tue, 11 Jun 2019 20:28:54 -0700 Subject: Pull in CEF 75.0.1+gb5e74dd+chromium-75.0.3770.80 and Dullahan 1.2.x along with some minor compatibility changes --- autobuild.xml | 14 +++++++------- indra/llplugin/llpluginclassmedia.cpp | 2 -- indra/llplugin/llpluginclassmedia.h | 2 +- indra/media_plugins/cef/media_plugin_cef.cpp | 4 ---- indra/newview/llviewermedia.cpp | 11 +++++------ 5 files changed, 13 insertions(+), 20 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index e61c62f8dc..517b3d3d4e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - d7b0c8910632f50ae8d21c5d68cdaca8 + 11362c72e1edae9c98e6cc40d378fd37 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38862/328055/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-darwin64-528032.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38952/328700/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-darwin64-528086.tar.bz2 name darwin64 @@ -592,9 +592,9 @@ archive hash - 9237b8e73999b539a9b2466941d02b79 + 0980cd50e5fed4e68ee78132e5c2e240 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38863/328061/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-windows-528032.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38954/328712/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows-528086.tar.bz2 name windows @@ -604,16 +604,16 @@ archive hash - 3aef2dad2664a535d561ab4b235944db + dd072189ea40ed9fa0af0f2caef866ca url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38864/328065/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-windows64-528032.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38953/328705/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows64-528086.tar.bz2 name windows64 version - 1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157 + 1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80 elfio diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 5df64b8e3b..a4ce8d1382 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -849,12 +849,10 @@ void LLPluginClassMedia::paste() } 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) { LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "set_user_data_path"); message.setValue("cache_path", user_data_path_cache); - message.setValue("cookies_path", user_data_path_cookies); message.setValue("cef_log_file", user_data_path_cef_log); bool cef_verbose_log = gSavedSettings.getBOOL("CefVerboseLog"); diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 9d11ee0421..6f2b875116 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -195,7 +195,7 @@ public: bool canPaste() const { return mCanPaste; }; // These can be called before init(), and they will be queued and sent before the media init message. - 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 setUserDataPath(const std::string &user_data_path_cache, const std::string &user_data_path_cef_log); void setLanguageCode(const std::string &language_code); void setPluginsEnabled(const bool enabled); void setJavascriptEnabled(const bool enabled); 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 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"); } diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index faad6bdb82..8680cd3f7d 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1731,12 +1731,10 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ std::string launcher_name = gDirUtilp->getLLPluginLauncher(); std::string plugin_name = gDirUtilp->getLLPluginFilename(plugin_basename); + // cookies now are stored in the CEF cache directory too (no more control over their location) std::string user_data_path_cache = gDirUtilp->getCacheDir(false); user_data_path_cache += gDirUtilp->getDirDelimiter(); - std::string user_data_path_cookies = gDirUtilp->getOSUserAppDir(); - user_data_path_cookies += gDirUtilp->getDirDelimiter(); - std::string user_data_path_cef_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "cef_log.txt"); // Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.) @@ -1747,8 +1745,9 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ std::string linden_user_dir = gDirUtilp->getLindenUserDir(); if ( ! linden_user_dir.empty() ) { - user_data_path_cookies = linden_user_dir; - user_data_path_cookies += gDirUtilp->getDirDelimiter(); + // cookies now are stored in the CEF cache directory too (no more control over their location) + user_data_path_cache = linden_user_dir; + user_data_path_cache += gDirUtilp->getDirDelimiter(); }; // See if the plugin executable exists @@ -1767,7 +1766,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ { media_source = new LLPluginClassMedia(owner); media_source->setSize(default_width, default_height); - media_source->setUserDataPath(user_data_path_cache, user_data_path_cookies, user_data_path_cef_log); + media_source->setUserDataPath(user_data_path_cache, user_data_path_cef_log); media_source->setLanguageCode(LLUI::getLanguage()); media_source->setZoomFactor(zoom_factor); -- cgit v1.2.3 From dbd28b862c32398c14e8f76d61e0fea315f1cc8a Mon Sep 17 00:00:00 2001 From: callum_linden Date: Thu, 13 Jun 2019 12:18:43 -0700 Subject: Small update to Dullahan : uses an updated versioning system to make it easier to track revisions --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 517b3d3d4e..c028ac32ff 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - 11362c72e1edae9c98e6cc40d378fd37 + 671f93c9c0198be6181bcdad12eeb1e0 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38952/328700/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-darwin64-528086.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39079/330374/dullahan-1.2.201906131118_75.0.1_gb5e74dd_chromium-75.0.3770.80-darwin64-528163.tar.bz2 name darwin64 @@ -592,9 +592,9 @@ archive hash - 0980cd50e5fed4e68ee78132e5c2e240 + 6044f0b2c2081f2a1cc63ab6e5682bef url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38954/328712/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows-528086.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39081/330385/dullahan-1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows-528163.tar.bz2 name windows @@ -604,16 +604,16 @@ archive hash - dd072189ea40ed9fa0af0f2caef866ca + c00079f01c71ce46f9735174081d44f6 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/38953/328705/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows64-528086.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39080/330386/dullahan-1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows64-528163.tar.bz2 name windows64 version - 1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80 + 1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80 elfio -- cgit v1.2.3 From 8b650133fcf67bf19a4771afd66b6f99e823f207 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Thu, 13 Jun 2019 14:08:04 -0700 Subject: Update CEF binaries to most recent version: 75.0.6+g90ecd35+chromium-75.0.3770.80 (no Dullahan changes required) --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index c028ac32ff..50add71f55 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - 671f93c9c0198be6181bcdad12eeb1e0 + 70397992cf465d3b1a7534d7186771fe url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39079/330374/dullahan-1.2.201906131118_75.0.1_gb5e74dd_chromium-75.0.3770.80-darwin64-528163.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39115/330763/dullahan-1.2.201906131357_75.0.6_g90ecd35_chromium-75.0.3770.80-darwin64-528181.tar.bz2 name darwin64 @@ -592,9 +592,9 @@ archive hash - 6044f0b2c2081f2a1cc63ab6e5682bef + 7c926f549420f75e90d79a0b25e617dd url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39081/330385/dullahan-1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows-528163.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39117/330772/dullahan-1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80-windows-528181.tar.bz2 name windows @@ -604,16 +604,16 @@ archive hash - c00079f01c71ce46f9735174081d44f6 + fd7bb4cc062323887d8de618be289030 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39080/330386/dullahan-1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows64-528163.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39116/330775/dullahan-1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80-windows64-528181.tar.bz2 name windows64 version - 1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80 + 1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80 elfio -- cgit v1.2.3 From 1bb86f3f98bda3bae3eb005c0bc27db1ea0dfe37 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 17 Jun 2019 16:57:59 -0700 Subject: Bump CEF version (via 3p-cef-bin-*) slightly to 75.0.7+g19229b6+chromium-75.0.3770.80 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 50add71f55..be4219b279 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - 70397992cf465d3b1a7534d7186771fe + 914d49e4951b77c61df2e786a5791fb5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39115/330763/dullahan-1.2.201906131357_75.0.6_g90ecd35_chromium-75.0.3770.80-darwin64-528181.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39275/332265/dullahan-1.2.201906171653_75.0.7_g19229b6_chromium-75.0.3770.80-darwin64-528294.tar.bz2 name darwin64 @@ -592,9 +592,9 @@ archive hash - 7c926f549420f75e90d79a0b25e617dd + e3108ed152d61d0d75d723698944802c url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39117/330772/dullahan-1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80-windows-528181.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39276/332272/dullahan-1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80-windows-528294.tar.bz2 name windows @@ -604,16 +604,16 @@ archive hash - fd7bb4cc062323887d8de618be289030 + 2f4fe577dc0247a23dbfee6e2a965a21 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39116/330775/dullahan-1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80-windows64-528181.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39277/332276/dullahan-1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80-windows64-528294.tar.bz2 name windows64 version - 1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80 + 1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80 elfio -- cgit v1.2.3 From 295dd81fa36571585b5215c9da6709d7c350c51f Mon Sep 17 00:00:00 2001 From: callum_linden Date: Wed, 19 Jun 2019 12:14:28 -0700 Subject: Bump version of CEF we build against to 75.0.8+g5da93a1+chromium-75.0.3770.80 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index be4219b279..d25b73dba2 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - 914d49e4951b77c61df2e786a5791fb5 + 063d23fc17a12cc523c1339797e6ab2f url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39275/332265/dullahan-1.2.201906171653_75.0.7_g19229b6_chromium-75.0.3770.80-darwin64-528294.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39378/333003/dullahan-1.2.201906191209_75.0.8_g5da93a1_chromium-75.0.3770.80-darwin64-528361.tar.bz2 name darwin64 @@ -592,9 +592,9 @@ archive hash - e3108ed152d61d0d75d723698944802c + dc407cb4676b40de44222e7b5a01b511 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39276/332272/dullahan-1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80-windows-528294.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39381/333016/dullahan-1.2.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80-windows-528361.tar.bz2 name windows @@ -604,16 +604,16 @@ archive hash - 2f4fe577dc0247a23dbfee6e2a965a21 + bbab698b2807da3c2a3dc94de3aa3084 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39277/332276/dullahan-1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80-windows64-528294.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39380/333017/dullahan-1.2.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80-windows64-528361.tar.bz2 name windows64 version - 1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80 + 1.2.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80 elfio -- cgit v1.2.3