From 1b2579eca228633cea1f4b2e0a8444bc9e686f65 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Sat, 14 Sep 2019 02:28:34 +0300 Subject: SL-11536 Backed out CEF update (changeset: c246ab81b298) --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 85b9ba9976..ec715e61d8 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - 29e72f220f3d4b8899ce48ee5263c62e + 063d23fc17a12cc523c1339797e6ab2f url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39570/336600/dullahan-1.2.201906211704_75.0.11_gf50b3c2_chromium-75.0.3770.100-darwin64-528487.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 - 022aed6a323c0a2d80775555b6713bf4 + dc407cb4676b40de44222e7b5a01b511 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39571/336606/dullahan-1.2.201906220004_75.0.11_gf50b3c2_chromium-75.0.3770.100-windows-528487.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 - 5e9f605450feb22b01f81b26d1898eab + bbab698b2807da3c2a3dc94de3aa3084 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/39572/336611/dullahan-1.2.201906220004_75.0.11_gf50b3c2_chromium-75.0.3770.100-windows64-528487.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.201906220004_75.0.11_gf50b3c2_chromium-75.0.3770.100 + 1.2.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80 elfio -- cgit v1.2.3 From 11390ad8ed7f3c3ab6f586f44cebf7cc097d99f3 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Sat, 14 Sep 2019 05:13:19 +0300 Subject: Backed out changeset: 122dc88276c7 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index ec715e61d8..53959a2dc5 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - 063d23fc17a12cc523c1339797e6ab2f + 914d49e4951b77c61df2e786a5791fb5 url - 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 + 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 - dc407cb4676b40de44222e7b5a01b511 + e3108ed152d61d0d75d723698944802c url - 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 + 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 - bbab698b2807da3c2a3dc94de3aa3084 + 2f4fe577dc0247a23dbfee6e2a965a21 url - 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 + 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.201906191911_75.0.8_g5da93a1_chromium-75.0.3770.80 + 1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80 elfio -- cgit v1.2.3 From a100d62783693b9648ae8e0cd6994e2ed02ebdd2 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Sat, 14 Sep 2019 05:13:27 +0300 Subject: Backed out changeset: 8da237b54852 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 53959a2dc5..15f7b062a7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - 914d49e4951b77c61df2e786a5791fb5 + 70397992cf465d3b1a7534d7186771fe 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/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 - e3108ed152d61d0d75d723698944802c + 7c926f549420f75e90d79a0b25e617dd 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/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 - 2f4fe577dc0247a23dbfee6e2a965a21 + fd7bb4cc062323887d8de618be289030 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/39116/330775/dullahan-1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80-windows64-528181.tar.bz2 name windows64 version - 1.2.201906172353_75.0.7_g19229b6_chromium-75.0.3770.80 + 1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80 elfio -- cgit v1.2.3 From 423a9645e09717fff56e2f288b810b90128e7374 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Sat, 14 Sep 2019 05:13:35 +0300 Subject: Backed out changeset: 20da15768791 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 15f7b062a7..70565ef5f0 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - 70397992cf465d3b1a7534d7186771fe + 671f93c9c0198be6181bcdad12eeb1e0 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/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 - 7c926f549420f75e90d79a0b25e617dd + 6044f0b2c2081f2a1cc63ab6e5682bef 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/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 - fd7bb4cc062323887d8de618be289030 + c00079f01c71ce46f9735174081d44f6 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/39080/330386/dullahan-1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows64-528163.tar.bz2 name windows64 version - 1.2.201906132058_75.0.6_g90ecd35_chromium-75.0.3770.80 + 1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80 elfio -- cgit v1.2.3 From a07b64d30e65c3b448879825150336a498e91a15 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Sat, 14 Sep 2019 05:13:45 +0300 Subject: Backed out changeset: 4a7dac768fae --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 70565ef5f0..52c9071574 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - 671f93c9c0198be6181bcdad12eeb1e0 + 11362c72e1edae9c98e6cc40d378fd37 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/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 - 6044f0b2c2081f2a1cc63ab6e5682bef + 0980cd50e5fed4e68ee78132e5c2e240 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/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 - c00079f01c71ce46f9735174081d44f6 + dd072189ea40ed9fa0af0f2caef866ca 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/38953/328705/dullahan-1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80-windows64-528086.tar.bz2 name windows64 version - 1.2.201906131822_75.0.1_gb5e74dd_chromium-75.0.3770.80 + 1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80 elfio -- cgit v1.2.3 From ddbe9583ff0732ac6b8832a476fed4c6e0d54a49 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Sat, 14 Sep 2019 05:13:53 +0300 Subject: Backed out changeset: a6398f90389a --- 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, 20 insertions(+), 13 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 52c9071574..6108c6dd42 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - 11362c72e1edae9c98e6cc40d378fd37 + d7b0c8910632f50ae8d21c5d68cdaca8 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/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 - 0980cd50e5fed4e68ee78132e5c2e240 + 9237b8e73999b539a9b2466941d02b79 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/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 - dd072189ea40ed9fa0af0f2caef866ca + 3aef2dad2664a535d561ab4b235944db 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/38864/328065/dullahan-1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157-windows64-528032.tar.bz2 name windows64 version - 1.2.1022544_75.0.1_gb5e74dd_chromium-75.0.3770.80 + 1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157 elfio diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 483a967db6..58069afdf9 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -857,10 +857,12 @@ 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 6f2b875116..9d11ee0421 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_cef_log); + 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); 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 07d82d1a93..d5def44edb 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -96,6 +96,7 @@ private: bool mCanCopy; bool mCanPaste; std::string mCachePath; + std::string mCookiePath; std::string mCefLogFile; bool mCefLogVerbose; std::vector mPickedFiles; @@ -127,6 +128,7 @@ MediaPluginBase(host_send_func, host_user_data) mCanCopy = false; mCanPaste = false; mCachePath = ""; + mCookiePath = ""; mCefLogFile = ""; mCefLogVerbose = false; mPickedFiles.clear(); @@ -507,6 +509,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string) settings.background_color = 0xffffffff; 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; @@ -561,6 +564,7 @@ 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 a9eb79b649..d4487b22c9 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1731,10 +1731,12 @@ 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.) @@ -1745,9 +1747,8 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ std::string linden_user_dir = gDirUtilp->getLindenUserDir(); if ( ! linden_user_dir.empty() ) { - // 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(); + user_data_path_cookies = linden_user_dir; + user_data_path_cookies += gDirUtilp->getDirDelimiter(); }; // See if the plugin executable exists @@ -1766,7 +1767,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_cef_log); + 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); -- cgit v1.2.3 From 28640c19e806aae790a4a12570e1571d46ca84ab Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Sat, 14 Sep 2019 05:13:58 +0300 Subject: Backed out changeset: 4273d752fb17 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 6108c6dd42..d93be8ecc6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - d7b0c8910632f50ae8d21c5d68cdaca8 + c3c10098d8c9c86bd3392c3441591554 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/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 - 9237b8e73999b539a9b2466941d02b79 + f8a1da6f464b3a19d2e087525ab97855 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/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 - 3aef2dad2664a535d561ab4b235944db + bd481e6adfe1280fef7d9f840133421e 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/38809/327525/dullahan-1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157-windows64-527989.tar.bz2 name windows64 version - 1.1.2222_74.1.19_gb62bacf_chromium-74.0.3729.157 + 1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157 elfio -- cgit v1.2.3 From 548d688adfb65c93c85e5c380c19780e1c80261e Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Sat, 14 Sep 2019 05:14:07 +0300 Subject: Backed out changeset: b4182ee25942 --- indra/llplugin/llpluginclassmedia.cpp | 4 ---- indra/media_plugins/cef/media_plugin_cef.cpp | 8 -------- 2 files changed, 12 deletions(-) diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 58069afdf9..85197d1272 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -1138,10 +1138,6 @@ 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 d5def44edb..2f0501d018 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -62,7 +62,6 @@ 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); @@ -209,12 +208,6 @@ 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() @@ -493,7 +486,6 @@ 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 2f7b6062026eb7b227e22580df6aa8dfb7234bf4 Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Sat, 14 Sep 2019 05:14:24 +0300 Subject: Backed out changeset: 8e228364f324 --- 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, 29 insertions(+), 32 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index d93be8ecc6..3983e12313 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -580,9 +580,9 @@ archive hash - c3c10098d8c9c86bd3392c3441591554 + 23aeaf23e7db2484a1850017141860dd 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/34069/283470/dullahan-1.1.1320_3.3626.1895.g7001d56-darwin64-525361.tar.bz2 name darwin64 @@ -592,9 +592,9 @@ archive hash - f8a1da6f464b3a19d2e087525ab97855 + 71fa66203326aca918796e874976c080 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/34070/283477/dullahan-1.1.1320_3.3626.1895.g7001d56-windows-525361.tar.bz2 name windows @@ -604,16 +604,16 @@ archive hash - bd481e6adfe1280fef7d9f840133421e + c7162e4805f50a3609f5dc63d0cf2bc0 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/34071/283480/dullahan-1.1.1320_3.3626.1895.g7001d56-windows64-525361.tar.bz2 name windows64 version - 1.1.2200_74.1.19_gb62bacf_chromium-74.0.3729.157 + 1.1.1320_3.3626.1895.g7001d56 elfio diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 85197d1272..78b1483810 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -664,14 +664,12 @@ bool LLPluginClassMedia::keyEvent(EKeyEventType type, int key_code, MASK modifie return result; } -void LLPluginClassMedia::scrollEvent(int x, int y, int clicks_x, int clicks_y, MASK modifiers) +void LLPluginClassMedia::scrollEvent(int x, int 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 9d11ee0421..4f52afb317 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, int clicks_x, int clicks_y, MASK modifiers); + void scrollEvent(int x, int 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 2f0501d018..eead92fd8e 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -657,13 +657,10 @@ 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; - delta_x *= -scaling_factor; - delta_y *= -scaling_factor; + y *= -scaling_factor; - mCEFLib->mouseWheel(x, y, delta_x, delta_y); + mCEFLib->mouseWheel(x, y); } else if (message_name == "text_event") { diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index 1d3a026049..7f6955d08c 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -202,10 +202,7 @@ BOOL LLMediaCtrl::handleScrollWheel( S32 x, S32 y, S32 clicks ) { if (LLPanel::handleScrollWheel(x, y, clicks)) return TRUE; if (mMediaSource && mMediaSource->hasMedia()) - { - convertInputCoords(x, y); - mMediaSource->scrollWheel(x, y, 0, clicks, gKeyboard->currentMask(TRUE)); - } + mMediaSource->getMediaPlugin()->scrollEvent(0, clicks, gKeyboard->currentMask(TRUE)); return TRUE; } diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp index c74c2e0fd8..5f413fc3c0 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, 0, 0, -1, MASK_NONE); + media_impl->scrollWheel(0, -1, MASK_NONE); break; case SCROLL_DOWN: - media_impl->scrollWheel(0, 0, 0, 1, MASK_NONE); + media_impl->scrollWheel(0, 1, MASK_NONE); break; case SCROLL_LEFT: - media_impl->scrollWheel(0, 0, 1, 0, MASK_NONE); + media_impl->scrollWheel(1, 0, MASK_NONE); // media_impl->handleKeyHere(KEY_LEFT, MASK_NONE); break; case SCROLL_RIGHT: - media_impl->scrollWheel(0, 0, -1, 0, MASK_NONE); + media_impl->scrollWheel(-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, 0, 0, -1, MASK_NONE); + impl->scrollWheel(0, -1, MASK_NONE); } } void LLPanelPrimMediaControls::onScrollUpHeld(void* user_data) @@ -1151,7 +1151,7 @@ void LLPanelPrimMediaControls::onScrollRight(void* user_data) if(impl) { - impl->scrollWheel(0, 0, -1, 0, MASK_NONE); + impl->scrollWheel(-1, 0, MASK_NONE); // impl->handleKeyHere(KEY_RIGHT, MASK_NONE); } } @@ -1170,7 +1170,7 @@ void LLPanelPrimMediaControls::onScrollLeft(void* user_data) if(impl) { - impl->scrollWheel(0, 0, 1, 0, MASK_NONE); + impl->scrollWheel(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, 0, 0, 1, MASK_NONE); + impl->scrollWheel(0, 1, MASK_NONE); } } void LLPanelPrimMediaControls::onScrollDownHeld(void* user_data) diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index d4487b22c9..a27a083a2a 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -2309,14 +2309,14 @@ void LLViewerMediaImpl::mouseDoubleClick(S32 x, S32 y, MASK mask, S32 button) } ////////////////////////////////////////////////////////////////////////////////////////// -void LLViewerMediaImpl::scrollWheel(S32 x, S32 y, S32 scroll_x, S32 scroll_y, MASK mask) +void LLViewerMediaImpl::scrollWheel(S32 x, S32 y, MASK mask) { scaleMouse(&x, &y); mLastMouseX = x; mLastMouseY = y; if (mMediaSource) { - mMediaSource->scrollEvent(x, y, scroll_x, scroll_y, mask); + mMediaSource->scrollEvent(x, y, mask); } } diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index bea024e952..e2e758befb 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, S32 scroll_x, S32 scroll_y, MASK mask); + void scrollWheel(S32 x, S32 y, MASK mask); void mouseCapture(); void navigateBack(); diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp index b86d678196..59165c1d71 100644 --- a/indra/newview/llviewermediafocus.cpp +++ b/indra/newview/llviewermediafocus.cpp @@ -377,7 +377,12 @@ BOOL LLViewerMediaFocus::handleScrollWheel(S32 x, S32 y, S32 clicks) LLViewerMediaImpl* media_impl = getFocusedMediaImpl(); if(media_impl && media_impl->hasMedia()) { - media_impl->scrollWheel(x, y, 0, clicks, gKeyboard->currentMask(TRUE)); + // 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)); retval = TRUE; } return retval; -- cgit v1.2.3 From 5d96cf3f71fc4d2f3910cb2a3a4d4142ae79e45a Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 17 Sep 2019 14:55:06 +0300 Subject: SL-11917 Updated VVM --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 3983e12313..a910a004b0 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3138,9 +3138,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 42066e2447c7a3359784438d16510992 + c5ab9d9d7482e48cd76f4bf391900a8c url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/40539/348124/viewer_manager-2.0.529188-darwin64-529188.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/43369/385585/viewer_manager-2.0.531000-darwin64-531000.tar.bz2 name darwin64 @@ -3162,9 +3162,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - ca230428635ce13cb7ace0f9522f8546 + 6b10d7407686d9e12e63576256581e3e url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/40538/348130/viewer_manager-2.0.529188-windows-529188.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/43370/385592/viewer_manager-2.0.531000-windows-531000.tar.bz2 name windows @@ -3175,7 +3175,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 2.0.529188 + 2.0.531000 vlc-bin -- cgit v1.2.3 From b26bdc8987ee4149a35a6c5bd3d2b4ae41270e6a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 15 Oct 2019 13:27:53 -0400 Subject: Added tag 6.3.2-release for changeset 07f5d5bc9fae --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index a4fb6ce9f8..75ece0c9b4 100755 --- a/.hgtags +++ b/.hgtags @@ -553,3 +553,4 @@ ab2ec5c5423b277d23fd0511ce50c15123ff2e03 6.2.3-release 67297f9902857e357570c44722ad84de3aff974e 6.2.4-release 9777aec6dc4a30a24537297ac040861ce16b82ae 6.3.0-release ece699718f163921717bb95a6131e94af4c4138f 6.3.1-release +07f5d5bc9faebb45695853d40a9549773db816c0 6.3.2-release -- cgit v1.2.3 From 33821bd599d1d9171cc93c38a2bc6c4ab6772c9a Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 15 Oct 2019 13:27:53 -0400 Subject: increment viewer version to 6.3.3 --- indra/newview/VIEWER_VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index 91e4a9f262..7849b73dc7 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -6.3.2 +6.3.3 -- cgit v1.2.3