Pull in latest version of Dullahan (1.1.1072) and tweak media plugin code to match change in API

Thu, 15 Mar 2018 16:12:52 -0700

author
callum_linden
date
Thu, 15 Mar 2018 16:12:52 -0700
changeset 55085
08316cf99861
parent 55084
bcb31ad86000
child 55086
fcad8b434f7e

Pull in latest version of Dullahan (1.1.1072) and tweak media plugin code to match change in API

autobuild.xml file | annotate | diff | revisions
indra/media_plugins/cef/media_plugin_cef.cpp file | annotate | diff | revisions
     1.1 --- a/autobuild.xml	Fri Mar 02 16:21:53 2018 -0800
     1.2 +++ b/autobuild.xml	Thu Mar 15 16:12:52 2018 -0700
     1.3 @@ -556,9 +556,9 @@
     1.4              <key>archive</key>
     1.5              <map>
     1.6                <key>hash</key>
     1.7 -              <string>06e6bb2aa2614b6a7b86a08dce8746ad</string>
     1.8 +              <string>94e26e96326bd503ddd708507c462a0c</string>
     1.9                <key>url</key>
    1.10 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14190/88872/dullahan-1.1.1050_3.3282.1742.g96f907e-darwin64-512926.tar.bz2</string>
    1.11 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14898/96414/dullahan-1.1.1072_3.3325.1746.ge81cdf2-darwin64-513318.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>59b5f320601c1a57d1706dcc791a4110</string>
    1.20 +              <string>cd3e02d7fb3ca7394ecd9384268e34e0</string>
    1.21                <key>url</key>
    1.22 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14191/88879/dullahan-1.1.1050_3.3282.1742.g96f907e-windows-512926.tar.bz2</string>
    1.23 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14900/96423/dullahan-1.1.1072_3.3325.1746.ge81cdf2-windows-513318.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>0d2da40e7c187bfb3f366561836e40a8</string>
    1.32 +              <string>030698603f97bc6d8ad1ba6644a0f59c</string>
    1.33                <key>url</key>
    1.34 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14192/88884/dullahan-1.1.1050_3.3282.1742.g96f907e-windows64-512926.tar.bz2</string>
    1.35 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/14899/96424/dullahan-1.1.1072_3.3325.1746.ge81cdf2-windows64-513318.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.1050_3.3282.1742.g96f907e</string>
    1.43 +        <string>1.1.1072_3.3325.1746.ge81cdf2</string>
    1.44        </map>
    1.45        <key>elfio</key>
    1.46        <map>
     2.1 --- a/indra/media_plugins/cef/media_plugin_cef.cpp	Fri Mar 02 16:21:53 2018 -0800
     2.2 +++ b/indra/media_plugins/cef/media_plugin_cef.cpp	Thu Mar 15 16:12:52 2018 -0700
     2.3 @@ -67,7 +67,7 @@
     2.4  	void onLoadEndCallback(int httpStatusCode);
     2.5  	void onLoadError(int status, const std::string error_text);
     2.6  	void onAddressChangeCallback(std::string url);
     2.7 -	void onNavigateURLCallback(std::string url, std::string target);
     2.8 +	void onOpenPopupCallback(std::string url, std::string target);
     2.9  	bool onHTTPAuthCallback(const std::string host, const std::string realm, std::string& username, std::string& password);
    2.10  	void onCursorChangedCallback(dullahan::ECursorType type);
    2.11  	const std::vector<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);
    2.12 @@ -265,7 +265,7 @@
    2.13  
    2.14  ////////////////////////////////////////////////////////////////////////////////
    2.15  //
    2.16 -void MediaPluginCEF::onNavigateURLCallback(std::string url, std::string target)
    2.17 +void MediaPluginCEF::onOpenPopupCallback(std::string url, std::string target)
    2.18  {
    2.19  	LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "click_href");
    2.20  	message.setValue("uri", url);
    2.21 @@ -488,7 +488,7 @@
    2.22  				mCEFLib->setOnLoadEndCallback(std::bind(&MediaPluginCEF::onLoadEndCallback, this, std::placeholders::_1));
    2.23  				mCEFLib->setOnLoadErrorCallback(std::bind(&MediaPluginCEF::onLoadError, this, std::placeholders::_1, std::placeholders::_2));
    2.24  				mCEFLib->setOnAddressChangeCallback(std::bind(&MediaPluginCEF::onAddressChangeCallback, this, std::placeholders::_1));
    2.25 -				mCEFLib->setOnNavigateURLCallback(std::bind(&MediaPluginCEF::onNavigateURLCallback, this, std::placeholders::_1, std::placeholders::_2));
    2.26 +				mCEFLib->setOnOpenPopupCallback(std::bind(&MediaPluginCEF::onOpenPopupCallback, this, std::placeholders::_1, std::placeholders::_2));
    2.27  				mCEFLib->setOnHTTPAuthCallback(std::bind(&MediaPluginCEF::onHTTPAuthCallback, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4));
    2.28  				mCEFLib->setOnFileDialogCallback(std::bind(&MediaPluginCEF::onFileDialog, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, std::placeholders::_5));
    2.29  				mCEFLib->setOnCursorChangedCallback(std::bind(&MediaPluginCEF::onCursorChangedCallback, this, std::placeholders::_1));

mercurial