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)

Fri, 15 Dec 2017 16:11:29 -0800

author
callum_linden <callum@lindenlab.com>
date
Fri, 15 Dec 2017 16:11:29 -0800
changeset 55046
ab438756835d
parent 55045
0d923cae762e
child 55047
f66c53f7d508

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 file | annotate | diff | revisions
indra/llplugin/llpluginclassmedia.cpp file | annotate | diff | revisions
indra/media_plugins/cef/media_plugin_cef.cpp file | annotate | diff | revisions
indra/newview/llmediactrl.cpp file | annotate | diff | revisions
     1.1 --- a/autobuild.xml	Thu Dec 14 14:27:49 2017 -0800
     1.2 +++ b/autobuild.xml	Fri Dec 15 16:11:29 2017 -0800
     1.3 @@ -556,9 +556,9 @@
     1.4              <key>archive</key>
     1.5              <map>
     1.6                <key>hash</key>
     1.7 -              <string>4332ef6c8e8d7462ee42c99045b0cd87</string>
     1.8 +              <string>8fc07fd39e8ba33473aa01f156c7eb27</string>
     1.9                <key>url</key>
    1.10 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11702/67585/dullahan-1.1.929_3.3202.1686.gd665578-darwin64-511421.tar.bz2</string>
    1.11 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11784/68150/dullahan-1.1.930_3.3202.1686.gd665578-darwin64-511466.tar.bz2</string>
    1.12              </map>
    1.13              <key>name</key>
    1.14              <string>darwin64</string>
    1.15 @@ -568,9 +568,9 @@
    1.16              <key>archive</key>
    1.17              <map>
    1.18                <key>hash</key>
    1.19 -              <string>001b4ae5c536ee625cf2f85e3bdf2d89</string>
    1.20 +              <string>4cee3e5ce9e27053fb2143898a1b00c2</string>
    1.21                <key>url</key>
    1.22 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11703/67592/dullahan-1.1.929_3.3202.1686.gd665578-windows-511421.tar.bz2</string>
    1.23 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11785/68157/dullahan-1.1.930_3.3202.1686.gd665578-windows-511466.tar.bz2</string>
    1.24              </map>
    1.25              <key>name</key>
    1.26              <string>windows</string>
    1.27 @@ -580,16 +580,16 @@
    1.28              <key>archive</key>
    1.29              <map>
    1.30                <key>hash</key>
    1.31 -              <string>90f1926a1e3cd3ae56acd662ad9c0bdc</string>
    1.32 +              <string>6b014f4f4f001179899ac1a4824ed225</string>
    1.33                <key>url</key>
    1.34 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11704/67597/dullahan-1.1.929_3.3202.1686.gd665578-windows64-511421.tar.bz2</string>
    1.35 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11786/68162/dullahan-1.1.930_3.3202.1686.gd665578-windows64-511466.tar.bz2</string>
    1.36              </map>
    1.37              <key>name</key>
    1.38              <string>windows64</string>
    1.39            </map>
    1.40          </map>
    1.41          <key>version</key>
    1.42 -        <string>1.1.929_3.3202.1686.gd665578</string>
    1.43 +        <string>1.1.930_3.3202.1686.gd665578</string>
    1.44        </map>
    1.45        <key>elfio</key>
    1.46        <map>
     2.1 --- a/indra/llplugin/llpluginclassmedia.cpp	Thu Dec 14 14:27:49 2017 -0800
     2.2 +++ b/indra/llplugin/llpluginclassmedia.cpp	Fri Dec 15 16:11:29 2017 -0800
     2.3 @@ -1159,7 +1159,12 @@
     2.4  		{
     2.5  			mClickURL = message.getValue("uri");
     2.6  			mClickTarget = message.getValue("target");
     2.7 -			mClickUUID = message.getValue("uuid");
     2.8 +
     2.9 +			// need a link to have a UUID that identifies it to a system further
    2.10 +			// upstream - plugin could make it but we have access to LLUUID here
    2.11 +			// so why don't we use it
    2.12 +			mClickUUID = LLUUID::generateNewID().asString();
    2.13 +
    2.14  			mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_CLICK_LINK_HREF);
    2.15  		}
    2.16  		else if(message_name == "click_nofollow")
     3.1 --- a/indra/media_plugins/cef/media_plugin_cef.cpp	Thu Dec 14 14:27:49 2017 -0800
     3.2 +++ b/indra/media_plugins/cef/media_plugin_cef.cpp	Fri Dec 15 16:11:29 2017 -0800
     3.3 @@ -38,6 +38,7 @@
     3.4  #include "media_plugin_base.h"
     3.5  
     3.6  #include <functional>
     3.7 +#include <chrono>
     3.8  
     3.9  #include "dullahan.h"
    3.10  
    3.11 @@ -64,6 +65,7 @@
    3.12  	void onLoadStartCallback();
    3.13  	void onRequestExitCallback();
    3.14  	void onLoadEndCallback(int httpStatusCode);
    3.15 +	void onLoadError(int status, const std::string error_text);
    3.16  	void onAddressChangeCallback(std::string url);
    3.17  	void onNavigateURLCallback(std::string url, std::string target);
    3.18  	bool onHTTPAuthCallback(const std::string host, const std::string realm, std::string& username, std::string& password);
    3.19 @@ -207,6 +209,21 @@
    3.20  	sendMessage(message);
    3.21  }
    3.22  
    3.23 +/////////////////////////////////////////////////////////////////////////////////
    3.24 +//
    3.25 +void MediaPluginCEF::onLoadError(int status, const std::string error_text)
    3.26 +{
    3.27 +	std::stringstream msg;
    3.28 +
    3.29 +	msg << "<b>Loading error!</b>";
    3.30 +	msg << "<p>";
    3.31 +	msg << "Message: " << error_text;
    3.32 +	msg << "<br>";
    3.33 +	msg << "Code: " << status;
    3.34 +
    3.35 +	mCEFLib->showBrowserMessage(msg.str());
    3.36 +}
    3.37 +
    3.38  ////////////////////////////////////////////////////////////////////////////////
    3.39  //
    3.40  void MediaPluginCEF::onRequestExitCallback()
    3.41 @@ -245,7 +262,6 @@
    3.42  	LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "click_href");
    3.43  	message.setValue("uri", url);
    3.44  	message.setValue("target", target);
    3.45 -	message.setValue("uuid", "");	// not used right now
    3.46  	sendMessage(message);
    3.47  }
    3.48  
    3.49 @@ -462,6 +478,7 @@
    3.50  				mCEFLib->setOnTitleChangeCallback(std::bind(&MediaPluginCEF::onTitleChangeCallback, this, std::placeholders::_1));
    3.51  				mCEFLib->setOnLoadStartCallback(std::bind(&MediaPluginCEF::onLoadStartCallback, this));
    3.52  				mCEFLib->setOnLoadEndCallback(std::bind(&MediaPluginCEF::onLoadEndCallback, this, std::placeholders::_1));
    3.53 +				mCEFLib->setOnLoadErrorCallback(std::bind(&MediaPluginCEF::onLoadError, this, std::placeholders::_1, std::placeholders::_2));
    3.54  				mCEFLib->setOnAddressChangeCallback(std::bind(&MediaPluginCEF::onAddressChangeCallback, this, std::placeholders::_1));
    3.55  				mCEFLib->setOnNavigateURLCallback(std::bind(&MediaPluginCEF::onNavigateURLCallback, this, std::placeholders::_1, std::placeholders::_2));
    3.56  				mCEFLib->setOnHTTPAuthCallback(std::bind(&MediaPluginCEF::onHTTPAuthCallback, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
     4.1 --- a/indra/newview/llmediactrl.cpp	Thu Dec 14 14:27:49 2017 -0800
     4.2 +++ b/indra/newview/llmediactrl.cpp	Fri Dec 15 16:11:29 2017 -0800
     4.3 @@ -1022,7 +1022,7 @@
     4.4  			// try as slurl first
     4.5  			if (!LLURLDispatcher::dispatch(url, "clicked", NULL, mTrusted))
     4.6  			{
     4.7 -				LLWeb::loadURL(url, target, std::string());
     4.8 +				LLWeb::loadURL(url, target, uuid);
     4.9  			}
    4.10  
    4.11  			// CP: removing this code because we no longer support popups so this breaks the flow.

mercurial