From 26161cf57778c8b554768e16b6b1111c1b2a7b33 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 4 Jan 2018 14:43:21 -0500
Subject: MAINT-8123: Update to viewer-manager build 511679
---
autobuild.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 0b827f2080..a6b0a1d652 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>4f205b14f712cbef8035a527ae2305c8</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/12093/71064/viewer_manager-1.0.511679-darwin64-511679.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>e89fd2ec532b707fa93155ec25533be2</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/12094/71070/viewer_manager-1.0.511679-windows-511679.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.511679</string>
</map>
<key>vlc-bin</key>
<map>
--
cgit v1.2.3
From 37e699bede72f711afc3391f751fac5a8d4ccf2a Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 4 Jan 2018 16:57:40 -0500
Subject: MAINT-8135: Update to viewer-manager build 511688
---
autobuild.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index a6b0a1d652..c90ffe493c 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>4f205b14f712cbef8035a527ae2305c8</string>
+ <string>c4d56d3e942169661a598035a9fbd533</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12093/71064/viewer_manager-1.0.511679-darwin64-511679.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>e89fd2ec532b707fa93155ec25533be2</string>
+ <string>61f324d880eaa303669b99e28e6cf64c</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12094/71070/viewer_manager-1.0.511679-windows-511679.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.511679</string>
+ <string>1.0.511688</string>
</map>
<key>vlc-bin</key>
<map>
--
cgit v1.2.3
From 6659192a351f61a1c2476a6d34cc5fd6c8d6123f Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 5 Jan 2018 12:29:38 -0800
Subject: Fix for MAINT-8148 - AVI fails to play. For Windows, the x-msvideo
MIME type was pointed at CEF which is unable to play it. Switching that to
LibVLC made it work as expected. It was already switched on macOS
---
indra/newview/skins/default/xui/en/mime_types.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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>
--
cgit v1.2.3