From e2c84771ca57722751d6cd9e77bd99f5317d5ea9 Mon Sep 17 00:00:00 2001 From: thickbrick Date: Sat, 26 Mar 2011 12:50:47 +0200 Subject: Fix #810: Add video/x-m4v to mime_types_*.xml --- .../newview/skins/default/xui/en-us/mime_types_linux.xml | 11 +++++++++++ .../newview/skins/default/xui/en-us/mime_types_mac.xml | 11 +++++++++++ .../skins/default/xui/en-us/mime_types_windows.xml | 15 +++++++++++++-- 3 files changed, 35 insertions(+), 2 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml index e95b371..f0ba830 100755 --- a/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml +++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_linux.xml @@ -431,6 +431,17 @@ media_plugin_gstreamer </impl> </mimetype> + <mimetype name="video/x-m4v"> + <label name="video/m4v_label"> + Movie (M4V) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </mimetype> <mimetype menu="1" name="video/quicktime"> <label name="video/quicktime_label"> Movie (QuickTime) diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml index 7931e55..e1751eb 100755 --- a/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml +++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_mac.xml @@ -431,6 +431,17 @@ media_plugin_quicktime </impl> </mimetype> + <mimetype name="video/x-m4v"> + <label name="video/m4v_label"> + Movie (M4V) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_gstreamer + </impl> + </mimetype> <mimetype menu="1" name="video/quicktime"> <label name="video/quicktime_label"> Movie (QuickTime) diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml index 5ee4ed0..26491e0 100644 --- a/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml +++ b/linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml @@ -428,8 +428,19 @@ movie </widgettype> <impl> - media_plugin_quicktime - </impl> + media_plugin_quicktime + </impl> + </mimetype> + <mimetype name="video/x-m4v"> + <label name="video/m4v_label"> + Movie (M4V) + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_gstreamer + </impl> </mimetype> <mimetype menu="1" name="video/quicktime"> <label name="video/quicktime_label"> -- cgit v1.1