Merge viewer-media-update

Sat, 07 Apr 2018 15:01:39 +0200

author
Ansariel
date
Sat, 07 Apr 2018 15:01:39 +0200
changeset 55091
5159e3f3817e
parent 55083
6cc7466e6e3c
parent 55090
7c00e5b6cb3d
child 55092
99a950ce3bf6

Merge viewer-media-update

autobuild.xml file | annotate | diff | revisions
indra/media_plugins/cef/media_plugin_cef.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/en/menu_login.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/menu_viewer.xml file | annotate | diff | revisions
     1.1 --- a/autobuild.xml	Sat Apr 07 14:59:44 2018 +0200
     1.2 +++ b/autobuild.xml	Sat Apr 07 15:01:39 2018 +0200
     1.3 @@ -756,9 +756,9 @@
     1.4              <key>archive</key>
     1.5              <map>
     1.6                <key>hash</key>
     1.7 -              <string>06e6bb2aa2614b6a7b86a08dce8746ad</string>
     1.8 -              <key>url</key>
     1.9 -              <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.10 +              <string>118987b1a5b56214cfdbd0c763e180da</string>
    1.11 +              <key>url</key>
    1.12 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15127/97748/dullahan-1.1.1080_3.3325.1750.gaabe4c4-darwin64-513449.tar.bz2</string>
    1.13              </map>
    1.14              <key>name</key>
    1.15              <string>darwin64</string>
    1.16 @@ -792,9 +792,9 @@
    1.17              <key>archive</key>
    1.18              <map>
    1.19                <key>hash</key>
    1.20 -              <string>59b5f320601c1a57d1706dcc791a4110</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>2ecc71350b30a1057091b9cd7af18b1c</string>
    1.24 +              <key>url</key>
    1.25 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15128/97755/dullahan-1.1.1080_3.3325.1750.gaabe4c4-windows-513449.tar.bz2</string>
    1.26              </map>
    1.27              <key>name</key>
    1.28              <string>windows</string>
    1.29 @@ -804,16 +804,16 @@
    1.30              <key>archive</key>
    1.31              <map>
    1.32                <key>hash</key>
    1.33 -              <string>0d2da40e7c187bfb3f366561836e40a8</string>
    1.34 -              <key>url</key>
    1.35 -              <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.36 +              <string>2ed3e49388514dafb907c59a209d580e</string>
    1.37 +              <key>url</key>
    1.38 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15129/97760/dullahan-1.1.1080_3.3325.1750.gaabe4c4-windows64-513449.tar.bz2</string>
    1.39              </map>
    1.40              <key>name</key>
    1.41              <string>windows64</string>
    1.42            </map>
    1.43          </map>
    1.44          <key>version</key>
    1.45 -        <string>1.1.1050_3.3282.1742.g96f907e</string>
    1.46 +        <string>1.1.1080_3.3325.1750.gaabe4c4</string>
    1.47        </map>
    1.48        <key>elfio</key>
    1.49        <map>
    1.50 @@ -3562,9 +3562,9 @@
    1.51              <key>archive</key>
    1.52              <map>
    1.53                <key>hash</key>
    1.54 -              <string>f1248b6692dcbb1a42db87ca8d9fed93</string>
    1.55 -              <key>url</key>
    1.56 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13982/87166/viewer_manager-1.0.512801-darwin64-512801.tar.bz2</string>
    1.57 +              <string>4aefe12a3825d1b4b8370986d84792a2</string>
    1.58 +              <key>url</key>
    1.59 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15295/98583/viewer_manager-1.0.513540-darwin64-513540.tar.bz2</string>
    1.60              </map>
    1.61              <key>name</key>
    1.62              <string>darwin64</string>
    1.63 @@ -3598,9 +3598,9 @@
    1.64              <key>archive</key>
    1.65              <map>
    1.66                <key>hash</key>
    1.67 -              <string>c174ecc0893f8c193571b1dc80b823ad</string>
    1.68 -              <key>url</key>
    1.69 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13983/87172/viewer_manager-1.0.512801-windows-512801.tar.bz2</string>
    1.70 +              <string>db96bc8a83e6577d31657586100bfc35</string>
    1.71 +              <key>url</key>
    1.72 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/15298/98589/viewer_manager-1.0.513540-windows-513540.tar.bz2</string>
    1.73              </map>
    1.74              <key>name</key>
    1.75              <string>windows</string>
    1.76 @@ -3611,7 +3611,7 @@
    1.77          <key>source_type</key>
    1.78          <string>hg</string>
    1.79          <key>version</key>
    1.80 -        <string>1.0.512801</string>
    1.81 +        <string>1.0.513540</string>
    1.82        </map>
    1.83        <key>vlc-bin</key>
    1.84        <map>
     2.1 --- a/indra/media_plugins/cef/media_plugin_cef.cpp	Sat Apr 07 14:59:44 2018 +0200
     2.2 +++ b/indra/media_plugins/cef/media_plugin_cef.cpp	Sat Apr 07 15:01:39 2018 +0200
     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));
     3.1 --- a/indra/newview/skins/default/xui/en/menu_login.xml	Sat Apr 07 14:59:44 2018 +0200
     3.2 +++ b/indra/newview/skins/default/xui/en/menu_login.xml	Sat Apr 07 15:01:39 2018 +0200
     3.3 @@ -281,7 +281,7 @@
     3.4         name="Media Browser">
     3.5          <menu_item_call.on_click
     3.6           function="Advanced.WebContentTest"
     3.7 -         parameter="http://google.com"/>
     3.8 +         parameter="http://duckduckgo.com"/>
     3.9        </menu_item_call>
    3.10        <menu
    3.11         create_jump_keys="true"
     4.1 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml	Sat Apr 07 14:59:44 2018 +0200
     4.2 +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml	Sat Apr 07 15:01:39 2018 +0200
     4.3 @@ -4293,7 +4293,7 @@
     4.4             shortcut="control|shift|Z">
     4.5              <menu_item_call.on_click
     4.6               function="Advanced.WebContentTest"
     4.7 -             parameter="http://google.com"/>
     4.8 +             parameter="http://duckduckgo.com"/>
     4.9            </menu_item_call>
    4.10            <menu_item_call
    4.11             label="FB Connect Test"

mercurial