3 files changed, 35 insertions, 2 deletions

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">