1 files changed, 39 insertions, 6 deletions

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 abc7f1a..61067da 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
@@ -120,7 +120,7 @@
                         none
                 </widgettype>
                 <impl>
-                        media_plugin_quicktime
+                        media_plugin_webkit
                 </impl>
         </mimetype>
         <mimetype name="none/none">
@@ -130,6 +130,9 @@
                 <widgettype>
                         none
                 </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
         </mimetype>
         <mimetype name="audio/*">
                 <label name="audio2_label">
@@ -138,6 +141,9 @@
                 <widgettype>
                         audio
                 </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
         </mimetype>
         <mimetype name="video/*">
                 <label name="video2_label">
@@ -146,6 +152,9 @@
                 <widgettype>
                         movie
                 </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
         </mimetype>
         <mimetype name="image/*">
                 <label name="image2_label">
@@ -154,10 +163,13 @@
                 <widgettype>
                         image
                 </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
         </mimetype>
         <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
                 <label name="vnd.secondlife.qt.legacy_label">
-                        Movie (gstreamer)
+                        Movie (QuickTime)
                 </label>
                 <widgettype>
                         movie
@@ -173,6 +185,9 @@
                 <widgettype>
                         web
                 </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
         </mimetype>
         <mimetype name="application/ogg">
                 <label name="application/ogg_label">
@@ -181,6 +196,9 @@
                 <widgettype>
                         audio
                 </widgettype>
+                <impl>
+                        media_plugin_quicktime
+                </impl>
         </mimetype>
         <mimetype name="application/pdf">
                 <label name="application/pdf_label">
@@ -189,6 +207,9 @@
                 <widgettype>
                         image
                 </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
         </mimetype>
         <mimetype name="application/postscript">
                 <label name="application/postscript_label">
@@ -197,6 +218,9 @@
                 <widgettype>
                         image
                 </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
         </mimetype>
         <mimetype name="application/rtf">
                 <label name="application/rtf_label">
@@ -205,6 +229,9 @@
                 <widgettype>
                         image
                 </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
         </mimetype>
         <mimetype name="application/smil">
                 <label name="application/smil_label">
@@ -214,7 +241,7 @@
                         movie
                 </widgettype>
                 <impl>
-                        media_plugin_quicktime
+                        media_plugin_webkit
                 </impl>
         </mimetype>
         <mimetype name="application/xhtml+xml">
@@ -224,6 +251,9 @@
                 <widgettype>
                         web
                 </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
         </mimetype>
         <mimetype name="application/x-director">
                 <label name="application/x-director_label">
@@ -232,6 +262,9 @@
                 <widgettype>
                         image
                 </widgettype>
+                <impl>
+                        media_plugin_webkit
+                </impl>
         </mimetype>
         <mimetype name="audio/mid">
                 <label name="audio/mid_label">
@@ -398,9 +431,9 @@
       media_plugin_quicktime
     </impl>
         </mimetype>
-        <mimetype menu="1" name="video/gstreamer">
-                <label name="video/gstreamer_label">
-                        Movie (gstreamer)
+        <mimetype menu="1" name="video/quicktime">
+                <label name="video/quicktime_label">
+                        Movie (QuickTime)
                 </label>
                 <widgettype>
                         movie