From 05eba5d7b82e5b5d9c959415b36125b801266231 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 20 Nov 2017 16:08:15 -0800 Subject: Pull in CEF 3203 (Dullanan 1.1.888) Chrome 62 build and re-enable WebGL --- autobuild.xml | 14 +++++++------- indra/media_plugins/cef/media_plugin_cef.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 58c5a01492..5c10db7a98 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - bbdea742f2a89bcd6360e61e01d6be93 + b23a8bdac14fe5b4ac07275358bde5dc url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/8207/32592/dullahan-1.1.820_3.3071.1637.gcb6cf75-darwin64-508196.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/10987/61023/dullahan-1.1.888_3.3071.1637.gcb6cf75-darwin64-510877.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - 31e11a74e0d3f1e5e4036cb5fea8d944 + bb598875e7494b14d5318e7e62c92e25 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/8209/32599/dullahan-1.1.820_3.3071.1634.g9cc59c8-windows-508196.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/10988/61030/dullahan-1.1.888_3.3202.1686.gd665578-windows-510877.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - f965d244e7921c06ee79b68a4abcea3b + 374ecf17efaaeb63d98f9ff730c91814 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/8208/32602/dullahan-1.1.820_3.3071.1634.g9cc59c8-windows64-508196.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/10989/61035/dullahan-1.1.888_3.3202.1686.gd665578-windows64-510877.tar.bz2 name windows64 version - 1.1.820_3.3071.1634.g9cc59c8 + 1.1.888_3.3202.1686.gd665578 elfio diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index f3d7762a08..963c69aeb9 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -115,7 +115,7 @@ MediaPluginBase(host_send_func, host_user_data) mCookiesEnabled = true; mPluginsEnabled = false; mJavascriptEnabled = true; - mDisableGPU = true; + mDisableGPU = false; mUserAgentSubtring = ""; mAuthUsername = ""; mAuthPassword = ""; -- cgit v1.2.3 From fe29551d9a6685bdc40e87ae135f236aec1ea475 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Tue, 21 Nov 2017 09:46:31 -0800 Subject: Pull in macOS version of Dullahan that was built against CEF 3.3202.1686 --- autobuild.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 5c10db7a98..48eb3b7e93 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - b23a8bdac14fe5b4ac07275358bde5dc + 7b15c464cfa7c10281842a755417e948 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/10987/61023/dullahan-1.1.888_3.3071.1637.gcb6cf75-darwin64-510877.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11002/61105/dullahan-1.1.888_3.3202.1686.gd665578-darwin64-510883.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - bb598875e7494b14d5318e7e62c92e25 + 588614c46b080939af64fd062ca1efba url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/10988/61030/dullahan-1.1.888_3.3202.1686.gd665578-windows-510877.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11004/61115/dullahan-1.1.888_3.3202.1686.gd665578-windows-510883.tar.bz2 name windows @@ -580,9 +580,9 @@ archive hash - 374ecf17efaaeb63d98f9ff730c91814 + 8d89bb3be1d1e91748e5fc93f0122a6e url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/10989/61035/dullahan-1.1.888_3.3202.1686.gd665578-windows64-510877.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11003/61113/dullahan-1.1.888_3.3202.1686.gd665578-windows64-510883.tar.bz2 name windows64 -- cgit v1.2.3 From ab94da9baf8fcac7f7b31be543e41d12123732ba Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 11 Dec 2017 13:09:52 -0800 Subject: Pull in new version of Dullahan 1.1.920 with fix for crashing in RequestPageZoom() --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 20dfba27bb..dab24b8b24 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - 6a0977e833aaeeba3603b2f8fab702cd + 92703992ed6ce4e93326744b91e20cfc url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11410/64519/dullahan-1.1.901_3.3202.1686.gd665578-darwin64-511200.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11557/66312/dullahan-1.1.920_3.3202.1686.gd665578-darwin64-511302.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - bc7fead36b6ff9905af1005485b3e293 + fd0d6d9e70dd9b811c72866f8285b79b url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11413/64532/dullahan-1.1.901_3.3202.1686.gd665578-windows-511200.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11559/66324/dullahan-1.1.920_3.3202.1686.gd665578-windows-511302.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - 32acc396c6d7a369f0d2dc49b953dc89 + 5e3defb1f2fc98e23d940c321ee360c2 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11412/64535/dullahan-1.1.901_3.3202.1686.gd665578-windows64-511200.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11558/66318/dullahan-1.1.920_3.3202.1686.gd665578-windows64-511302.tar.bz2 name windows64 version - 1.1.901_3.3202.1686.gd665578 + 1.1.920_3.3202.1686.gd665578 elfio -- cgit v1.2.3 From 0b97c76dbb238fab079d10433ecf37045f6134ae Mon Sep 17 00:00:00 2001 From: callum_linden Date: Wed, 13 Dec 2017 13:55:33 -0800 Subject: Pull in Dullahan 1.1.925 with fix for onFileDialogCallback(..) handling that fixes MAINT-8083 --- autobuild.xml | 14 ++++----- indra/media_plugins/cef/media_plugin_cef.cpp | 47 +++++++++++++++++----------- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index acb1ec1473..3f2bf9a630 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - 92703992ed6ce4e93326744b91e20cfc + 1937f9f84f0f33563b9d33cf1c8e695a url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11557/66312/dullahan-1.1.920_3.3202.1686.gd665578-darwin64-511302.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11646/67094/dullahan-1.1.925_3.3202.1686.gd665578-darwin64-511376.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - fd0d6d9e70dd9b811c72866f8285b79b + 08edc9fa2dc586e7a1c7c4b7a6b6c548 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11559/66324/dullahan-1.1.920_3.3202.1686.gd665578-windows-511302.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11648/67101/dullahan-1.1.925_3.3202.1686.gd665578-windows-511376.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - 5e3defb1f2fc98e23d940c321ee360c2 + b220e427ade837e45a92fffab02c068f url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11558/66318/dullahan-1.1.920_3.3202.1686.gd665578-windows64-511302.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11649/67106/dullahan-1.1.925_3.3202.1686.gd665578-windows64-511376.tar.bz2 name windows64 version - 1.1.920_3.3202.1686.gd665578 + 1.1.925_3.3202.1686.gd665578 elfio diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 963c69aeb9..dbd33a736b 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -68,8 +68,7 @@ private: void onNavigateURLCallback(std::string url, std::string target); bool onHTTPAuthCallback(const std::string host, const std::string realm, std::string& username, std::string& password); void onCursorChangedCallback(dullahan::ECursorType type); - void onFileDownloadCallback(std::string filename); - const std::string onFileDialogCallback(); + const std::string onFileDialog(dullahan::EFileDialogType dialog_type, const std::string dialog_title, const std::string default_file, const std::string dialog_accept_filter, bool& use_default); void postDebugMessage(const std::string& msg); void authResponse(LLPluginMessage &message); @@ -285,30 +284,39 @@ bool MediaPluginCEF::onHTTPAuthCallback(const std::string host, const std::strin //////////////////////////////////////////////////////////////////////////////// // -void MediaPluginCEF::onFileDownloadCallback(const std::string filename) +const std::string MediaPluginCEF::onFileDialog(dullahan::EFileDialogType dialog_type, const std::string dialog_title, const std::string default_file, std::string dialog_accept_filter, bool& use_default) { - mAuthOK = false; + // do not use the default CEF file picker + use_default = false; - LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "file_download"); - message.setValue("filename", filename); + if (dialog_type == dullahan::FD_OPEN_FILE) + { + mPickedFile.clear(); - sendMessage(message); -} + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "pick_file"); + message.setValueBoolean("blocking_request", true); -//////////////////////////////////////////////////////////////////////////////// -// -const std::string MediaPluginCEF::onFileDialogCallback() -{ - mPickedFile.clear(); + sendMessage(message); - LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "pick_file"); - message.setValueBoolean("blocking_request", true); + return mPickedFile; + } + else if (dialog_type == dullahan::FD_SAVE_FILE) + { + mAuthOK = false; - sendMessage(message); + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "file_download"); + message.setValue("filename", default_file); + + sendMessage(message); + + return std::string(); + } - return mPickedFile; + return std::string(); } +//////////////////////////////////////////////////////////////////////////////// +// void MediaPluginCEF::onCursorChangedCallback(dullahan::ECursorType type) { std::string name = ""; @@ -341,6 +349,8 @@ void MediaPluginCEF::onCursorChangedCallback(dullahan::ECursorType type) sendMessage(message); } +//////////////////////////////////////////////////////////////////////////////// +// void MediaPluginCEF::authResponse(LLPluginMessage &message) { mAuthOK = message.getValueBoolean("ok"); @@ -442,8 +452,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string) mCEFLib->setOnAddressChangeCallback(std::bind(&MediaPluginCEF::onAddressChangeCallback, this, std::placeholders::_1)); mCEFLib->setOnNavigateURLCallback(std::bind(&MediaPluginCEF::onNavigateURLCallback, this, std::placeholders::_1, std::placeholders::_2)); mCEFLib->setOnHTTPAuthCallback(std::bind(&MediaPluginCEF::onHTTPAuthCallback, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4)); - mCEFLib->setOnFileDownloadCallback(std::bind(&MediaPluginCEF::onFileDownloadCallback, this, std::placeholders::_1)); - mCEFLib->setOnFileDialogCallback(std::bind(&MediaPluginCEF::onFileDialogCallback, this)); + mCEFLib->setOnFileDialogCallback(std::bind(&MediaPluginCEF::onFileDialog, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5)); mCEFLib->setOnCursorChangedCallback(std::bind(&MediaPluginCEF::onCursorChangedCallback, this, std::placeholders::_1)); mCEFLib->setOnRequestExitCallback(std::bind(&MediaPluginCEF::onRequestExitCallback, this)); -- cgit v1.2.3 From 6166ab28dd43304085b23c0d35698be9d90bb8a9 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Thu, 14 Dec 2017 14:27:49 -0800 Subject: Pull in Dullahan 1.1.929 (multiple file picking support) and update plugin code accordingly --- autobuild.xml | 14 +++++----- indra/llplugin/llpluginclassmedia.cpp | 12 +++++++-- indra/llplugin/llpluginclassmedia.h | 6 ++++- indra/media_plugins/cef/media_plugin_cef.cpp | 38 +++++++++++++++++++++------- indra/newview/llviewermedia.cpp | 34 +++++++++++++++++++------ 5 files changed, 77 insertions(+), 27 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 3f2bf9a630..9b89883f7f 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - 1937f9f84f0f33563b9d33cf1c8e695a + 4332ef6c8e8d7462ee42c99045b0cd87 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11646/67094/dullahan-1.1.925_3.3202.1686.gd665578-darwin64-511376.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11702/67585/dullahan-1.1.929_3.3202.1686.gd665578-darwin64-511421.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - 08edc9fa2dc586e7a1c7c4b7a6b6c548 + 001b4ae5c536ee625cf2f85e3bdf2d89 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11648/67101/dullahan-1.1.925_3.3202.1686.gd665578-windows-511376.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11703/67592/dullahan-1.1.929_3.3202.1686.gd665578-windows-511421.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - b220e427ade837e45a92fffab02c068f + 90f1926a1e3cd3ae56acd662ad9c0bdc url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11649/67106/dullahan-1.1.925_3.3202.1686.gd665578-windows64-511376.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11704/67597/dullahan-1.1.929_3.3202.1686.gd665578-windows64-511421.tar.bz2 name windows64 version - 1.1.925_3.3202.1686.gd665578 + 1.1.929_3.3202.1686.gd665578 elfio diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 680017204c..e6a9787da9 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -792,15 +792,22 @@ F64 LLPluginClassMedia::getCPUUsage() return result; } -void LLPluginClassMedia::sendPickFileResponse(const std::string &file) +void LLPluginClassMedia::sendPickFileResponse(const std::vector files) { LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "pick_file_response"); - message.setValue("file", file); if(mPlugin && mPlugin->isBlocked()) { // If the plugin sent a blocking pick-file request, the response should unblock it. message.setValueBoolean("blocking_response", true); } + + LLSD file_list = LLSD::emptyArray(); + for (std::vector::const_iterator in_iter = files.begin(); in_iter != files.end(); ++in_iter) + { + file_list.append(LLSD::String(*in_iter)); + } + message.setValueLLSD("file_list", file_list); + sendMessage(message); } @@ -1090,6 +1097,7 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) } else if(message_name == "pick_file") { + mIsMultipleFilePick = message.getValueBoolean("multiple_files"); mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_PICK_FILE_REQUEST); } else if(message_name == "auth_request") diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index 3b0739d044..98c48cd987 100644 --- a/indra/llplugin/llpluginclassmedia.h +++ b/indra/llplugin/llpluginclassmedia.h @@ -176,7 +176,7 @@ public: F64 getCPUUsage(); - void sendPickFileResponse(const std::string &file); + void sendPickFileResponse(const std::vector files); void sendAuthResponse(bool ok, const std::string &username, const std::string &password); @@ -277,6 +277,9 @@ public: std::string getAuthURL() const { return mAuthURL; }; std::string getAuthRealm() const { return mAuthRealm; }; + // These are valid during MEDIA_EVENT_PICK_FILE_REQUEST + bool getIsMultipleFilePick() const { return mIsMultipleFilePick; } + // These are valid during MEDIA_EVENT_LINK_HOVERED std::string getHoverText() const { return mHoverText; }; std::string getHoverLink() const { return mHoverLink; }; @@ -435,6 +438,7 @@ protected: std::string mHoverText; std::string mHoverLink; std::string mFileDownloadFilename; + bool mIsMultipleFilePick; ///////////////////////////////////////// // media_time class diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index dbd33a736b..558ae75c3c 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -68,7 +68,7 @@ private: void onNavigateURLCallback(std::string url, std::string target); bool onHTTPAuthCallback(const std::string host, const std::string realm, std::string& username, std::string& password); void onCursorChangedCallback(dullahan::ECursorType type); - const std::string onFileDialog(dullahan::EFileDialogType dialog_type, const std::string dialog_title, const std::string default_file, const std::string dialog_accept_filter, bool& use_default); + const std::vector onFileDialog(dullahan::EFileDialogType dialog_type, const std::string dialog_title, const std::string default_file, const std::string dialog_accept_filter, bool& use_default); void postDebugMessage(const std::string& msg); void authResponse(LLPluginMessage &message); @@ -94,7 +94,7 @@ private: bool mCanPaste; std::string mCachePath; std::string mCookiePath; - std::string mPickedFile; + std::vector mPickedFiles; VolumeCatcher mVolumeCatcher; F32 mCurVolume; dullahan* mCEFLib; @@ -124,7 +124,7 @@ MediaPluginBase(host_send_func, host_user_data) mCanPaste = false; mCachePath = ""; mCookiePath = ""; - mPickedFile = ""; + mPickedFiles.clear(); mCurVolume = 0.0; mCEFLib = new dullahan(); @@ -284,21 +284,34 @@ bool MediaPluginCEF::onHTTPAuthCallback(const std::string host, const std::strin //////////////////////////////////////////////////////////////////////////////// // -const std::string MediaPluginCEF::onFileDialog(dullahan::EFileDialogType dialog_type, const std::string dialog_title, const std::string default_file, std::string dialog_accept_filter, bool& use_default) +const std::vector MediaPluginCEF::onFileDialog(dullahan::EFileDialogType dialog_type, const std::string dialog_title, const std::string default_file, std::string dialog_accept_filter, bool& use_default) { // do not use the default CEF file picker use_default = false; if (dialog_type == dullahan::FD_OPEN_FILE) { - mPickedFile.clear(); + mPickedFiles.clear(); LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "pick_file"); message.setValueBoolean("blocking_request", true); + message.setValueBoolean("multiple_files", false); sendMessage(message); - return mPickedFile; + return mPickedFiles; + } + else if (dialog_type == dullahan::FD_OPEN_MULTIPLE_FILES) + { + mPickedFiles.clear(); + + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "pick_file"); + message.setValueBoolean("blocking_request", true); + message.setValueBoolean("multiple_files", true); + + sendMessage(message); + + return mPickedFiles; } else if (dialog_type == dullahan::FD_SAVE_FILE) { @@ -309,10 +322,10 @@ const std::string MediaPluginCEF::onFileDialog(dullahan::EFileDialogType dialog_ sendMessage(message); - return std::string(); + return std::vector(); } - return std::string(); + return std::vector(); } //////////////////////////////////////////////////////////////////////////////// @@ -659,7 +672,14 @@ void MediaPluginCEF::receiveMessage(const char* message_string) } if (message_name == "pick_file_response") { - mPickedFile = message_in.getValue("file"); + LLSD file_list_llsd = message_in.getValueLLSD("file_list"); + + LLSD::array_const_iterator iter = file_list_llsd.beginArray(); + LLSD::array_const_iterator end = file_list_llsd.endArray(); + for (; iter != end; ++iter) + { + mPickedFiles.push_back(((*iter).asString())); + } } if (message_name == "auth_response") { diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 114f1d327b..9dd8b00ef6 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -3480,22 +3480,40 @@ void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* plugin, LLPluginCla case LLViewerMediaObserver::MEDIA_EVENT_PICK_FILE_REQUEST: { - // Display a file picker - std::string response; - LLFilePicker& picker = LLFilePicker::instance(); - if (!picker.getOpenFile(LLFilePicker::FFLOAD_ALL)) + std::vector responses; + + bool pick_multiple_files = plugin->getIsMultipleFilePick(); + if (pick_multiple_files == false) { - // The user didn't pick a file -- the empty response string will indicate this. + picker.getOpenFile(LLFilePicker::FFLOAD_ALL); + + std::string filename = picker.getFirstFile(); + responses.push_back(filename); } + else + { + if (picker.getMultipleOpenFiles()) + { + std::string filename = picker.getFirstFile(); - response = picker.getFirstFile(); + responses.push_back(filename); - plugin->sendPickFileResponse(response); + while (!filename.empty()) + { + filename = picker.getNextFile(); + + if (!filename.empty()) + { + responses.push_back(filename); + } + } + } + } + plugin->sendPickFileResponse(responses); } break; - case LLViewerMediaObserver::MEDIA_EVENT_AUTH_REQUEST: { LLNotification::Params auth_request_params; -- cgit v1.2.3 From 6ced87c0275ec20fca994f8d2f61947d5ac62082 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 15 Dec 2017 16:11:29 -0800 Subject: Pull in Dullahan 1.1.930 with improved fix for maint-8095 (target='_blank' links) as well as an improvement for maint-8100 (no error message for invalid hostname / url) --- autobuild.xml | 14 +++++++------- indra/llplugin/llpluginclassmedia.cpp | 7 ++++++- indra/media_plugins/cef/media_plugin_cef.cpp | 19 ++++++++++++++++++- indra/newview/llmediactrl.cpp | 2 +- 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 9b89883f7f..22480d67a0 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - 4332ef6c8e8d7462ee42c99045b0cd87 + 8fc07fd39e8ba33473aa01f156c7eb27 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11702/67585/dullahan-1.1.929_3.3202.1686.gd665578-darwin64-511421.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11784/68150/dullahan-1.1.930_3.3202.1686.gd665578-darwin64-511466.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - 001b4ae5c536ee625cf2f85e3bdf2d89 + 4cee3e5ce9e27053fb2143898a1b00c2 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11703/67592/dullahan-1.1.929_3.3202.1686.gd665578-windows-511421.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11785/68157/dullahan-1.1.930_3.3202.1686.gd665578-windows-511466.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - 90f1926a1e3cd3ae56acd662ad9c0bdc + 6b014f4f4f001179899ac1a4824ed225 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11704/67597/dullahan-1.1.929_3.3202.1686.gd665578-windows64-511421.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11786/68162/dullahan-1.1.930_3.3202.1686.gd665578-windows64-511466.tar.bz2 name windows64 version - 1.1.929_3.3202.1686.gd665578 + 1.1.930_3.3202.1686.gd665578 elfio diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index e6a9787da9..9d275c5eeb 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -1159,7 +1159,12 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message) { mClickURL = message.getValue("uri"); mClickTarget = message.getValue("target"); - mClickUUID = message.getValue("uuid"); + + // need a link to have a UUID that identifies it to a system further + // upstream - plugin could make it but we have access to LLUUID here + // so why don't we use it + mClickUUID = LLUUID::generateNewID().asString(); + mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_CLICK_LINK_HREF); } else if(message_name == "click_nofollow") diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 558ae75c3c..a8d37a1d0a 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -38,6 +38,7 @@ #include "media_plugin_base.h" #include +#include #include "dullahan.h" @@ -64,6 +65,7 @@ private: void onLoadStartCallback(); void onRequestExitCallback(); void onLoadEndCallback(int httpStatusCode); + void onLoadError(int status, const std::string error_text); void onAddressChangeCallback(std::string url); void onNavigateURLCallback(std::string url, std::string target); bool onHTTPAuthCallback(const std::string host, const std::string realm, std::string& username, std::string& password); @@ -207,6 +209,21 @@ void MediaPluginCEF::onLoadStartCallback() sendMessage(message); } +///////////////////////////////////////////////////////////////////////////////// +// +void MediaPluginCEF::onLoadError(int status, const std::string error_text) +{ + std::stringstream msg; + + msg << "Loading error!"; + msg << "

"; + msg << "Message: " << error_text; + msg << "
"; + msg << "Code: " << status; + + mCEFLib->showBrowserMessage(msg.str()); +} + //////////////////////////////////////////////////////////////////////////////// // void MediaPluginCEF::onRequestExitCallback() @@ -245,7 +262,6 @@ void MediaPluginCEF::onNavigateURLCallback(std::string url, std::string target) LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "click_href"); message.setValue("uri", url); message.setValue("target", target); - message.setValue("uuid", ""); // not used right now sendMessage(message); } @@ -462,6 +478,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string) mCEFLib->setOnTitleChangeCallback(std::bind(&MediaPluginCEF::onTitleChangeCallback, 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)); mCEFLib->setOnAddressChangeCallback(std::bind(&MediaPluginCEF::onAddressChangeCallback, this, std::placeholders::_1)); mCEFLib->setOnNavigateURLCallback(std::bind(&MediaPluginCEF::onNavigateURLCallback, this, std::placeholders::_1, std::placeholders::_2)); mCEFLib->setOnHTTPAuthCallback(std::bind(&MediaPluginCEF::onHTTPAuthCallback, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4)); diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp index a8025906c7..7f6955d08c 100644 --- a/indra/newview/llmediactrl.cpp +++ b/indra/newview/llmediactrl.cpp @@ -1022,7 +1022,7 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) // try as slurl first if (!LLURLDispatcher::dispatch(url, "clicked", NULL, mTrusted)) { - LLWeb::loadURL(url, target, std::string()); + LLWeb::loadURL(url, target, uuid); } // CP: removing this code because we no longer support popups so this breaks the flow. -- cgit v1.2.3 From 81e5be87161c2ab1f518d57d249761fc5a42ad95 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Wed, 3 Jan 2018 16:26:17 -0800 Subject: FIX MAINT-8131 Update viewer with Windows version of Dullahan built against CEF 3.3239.1716.g735b746 / Chromium 63.0.3239.109 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index ac496d4ec0..bf29c5bf8e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - 8fc07fd39e8ba33473aa01f156c7eb27 + 0f12a0f37821985431e96a07d2d32350 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11784/68150/dullahan-1.1.930_3.3202.1686.gd665578-darwin64-511466.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12052/70522/dullahan-1.1.930_3.3202.1686.gd665578-darwin64-511657.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - 4cee3e5ce9e27053fb2143898a1b00c2 + 65b08b2691b38afc502b5fe9d582e1d5 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11785/68157/dullahan-1.1.930_3.3202.1686.gd665578-windows-511466.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12054/70529/dullahan-1.1.930_3.3239.1716.g735b746-windows-511657.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - 6b014f4f4f001179899ac1a4824ed225 + 548a8f56031c852a2d09673f82df95ea url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11786/68162/dullahan-1.1.930_3.3202.1686.gd665578-windows64-511466.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12053/70534/dullahan-1.1.930_3.3239.1716.g735b746-windows64-511657.tar.bz2 name windows64 version - 1.1.930_3.3202.1686.gd665578 + 1.1.930_3.3239.1716.g735b746 elfio -- cgit v1.2.3 From 25b8042f18fca3e1ee9c96acae2ce0ea214c2ec8 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Thu, 4 Jan 2018 16:17:40 -0800 Subject: Pull in version of Dullahan that allows for browser resizing - not quite working for videos yet though --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index bf29c5bf8e..e396ec8b54 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - 0f12a0f37821985431e96a07d2d32350 + 4a74c14d2f0f70c475a1d28c56666db8 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12052/70522/dullahan-1.1.930_3.3202.1686.gd665578-darwin64-511657.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12088/70969/dullahan-1.1.956_3.3202.1686.gd665578-darwin64-511676.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - 65b08b2691b38afc502b5fe9d582e1d5 + 96664f0089b1b42cc85dfa5eb62552fa url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12054/70529/dullahan-1.1.930_3.3239.1716.g735b746-windows-511657.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12090/70976/dullahan-1.1.956_3.3239.1716.g735b746-windows-511676.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - 548a8f56031c852a2d09673f82df95ea + e41ed5a655e1efaeab81c5c75eaa2fed url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12053/70534/dullahan-1.1.930_3.3239.1716.g735b746-windows64-511657.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12089/70981/dullahan-1.1.956_3.3239.1716.g735b746-windows64-511676.tar.bz2 name windows64 version - 1.1.930_3.3239.1716.g735b746 + 1.1.956_3.3239.1716.g735b746 elfio -- cgit v1.2.3 From 6deefc1f6448a4f40fe75fb85ef11f0746e31d69 Mon Sep 17 00:00:00 2001 From: callum Date: Thu, 4 Jan 2018 17:36:52 -0800 Subject: Pull in libVLC binaries version 2.2.8 for Win32/Win64 only --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index e396ec8b54..f56980d1d2 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3287,9 +3287,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - c5e6d9440e3a4a12102dd2bbb703963e + 8977d9277c4df068e7ab7039fc162594 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/2225/4736/vlc_bin-2.2.4.502214-darwin64-502214.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11979/69784/vlc_bin-2.2.4.511601-darwin64-511601.tar.bz2 name darwin64 @@ -3311,9 +3311,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - dc37f7cc77a62891bb9ae46c9e19f95e + 1deaeb25217e1a6188b2d6ab4ea0b8bb url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1219/2834/vlc_bin-2.2.4.501207-windows-501207.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11980/69791/vlc_bin-2.2.8.511601-windows-511601.tar.bz2 name windows @@ -3323,16 +3323,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 148ee599afeba9794de14ca433389504 + fcbe6a67a34e1fd932751263a7ccec6e url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/1218/2829/vlc_bin-2.2.4.501207-windows64-501207.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11981/69796/vlc_bin-2.2.8.511601-windows64-511601.tar.bz2 name windows64 version - 2.2.4.502214 + 2.2.8.511601 xmlrpc-epi -- cgit v1.2.3 From e4d55abb007112f10e06f6c01925dff281721f78 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Thu, 4 Jan 2018 19:51:53 -0800 Subject: pull in unified 3p Dullahan version 1.1.987 and CEF Version 3239.1716 for all platforms --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index f56980d1d2..d2302291f7 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - 4a74c14d2f0f70c475a1d28c56666db8 + 3b00238ead5eda28dd050b4afcbd17b2 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12088/70969/dullahan-1.1.956_3.3202.1686.gd665578-darwin64-511676.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12140/71433/dullahan-1.1.987_3.3239.1716.g735b746-darwin64-511702.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - 96664f0089b1b42cc85dfa5eb62552fa + ba5ac9ea5e1ee38d15eb01463928f025 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12090/70976/dullahan-1.1.956_3.3239.1716.g735b746-windows-511676.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12142/71440/dullahan-1.1.987_3.3239.1716.g735b746-windows-511702.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - e41ed5a655e1efaeab81c5c75eaa2fed + 3b98c4f5389fee432cf90e8645052f0a url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12089/70981/dullahan-1.1.956_3.3239.1716.g735b746-windows64-511676.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12141/71445/dullahan-1.1.987_3.3239.1716.g735b746-windows64-511702.tar.bz2 name windows64 version - 1.1.956_3.3239.1716.g735b746 + 1.1.987_3.3239.1716.g735b746 elfio -- cgit v1.2.3 From 99c0c496a5395adbd132d6e0cfcde0b8b882cc84 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Thu, 4 Jan 2018 19:54:48 -0800 Subject: pull in unified LibVLC 2.2.8 for all platforms --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index d2302291f7..03f6604b08 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3287,9 +3287,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 8977d9277c4df068e7ab7039fc162594 + e5635e173c75dc0675b48ab5f5e4868b url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11979/69784/vlc_bin-2.2.4.511601-darwin64-511601.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12143/71451/vlc_bin-2.2.8.511703-darwin64-511703.tar.bz2 name darwin64 @@ -3311,9 +3311,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 1deaeb25217e1a6188b2d6ab4ea0b8bb + add560654a53cb1c554044a4fac3c718 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11980/69791/vlc_bin-2.2.8.511601-windows-511601.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12144/71458/vlc_bin-2.2.8.511703-windows-511703.tar.bz2 name windows @@ -3323,16 +3323,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - fcbe6a67a34e1fd932751263a7ccec6e + 94bf04b49acc1e1bf2c06e2232f8a083 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11981/69796/vlc_bin-2.2.8.511601-windows64-511601.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12145/71463/vlc_bin-2.2.8.511703-windows64-511703.tar.bz2 name windows64 version - 2.2.8.511601 + 2.2.8.511703 xmlrpc-epi -- cgit v1.2.3 From aa23ae29a557df8346db35972198b4d6cee7761b Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 5 Jan 2018 18:26:54 -0800 Subject: Update for MAINT-8153 - updating CEF to newer version - now 3.3239.1721.g86eb141 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 03f6604b08..920bba7e3d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - 3b00238ead5eda28dd050b4afcbd17b2 + 34687348efb2cd3a6de14a8f80dcbc67 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12140/71433/dullahan-1.1.987_3.3239.1716.g735b746-darwin64-511702.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12187/71752/dullahan-1.1.987_3.3239.1721.g86eb141-darwin64-511726.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - ba5ac9ea5e1ee38d15eb01463928f025 + dd887ae03c01ad8347ba5ee98735fa0b url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12142/71440/dullahan-1.1.987_3.3239.1716.g735b746-windows-511702.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12188/71758/dullahan-1.1.987_3.3239.1721.g86eb141-windows-511726.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - 3b98c4f5389fee432cf90e8645052f0a + 613025e264c9ddd47462bc7b57efcb4d url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12141/71445/dullahan-1.1.987_3.3239.1716.g735b746-windows64-511702.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12189/71764/dullahan-1.1.987_3.3239.1721.g86eb141-windows64-511726.tar.bz2 name windows64 version - 1.1.987_3.3239.1716.g735b746 + 1.1.987_3.3239.1721.g86eb141 elfio -- cgit v1.2.3 From 5989dd1673768660587552fbab0d7fa2851359c2 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 8 Jan 2018 11:22:02 -0800 Subject: Bump CEF Plugin version so it can be identified as different --- indra/media_plugins/cef/media_plugin_cef.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index a8d37a1d0a..1dfa9c1d0b 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -412,7 +412,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string) versions[LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER] = LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER_VERSION; message.setValueLLSD("versions", versions); - std::string plugin_version = "CEF plugin 1.1.3"; + std::string plugin_version = "CEF plugin 1.2.0"; message.setValue("plugin_version", plugin_version); sendMessage(message); } -- cgit v1.2.3 From 8f214ad00b4444e9ed876f92da56bda15310a374 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 8 Jan 2018 14:51:32 -0800 Subject: Fix for MAINT-7886 Resizing internal web browser window causes video playback to stop --- indra/media_plugins/cef/media_plugin_cef.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 1dfa9c1d0b..b8901e4d5c 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -167,6 +167,10 @@ void MediaPluginCEF::onPageChangedCallback(const unsigned char* pixels, int x, i { memcpy(mPixels, pixels, mWidth * mHeight * mDepth); } + else + { + mCEFLib->setSize(mWidth, mHeight); + } setDirty(0, 0, mWidth, mHeight); } } @@ -412,7 +416,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string) versions[LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER] = LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER_VERSION; message.setValueLLSD("versions", versions); - std::string plugin_version = "CEF plugin 1.2.0"; + std::string plugin_version = "CEF plugin 1.1.3"; message.setValue("plugin_version", plugin_version); sendMessage(message); } @@ -559,11 +563,11 @@ void MediaPluginCEF::receiveMessage(const char* message_string) mTextureWidth = texture_width; mTextureHeight = texture_height; + + mCEFLib->setSize(mWidth, mHeight); }; }; - mCEFLib->setSize(mWidth, mHeight); - LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "size_change_response"); message.setValue("name", name); message.setValueS32("width", width); -- cgit v1.2.3 From 3bd84c2f2f01e05907a651ebbba5f21ade2bdb44 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Thu, 11 Jan 2018 09:07:22 -0800 Subject: Pull in latest Dullahan (v1.1.1002) and CEF (3239.1723.g071d1c1) --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 67a7436ba2..1fdeb385f5 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - 34687348efb2cd3a6de14a8f80dcbc67 + a0083438df270a708e70b58117003a72 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12187/71752/dullahan-1.1.987_3.3239.1721.g86eb141-darwin64-511726.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12298/72708/dullahan-1.1.1002_3.3239.1723.g071d1c1-darwin64-511802.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - dd887ae03c01ad8347ba5ee98735fa0b + 33b5f85a9f486bad5f40c98c35e67d1b url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12188/71758/dullahan-1.1.987_3.3239.1721.g86eb141-windows-511726.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12299/72715/dullahan-1.1.1002_3.3239.1723.g071d1c1-windows-511802.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - 613025e264c9ddd47462bc7b57efcb4d + b07cd0aa48a03e91462a7cecae1aadbe url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12189/71764/dullahan-1.1.987_3.3239.1721.g86eb141-windows64-511726.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12300/72720/dullahan-1.1.1002_3.3239.1723.g071d1c1-windows64-511802.tar.bz2 name windows64 version - 1.1.987_3.3239.1721.g86eb141 + 1.1.1002_3.3239.1723.g071d1c1 elfio -- cgit v1.2.3 From e84e4a1adf29b3a807c9d0c0e4841b5f12ea9756 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Thu, 11 Jan 2018 10:32:23 -0800 Subject: Fix for MAINT-8177 Expose the full version of the matching Chromium/Chrome build for CEF in the About box --- indra/newview/llappviewer.cpp | 8 +++++++- indra/newview/skins/default/xui/en/floater_about.xml | 12 ++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index b33b3a6410..e827a728ae 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3178,8 +3178,14 @@ LLSD LLAppViewer::getViewerInfo() const cef_ver_codec << " / CEF: "; cef_ver_codec << CEF_VERSION; - cef_ver_codec << " / Chrome: "; + cef_ver_codec << " / Chromium: "; cef_ver_codec << CHROME_VERSION_MAJOR; + cef_ver_codec << "."; + cef_ver_codec << CHROME_VERSION_MINOR; + cef_ver_codec << "."; + cef_ver_codec << CHROME_VERSION_BUILD; + cef_ver_codec << "."; + cef_ver_codec << CHROME_VERSION_PATCH; info["LIBCEF_VERSION"] = cef_ver_codec.str(); #else diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 60f36770bb..71f4d81195 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -8,14 +8,14 @@ help_topic="floater_about" save_rect="true" title="ABOUT [CAPITALIZED_APP_NAME]" - width="470"> + width="500"> - - - - - - Web: - - - - - Date: Mon, 22 Jan 2018 13:30:03 -0800 Subject: Bring in the very latest version of Dullahan (1.1.1024) that matches the most recent canonical Dullahan and also bump the CEF plugin version in preparation for the RC build --- autobuild.xml | 14 +++++++------- indra/media_plugins/cef/media_plugin_cef.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index bceedc7b83..a4d0290a21 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - a6f1637aaa4008e67bb08a6475fd3b45 + 7ceea1aaa8681497295770d78bfd980e url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12547/74441/dullahan-1.1.1012_3.3239.1723.g071d1c1-darwin64-511947.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12667/75407/dullahan-1.1.1024_3.3239.1723.g071d1c1-darwin64-512020.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - 0cba7891453cb9d0dca9ea86eef684c2 + 08d2b293087bedba2bca31ce7c517510 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12549/74448/dullahan-1.1.1012_3.3239.1723.g071d1c1-windows-511947.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12669/75414/dullahan-1.1.1024_3.3239.1723.g071d1c1-windows-512020.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - 0615f3e0cd3f4086efdff52da85fe84d + e3f9837d9ea2be0b162f4fce3e0118ab url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12548/74451/dullahan-1.1.1012_3.3239.1723.g071d1c1-windows64-511947.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12668/75419/dullahan-1.1.1024_3.3239.1723.g071d1c1-windows64-512020.tar.bz2 name windows64 version - 1.1.1012_3.3239.1723.g071d1c1 + 1.1.1024_3.3239.1723.g071d1c1 elfio diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 67164ca0af..88317655ab 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -416,7 +416,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string) versions[LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER] = LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER_VERSION; message.setValueLLSD("versions", versions); - std::string plugin_version = "CEF plugin 1.1.3"; + std::string plugin_version = "CEF plugin 1.1.412"; message.setValue("plugin_version", plugin_version); sendMessage(message); } -- cgit v1.2.3 From 5fa704e4791c46ff94bdc3206c49d1640d251a1d Mon Sep 17 00:00:00 2001 From: callum_linden Date: Wed, 24 Jan 2018 13:16:07 -0800 Subject: MAINT-8232 Clear History button description should not include 'web' --- indra/newview/skins/default/xui/en/panel_preferences_privacy.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index 284688d4d1..f0a059ddb2 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -19,7 +19,7 @@ follows="left|top" height="23" label="Clear History" - tool_tip="Clear login image, last location, teleport history, web, and texture cache" + tool_tip="Clear login image, last location, teleport history, and texture cache" layout="topleft" left="30" name="clear_cache" @@ -41,7 +41,7 @@ top_delta="3" text_color="LtGray_50" width="300"> - (Locations, images, web, search history) + (Locations, images, search history) Date: Thu, 25 Jan 2018 11:29:47 -0800 Subject: MAINT-8232 Clear History button description should not include 'web' - incorrect assertionm that web cache not cleared --- indra/newview/skins/default/xui/en/panel_preferences_privacy.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index f0a059ddb2..2ec5cef640 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -19,7 +19,7 @@ follows="left|top" height="23" label="Clear History" - tool_tip="Clear login image, last location, teleport history, and texture cache" + tool_tip="Clear login image, last location, teleport history, web and texture cache" layout="topleft" left="30" name="clear_cache" @@ -41,7 +41,7 @@ top_delta="3" text_color="LtGray_50" width="300"> - (Locations, images, search history) + (Locations, images, web, search history) Date: Fri, 26 Jan 2018 11:54:52 -0800 Subject: Fix for: MAINT-8138 Generate new page of test URLs for Dullahan that are more complete and more robust (last stage was creation of S3 non-user specific URL) --- indra/newview/skins/default/xui/en/floater_web_content.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml index 83118615f9..9a097d933b 100644 --- a/indra/newview/skins/default/xui/en/floater_web_content.xml +++ b/indra/newview/skins/default/xui/en/floater_web_content.xml @@ -178,7 +178,7 @@ width="22"> + parameter="https://sl-viewer-media-system.s3.amazonaws.com/index.html"/> Date: Fri, 26 Jan 2018 17:06:19 -0800 Subject: Fixes for: MAINT-8244 Text in CEF cannot be selected with the mouse. MAINT-8245 Expose CEF log file and logging severity to viewer and MAINT-8246 Expose the CEF remote debugging system to the viewer --- autobuild.xml | 14 +++++++------- indra/llplugin/llpluginclassmedia.cpp | 11 ++++++++++- indra/llplugin/llpluginclassmedia.h | 2 +- indra/media_plugins/cef/media_plugin_cef.cpp | 9 +++++++++ indra/newview/app_settings/settings.xml | 11 +++++++++++ indra/newview/llviewermedia.cpp | 5 +++-- 6 files changed, 41 insertions(+), 11 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index a4d0290a21..f1d22d5b93 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - 7ceea1aaa8681497295770d78bfd980e + 8352a71136eea487ca55784afe6bf947 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12667/75407/dullahan-1.1.1024_3.3239.1723.g071d1c1-darwin64-512020.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12933/78534/dullahan-1.1.1035_3.3239.1723.g071d1c1-darwin64-512195.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - 08d2b293087bedba2bca31ce7c517510 + 47cb40945d649d92d3a428fdf129fa5d url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12669/75414/dullahan-1.1.1024_3.3239.1723.g071d1c1-windows-512020.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12935/78546/dullahan-1.1.1035_3.3239.1723.g071d1c1-windows-512195.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - e3f9837d9ea2be0b162f4fce3e0118ab + 8a0bdf89bba7139f1c23ff2081584b2e url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12668/75419/dullahan-1.1.1024_3.3239.1723.g071d1c1-windows64-512020.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12934/78543/dullahan-1.1.1035_3.3239.1723.g071d1c1-windows64-512195.tar.bz2 name windows64 version - 1.1.1024_3.3239.1723.g071d1c1 + 1.1.1035_3.3239.1723.g071d1c1 elfio diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index a857ff0153..78eb6e75bb 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -31,6 +31,9 @@ #include "llpluginclassmedia.h" #include "llpluginmessageclasses.h" +#include "llcontrol.h" + +extern LLControlGroup gSavedSettings; static int LOW_PRIORITY_TEXTURE_SIZE_DEFAULT = 256; @@ -843,11 +846,17 @@ void LLPluginClassMedia::paste() sendMessage(message); } -void LLPluginClassMedia::setUserDataPath(const std::string &user_data_path_cache, const std::string &user_data_path_cookies) +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"); + message.setValueBoolean("cef_verbose_log", cef_verbose_log); sendMessage(message); } diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h index dcd8af4e06..3b3075c6bd 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); + 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 88317655ab..bdd394da4b 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -96,6 +96,8 @@ private: bool mCanPaste; std::string mCachePath; std::string mCookiePath; + std::string mCefLogFile; + bool mCefLogVerbose; std::vector mPickedFiles; VolumeCatcher mVolumeCatcher; F32 mCurVolume; @@ -126,6 +128,8 @@ MediaPluginBase(host_send_func, host_user_data) mCanPaste = false; mCachePath = ""; mCookiePath = ""; + mCefLogFile = ""; + mCefLogVerbose = false; mPickedFiles.clear(); mCurVolume = 0.0; @@ -511,6 +515,8 @@ void MediaPluginCEF::receiveMessage(const char* message_string) settings.plugins_enabled = mPluginsEnabled; settings.user_agent_substring = mCEFLib->makeCompatibleUserAgentString(mUserAgentSubtring); settings.webgl_enabled = true; + settings.log_file = mCefLogFile; + settings.log_verbose = mCefLogVerbose; std::vector custom_schemes(1, "secondlife"); mCEFLib->setCustomSchemes(custom_schemes); @@ -540,8 +546,11 @@ void MediaPluginCEF::receiveMessage(const char* message_string) { std::string user_data_path_cache = message_in.getValue("cache_path"); 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"); } else if (message_name == "size_change") { diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4a4f4bfc61..11c34dacb5 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -16155,6 +16155,17 @@ Value 0 + CefVerboseLog + + Comment + Enable/disable CEF verbose loggingk + Persist + 1 + Type + Boolean + Value + 0 + diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 1d4079289a..c92de6ada5 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1686,6 +1686,8 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ 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.) // If the linden username returned is blank, that can only mean we are // at the login page displaying login Web page or Web browser test via Develop menu. @@ -1694,7 +1696,6 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ std::string linden_user_dir = gDirUtilp->getLindenUserDir(); if ( ! linden_user_dir.empty() ) { - // gDirUtilp->getLindenUserDir() is whole path, not just Linden name user_data_path_cookies = linden_user_dir; user_data_path_cookies += gDirUtilp->getDirDelimiter(); }; @@ -1715,7 +1716,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); + 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 b2eb85df79f317d2b587c969178cea9b96c81213 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 29 Jan 2018 16:47:36 -0800 Subject: Speculative fix for MAINT-8250 Popups can appear in an unnamed new window external of the viewer. Note: This was a fix for a threading issue in Dullahan that caused clicking on links with target of 'new' to crash. I think it's the same issue here and manifests itself as CEF creating a new OS window. --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index f1d22d5b93..9932b36ad1 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - 8352a71136eea487ca55784afe6bf947 + 35b3fca493235ff590c5bb58b28f56bd url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12933/78534/dullahan-1.1.1035_3.3239.1723.g071d1c1-darwin64-512195.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13031/79689/dullahan-1.1.1040_3.3239.1723.g071d1c1-darwin64-512263.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - 47cb40945d649d92d3a428fdf129fa5d + dc8a50e9afc7ff974faec8301e8eb6a3 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12935/78546/dullahan-1.1.1035_3.3239.1723.g071d1c1-windows-512195.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13032/79696/dullahan-1.1.1040_3.3239.1723.g071d1c1-windows-512263.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - 8a0bdf89bba7139f1c23ff2081584b2e + fd45e9c73d334e0093a67b7b94abb994 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12934/78543/dullahan-1.1.1035_3.3239.1723.g071d1c1-windows64-512195.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13033/79701/dullahan-1.1.1040_3.3239.1723.g071d1c1-windows64-512263.tar.bz2 name windows64 version - 1.1.1035_3.3239.1723.g071d1c1 + 1.1.1040_3.3239.1723.g071d1c1 elfio -- cgit v1.2.3 From 5f12e0e63d8211e40a427a764f86af71f331d0d0 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Thu, 1 Mar 2018 09:33:23 -0800 Subject: Pull in newer version of Dullahan (1.1.1050) that is built against newer version of CEF (3282.1741.gcd94615) --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index dbb1933622..088dd4638e 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - 35b3fca493235ff590c5bb58b28f56bd + 06e6bb2aa2614b6a7b86a08dce8746ad url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13031/79689/dullahan-1.1.1040_3.3239.1723.g071d1c1-darwin64-512263.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14190/88872/dullahan-1.1.1050_3.3282.1742.g96f907e-darwin64-512926.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - dc8a50e9afc7ff974faec8301e8eb6a3 + 59b5f320601c1a57d1706dcc791a4110 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13032/79696/dullahan-1.1.1040_3.3239.1723.g071d1c1-windows-512263.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14191/88879/dullahan-1.1.1050_3.3282.1742.g96f907e-windows-512926.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - fd45e9c73d334e0093a67b7b94abb994 + 0d2da40e7c187bfb3f366561836e40a8 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13033/79701/dullahan-1.1.1040_3.3239.1723.g071d1c1-windows64-512263.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14192/88884/dullahan-1.1.1050_3.3282.1742.g96f907e-windows64-512926.tar.bz2 name windows64 version - 1.1.1040_3.3239.1723.g071d1c1 + 1.1.1050_3.3282.1742.g96f907e elfio -- cgit v1.2.3 From 278382abd72a02b5e190cb259d2b4806f3908902 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Thu, 1 Mar 2018 09:34:25 -0800 Subject: Now CEF supports setting default page background if specifier missing from HTML, set default background color to the Linden default grey (#282828) --- indra/media_plugins/cef/media_plugin_cef.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index bdd394da4b..d6a6232221 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -496,7 +496,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string) dullahan::dullahan_settings settings; settings.accept_language_list = mHostLanguage; - settings.background_color = 0xffffffff; + settings.background_color = 0xff282828; settings.cache_enabled = true; settings.cache_path = mCachePath; settings.cookie_store_path = mCookiePath; -- cgit v1.2.3 From f3e11510ddfb99a83f9f155f6957c2eca5dc2fba Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 2 Mar 2018 16:21:53 -0800 Subject: Replace start page for media browser with DuckDuckGo.com - Google page was offset at that window size and was irritating --- indra/newview/skins/default/xui/en/menu_login.xml | 2 +- indra/newview/skins/default/xui/en/menu_viewer.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 4e2f819023..07b3cc3bd8 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -245,7 +245,7 @@ name="Media Browser"> + parameter="http://duckduckgo.com"/>

+ parameter="http://duckduckgo.com"/> Date: Thu, 15 Mar 2018 16:12:52 -0700 Subject: Pull in latest version of Dullahan (1.1.1072) and tweak media plugin code to match change in API --- autobuild.xml | 14 +++++++------- indra/media_plugins/cef/media_plugin_cef.cpp | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 9e4d93c5e2..8b33ecca68 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - 06e6bb2aa2614b6a7b86a08dce8746ad + 94e26e96326bd503ddd708507c462a0c url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14190/88872/dullahan-1.1.1050_3.3282.1742.g96f907e-darwin64-512926.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14898/96414/dullahan-1.1.1072_3.3325.1746.ge81cdf2-darwin64-513318.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - 59b5f320601c1a57d1706dcc791a4110 + cd3e02d7fb3ca7394ecd9384268e34e0 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14191/88879/dullahan-1.1.1050_3.3282.1742.g96f907e-windows-512926.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14900/96423/dullahan-1.1.1072_3.3325.1746.ge81cdf2-windows-513318.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - 0d2da40e7c187bfb3f366561836e40a8 + 030698603f97bc6d8ad1ba6644a0f59c url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14192/88884/dullahan-1.1.1050_3.3282.1742.g96f907e-windows64-512926.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14899/96424/dullahan-1.1.1072_3.3325.1746.ge81cdf2-windows64-513318.tar.bz2 name windows64 version - 1.1.1050_3.3282.1742.g96f907e + 1.1.1072_3.3325.1746.ge81cdf2 elfio diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index d6a6232221..189beb75ba 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -67,7 +67,7 @@ private: void onLoadEndCallback(int httpStatusCode); void onLoadError(int status, const std::string error_text); void onAddressChangeCallback(std::string url); - void onNavigateURLCallback(std::string url, std::string target); + void onOpenPopupCallback(std::string url, std::string target); bool onHTTPAuthCallback(const std::string host, const std::string realm, std::string& username, std::string& password); void onCursorChangedCallback(dullahan::ECursorType type); const std::vector onFileDialog(dullahan::EFileDialogType dialog_type, const std::string dialog_title, const std::string default_file, const std::string dialog_accept_filter, bool& use_default); @@ -265,7 +265,7 @@ void MediaPluginCEF::onAddressChangeCallback(std::string url) //////////////////////////////////////////////////////////////////////////////// // -void MediaPluginCEF::onNavigateURLCallback(std::string url, std::string target) +void MediaPluginCEF::onOpenPopupCallback(std::string url, std::string target) { LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "click_href"); message.setValue("uri", url); @@ -488,7 +488,7 @@ void MediaPluginCEF::receiveMessage(const char* message_string) mCEFLib->setOnLoadEndCallback(std::bind(&MediaPluginCEF::onLoadEndCallback, this, std::placeholders::_1)); mCEFLib->setOnLoadErrorCallback(std::bind(&MediaPluginCEF::onLoadError, this, std::placeholders::_1, std::placeholders::_2)); mCEFLib->setOnAddressChangeCallback(std::bind(&MediaPluginCEF::onAddressChangeCallback, this, std::placeholders::_1)); - mCEFLib->setOnNavigateURLCallback(std::bind(&MediaPluginCEF::onNavigateURLCallback, this, std::placeholders::_1, std::placeholders::_2)); + mCEFLib->setOnOpenPopupCallback(std::bind(&MediaPluginCEF::onOpenPopupCallback, this, std::placeholders::_1, std::placeholders::_2)); mCEFLib->setOnHTTPAuthCallback(std::bind(&MediaPluginCEF::onHTTPAuthCallback, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4)); mCEFLib->setOnFileDialogCallback(std::bind(&MediaPluginCEF::onFileDialog, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5)); mCEFLib->setOnCursorChangedCallback(std::bind(&MediaPluginCEF::onCursorChangedCallback, this, std::placeholders::_1)); -- cgit v1.2.3 From 5d76cba7c6cd4cf38b67f8dff51b447506aaf857 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Fri, 16 Mar 2018 15:33:50 -0700 Subject: Update Dullahan CEF binaries to 3325.1749.ga42963a --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 8b33ecca68..0daf15aff2 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - 94e26e96326bd503ddd708507c462a0c + 7256f7b51106aa9948814a2376273edc url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14898/96414/dullahan-1.1.1072_3.3325.1746.ge81cdf2-darwin64-513318.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14953/96694/dullahan-1.1.1072_3.3325.1749.ga42963a-darwin64-513347.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - cd3e02d7fb3ca7394ecd9384268e34e0 + bdf73a1214961ac540b8c3e1686f3203 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14900/96423/dullahan-1.1.1072_3.3325.1746.ge81cdf2-windows-513318.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14955/96703/dullahan-1.1.1072_3.3325.1749.ga42963a-windows-513347.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - 030698603f97bc6d8ad1ba6644a0f59c + 74c689cb08373b782aceb19aa0283590 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14899/96424/dullahan-1.1.1072_3.3325.1746.ge81cdf2-windows64-513318.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14954/96704/dullahan-1.1.1072_3.3325.1749.ga42963a-windows64-513347.tar.bz2 name windows64 version - 1.1.1072_3.3325.1746.ge81cdf2 + 1.1.1072_3.3325.1749.ga42963a elfio -- cgit v1.2.3 From 9a293bc85f9c9486a9dc6991a6cc11c02fcc1d1f Mon Sep 17 00:00:00 2001 From: callum_linden Date: Mon, 19 Mar 2018 16:18:05 -0700 Subject: pull in new version of Dullahan (1.1.1080) built against CEF (3325.1750.gaabe4c4) and with the host process reaper enabled --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 0daf15aff2..4aaefa7679 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -556,9 +556,9 @@ archive hash - 7256f7b51106aa9948814a2376273edc + 118987b1a5b56214cfdbd0c763e180da url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14953/96694/dullahan-1.1.1072_3.3325.1749.ga42963a-darwin64-513347.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15127/97748/dullahan-1.1.1080_3.3325.1750.gaabe4c4-darwin64-513449.tar.bz2 name darwin64 @@ -568,9 +568,9 @@ archive hash - bdf73a1214961ac540b8c3e1686f3203 + 2ecc71350b30a1057091b9cd7af18b1c url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14955/96703/dullahan-1.1.1072_3.3325.1749.ga42963a-windows-513347.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15128/97755/dullahan-1.1.1080_3.3325.1750.gaabe4c4-windows-513449.tar.bz2 name windows @@ -580,16 +580,16 @@ archive hash - 74c689cb08373b782aceb19aa0283590 + 2ed3e49388514dafb907c59a209d580e url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14954/96704/dullahan-1.1.1072_3.3325.1749.ga42963a-windows64-513347.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15129/97760/dullahan-1.1.1080_3.3325.1750.gaabe4c4-windows64-513449.tar.bz2 name windows64 version - 1.1.1072_3.3325.1749.ga42963a + 1.1.1080_3.3325.1750.gaabe4c4 elfio -- cgit v1.2.3 From 991ed3bddc033950f42c540eb1d6c4e2ea7d65d9 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Tue, 20 Mar 2018 17:13:13 -0400 Subject: MAINT-8397: Update viewer-manager to codeticket version 513500. --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index c63b7ff9c6..8c2e75c555 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3260,9 +3260,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - f1248b6692dcbb1a42db87ca8d9fed93 + 2dd8f3672873387599709a846993ada1 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13982/87166/viewer_manager-1.0.512801-darwin64-512801.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15213/98242/viewer_manager-1.0.513500-darwin64-513500.tar.bz2 name darwin64 @@ -3284,9 +3284,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - c174ecc0893f8c193571b1dc80b823ad + 548a04b529f9f28698b17d41a1d24258 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13983/87172/viewer_manager-1.0.512801-windows-512801.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15219/98261/viewer_manager-1.0.513500-windows-513500.tar.bz2 name windows @@ -3297,7 +3297,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 1.0.512801 + 1.0.513500 vlc-bin -- cgit v1.2.3 From 68f07f3d3e3be462cb59560250779325b0db8855 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 21 Mar 2018 12:49:15 -0400 Subject: MAINT-8397: Update viewer-manager to codeticket version 513540. --- autobuild.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 8c2e75c555..399ecff57b 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3260,9 +3260,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 2dd8f3672873387599709a846993ada1 + 4aefe12a3825d1b4b8370986d84792a2 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15213/98242/viewer_manager-1.0.513500-darwin64-513500.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15295/98583/viewer_manager-1.0.513540-darwin64-513540.tar.bz2 name darwin64 @@ -3284,9 +3284,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - 548a04b529f9f28698b17d41a1d24258 + db96bc8a83e6577d31657586100bfc35 url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15219/98261/viewer_manager-1.0.513500-windows-513500.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15298/98589/viewer_manager-1.0.513540-windows-513540.tar.bz2 name windows @@ -3297,7 +3297,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors source_type hg version - 1.0.513500 + 1.0.513540 vlc-bin -- cgit v1.2.3 From f82548b931af69a08d53818ec7a96a967c05151c Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Sat, 31 Mar 2018 10:59:39 -0400 Subject: MAINT-8474: Xcode 9.3 insists that comparators use const operator(). --- indra/llui/llnotifications.h | 2 +- indra/newview/lltextureview.cpp | 2 +- indra/newview/llviewerregion.h | 2 +- indra/newview/llvocache.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h index ccdfb90054..1509446920 100644 --- a/indra/llui/llnotifications.h +++ b/indra/llui/llnotifications.h @@ -703,7 +703,7 @@ namespace LLNotificationComparators { struct orderByUUID { - bool operator()(LLNotificationPtr lhs, LLNotificationPtr rhs) + bool operator()(LLNotificationPtr lhs, LLNotificationPtr rhs) const { return lhs->id() < rhs->id(); } diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index b7786bcdd7..6da13da58c 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -736,7 +736,7 @@ LLTextureView::~LLTextureView() typedef std::pair decode_pair_t; struct compare_decode_pair { - bool operator()(const decode_pair_t& a, const decode_pair_t& b) + bool operator()(const decode_pair_t& a, const decode_pair_t& b) const { return a.first > b.first; } diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index 69fb9c4d4e..302647215f 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -440,7 +440,7 @@ public: struct CompareRegionByLastUpdate { - bool operator()(const LLViewerRegion* const& lhs, const LLViewerRegion* const& rhs) + bool operator()(const LLViewerRegion* const& lhs, const LLViewerRegion* const& rhs) const { S32 lpa = lhs->getLastUpdate(); S32 rpa = rhs->getLastUpdate(); diff --git a/indra/newview/llvocache.h b/indra/newview/llvocache.h index 7d450c5231..594d38249b 100644 --- a/indra/newview/llvocache.h +++ b/indra/newview/llvocache.h @@ -59,7 +59,7 @@ public: struct CompareVOCacheEntry { - bool operator()(const LLVOCacheEntry* const& lhs, const LLVOCacheEntry* const& rhs) + bool operator()(const LLVOCacheEntry* const& lhs, const LLVOCacheEntry* const& rhs) const { F32 lpa = lhs->getSceneContribution(); F32 rpa = rhs->getSceneContribution(); -- cgit v1.2.3 From 4de1a21850d1d7f7e437c16d32c00bab5ce065fb Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 12 Apr 2018 14:16:26 -0400 Subject: Added tag 5.1.3-release for changeset 7c00e5b6cb3d --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index de85203089..091e54ebf1 100755 --- a/.hgtags +++ b/.hgtags @@ -534,3 +534,4 @@ abcab37e1b29414ab8c03af9ca2ab489d809788a 5.0.7-release ad0e15543836d64d6399d28b32852510435e344a 5.1.0-release 26d9e9bb166a9a417f35b1863223a597af8185fd 5.1.1-release 2eb917875efdfe920680b9049302d0f03721245d 5.1.2-release +7c00e5b6cb3d95712e9d8e29277c805bca2bda90 5.1.3-release -- cgit v1.2.3 From ff6afbd376508b33111a5fe9362b5d71d7c759fd Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 12 Apr 2018 14:16:27 -0400 Subject: increment viewer version to 5.1.4 --- 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 cdb98d26e4..76e9e619d6 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -5.1.3 +5.1.4 -- cgit v1.2.3