diff options
| author | callum_linden <none@none> | 2018-01-05 18:27:30 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2018-01-05 18:27:30 -0800 |
| commit | a656e4a001013cdbfb3961e9aecfa88ea5890bbb (patch) | |
| tree | 27bca06c3d670812206bd4862ebf1d62b7fcc45b | |
| parent | aa23ae29a557df8346db35972198b4d6cee7761b (diff) | |
| parent | 6659192a351f61a1c2476a6d34cc5fd6c8d6123f (diff) | |
Automated merge with tip of viewer64
| -rw-r--r-- | autobuild.xml | 10 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/mime_types.xml | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/autobuild.xml b/autobuild.xml index 920bba7e3d..67a7436ba2 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3231,9 +3231,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>a8071b247d78e5555340f83e3491e7df</string> + <string>c4d56d3e942169661a598035a9fbd533</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12055/70540/viewer_manager-1.0.511658-darwin64-511658.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12112/71187/viewer_manager-1.0.511688-darwin64-511688.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3255,9 +3255,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>a9597ba92618b2616e058dee8f56c80c</string> + <string>61f324d880eaa303669b99e28e6cf64c</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12056/70546/viewer_manager-1.0.511658-windows-511658.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12113/71193/viewer_manager-1.0.511688-windows-511688.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -3268,7 +3268,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>source_type</key> <string>hg</string> <key>version</key> - <string>1.0.511658</string> + <string>1.0.511688</string> </map> <key>vlc-bin</key> <map> diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml index 8a810f32a6..de9ac4247f 100644 --- a/indra/newview/skins/default/xui/en/mime_types.xml +++ b/indra/newview/skins/default/xui/en/mime_types.xml @@ -526,7 +526,7 @@ movie </widgettype> <impl> - media_plugin_cef + media_plugin_libvlc </impl> </mimetype> </mimetypes> |