Automated merge with tip of viewer64

Fri, 05 Jan 2018 18:27:30 -0800

author
callum_linden
date
Fri, 05 Jan 2018 18:27:30 -0800
changeset 55055
43ddbba15b0b
parent 55054
e308a9eae498
parent 54603
864969604bee
child 55056
0147f438ab4a

Automated merge with tip of viewer64

autobuild.xml file | annotate | diff | revisions
     1.1 --- a/autobuild.xml	Fri Jan 05 18:26:54 2018 -0800
     1.2 +++ b/autobuild.xml	Fri Jan 05 18:27:30 2018 -0800
     1.3 @@ -3231,9 +3231,9 @@
     1.4              <key>archive</key>
     1.5              <map>
     1.6                <key>hash</key>
     1.7 -              <string>a8071b247d78e5555340f83e3491e7df</string>
     1.8 +              <string>c4d56d3e942169661a598035a9fbd533</string>
     1.9                <key>url</key>
    1.10 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12055/70540/viewer_manager-1.0.511658-darwin64-511658.tar.bz2</string>
    1.11 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12112/71187/viewer_manager-1.0.511688-darwin64-511688.tar.bz2</string>
    1.12              </map>
    1.13              <key>name</key>
    1.14              <string>darwin64</string>
    1.15 @@ -3255,9 +3255,9 @@
    1.16              <key>archive</key>
    1.17              <map>
    1.18                <key>hash</key>
    1.19 -              <string>a9597ba92618b2616e058dee8f56c80c</string>
    1.20 +              <string>61f324d880eaa303669b99e28e6cf64c</string>
    1.21                <key>url</key>
    1.22 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12056/70546/viewer_manager-1.0.511658-windows-511658.tar.bz2</string>
    1.23 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12113/71193/viewer_manager-1.0.511688-windows-511688.tar.bz2</string>
    1.24              </map>
    1.25              <key>name</key>
    1.26              <string>windows</string>
    1.27 @@ -3268,7 +3268,7 @@
    1.28          <key>source_type</key>
    1.29          <string>hg</string>
    1.30          <key>version</key>
    1.31 -        <string>1.0.511658</string>
    1.32 +        <string>1.0.511688</string>
    1.33        </map>
    1.34        <key>vlc-bin</key>
    1.35        <map>
     2.1 --- a/indra/newview/skins/default/xui/en/mime_types.xml	Fri Jan 05 18:26:54 2018 -0800
     2.2 +++ b/indra/newview/skins/default/xui/en/mime_types.xml	Fri Jan 05 18:27:30 2018 -0800
     2.3 @@ -526,7 +526,7 @@
     2.4  			movie
     2.5  		</widgettype>
     2.6  		<impl>
     2.7 -			media_plugin_cef
     2.8 +			media_plugin_libvlc
     2.9  		</impl>
    2.10  	</mimetype>
    2.11  </mimetypes>

mercurial