2 files changed, 37 insertions, 37 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
index a585069..360438a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
@@ -109,7 +109,7 @@
                        movie
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </scheme>
        <mimetype name="blank">
@@ -142,7 +142,7 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </mimetype>
        <mimetype name="video/*">
@@ -153,7 +153,7 @@
                        movie
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </mimetype>
        <mimetype name="image/*">
@@ -169,13 +169,13 @@
        </mimetype>
        <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
                <label name="vnd.secondlife.qt.legacy_label">
-                        Movie (QuickTime)
+                        Movie (gstreamer)
                </label>
                <widgettype>
                        movie
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </mimetype>
        <mimetype name="application/javascript">
@@ -197,7 +197,7 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </mimetype>
        <mimetype name="application/pdf">
@@ -274,7 +274,7 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </mimetype>
        <mimetype name="audio/mpeg">
@@ -285,7 +285,7 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </mimetype>
        <mimetype name="audio/x-aiff">
@@ -296,7 +296,7 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </mimetype>
        <mimetype name="audio/x-wav">
@@ -307,7 +307,7 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </mimetype>
        <mimetype menu="1" name="image/bmp">
@@ -417,7 +417,7 @@
                        movie
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </mimetype>
        <mimetype name="video/mp4">
@@ -428,18 +428,18 @@
                        movie
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </mimetype>
-        <mimetype menu="1" name="video/quicktime">
+        <mimetype menu="1" name="video/gstreamer">
-                <label name="video/quicktime_label">
+                <label name="video/gstreamer_label">
-                        Movie (QuickTime)
+                        Movie (gstreamer)
                </label>
                <widgettype>
                        movie
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </mimetype>
        <mimetype name="video/x-ms-asf">
@@ -450,7 +450,7 @@
                        movie
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </mimetype>
        <mimetype name="video/x-ms-wmv">
@@ -461,7 +461,7 @@
                        movie
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </mimetype>
        <mimetype menu="1" name="video/x-msvideo">
@@ -472,7 +472,7 @@
                        movie
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </mimetype>
 </mimetypes>
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 4a7a6e1..d4d47cb 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
@@ -109,7 +109,7 @@
                        movie
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer
                </impl>
        </scheme>
        <mimetype name="blank">
@@ -120,7 +120,7 @@
                        none
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer
                </impl>
        </mimetype>
        <mimetype name="none/none">
@@ -157,13 +157,13 @@
        </mimetype>
        <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
                <label name="vnd.secondlife.qt.legacy_label">
-                        Movie (QuickTime)
+                        Movie (gstreamer)
                </label>
                <widgettype>
                        movie
                </widgettype>
                <impl>
-      media_plugin_quicktime
+      media_plugin_gstreamer
    </impl>
        </mimetype>
        <mimetype name="application/javascript">
@@ -214,7 +214,7 @@
                        movie
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer
                </impl>
        </mimetype>
        <mimetype name="application/xhtml+xml">
@@ -241,7 +241,7 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer
                </impl>
        </mimetype>
        <mimetype name="audio/mpeg">
@@ -252,7 +252,7 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer
                </impl>
        </mimetype>
        <mimetype name="audio/x-aiff">
@@ -263,7 +263,7 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer
                </impl>
        </mimetype>
        <mimetype name="audio/x-wav">
@@ -274,7 +274,7 @@
                        audio
                </widgettype>
                <impl>
-                        media_plugin_quicktime
+                        media_plugin_gstreamer010
                </impl>
        </mimetype>
        <mimetype menu="1" name="image/bmp">
@@ -384,7 +384,7 @@
                        movie
                </widgettype>
                <impl>
-      media_plugin_quicktime
+      media_plugin_gstreamer010010
    </impl>
        </mimetype>
        <mimetype name="video/mp4">
@@ -395,18 +395,18 @@
                        movie
                </widgettype>
                <impl>
-      media_plugin_quicktime
+      media_plugin_gstreamer010010
    </impl>
        </mimetype>
-        <mimetype menu="1" name="video/quicktime">
+        <mimetype menu="1" name="video/gstreamer">
-                <label name="video/quicktime_label">
+                <label name="video/gstreamer_label">
-                        Movie (QuickTime)
+                        Movie (gstreamer)
                </label>
                <widgettype>
                        movie
                </widgettype>
                <impl>
-      media_plugin_quicktime
+      media_plugin_gstreamer010010
    </impl>
        </mimetype>
        <mimetype name="video/x-ms-asf">
@@ -417,7 +417,7 @@
                        movie
                </widgettype>
                <impl>
-      media_plugin_quicktime
+      media_plugin_gstreamer010010
    </impl>
        </mimetype>
        <mimetype name="video/x-ms-wmv">
@@ -428,7 +428,7 @@
                        movie
                </widgettype>
                <impl>
-      media_plugin_quicktime
+      media_plugin_gstreamer010010
    </impl>
        </mimetype>
        <mimetype menu="1" name="video/x-msvideo">
@@ -439,7 +439,7 @@
                        movie
                </widgettype>
                <impl>
-      media_plugin_quicktime
+      media_plugin_gstreamer010010
    </impl>
        </mimetype>
 </mimetypes>

diff --git a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml index a585069..360438a 100644 --- a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml +++ b/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
@@ -109,7 +109,7 @@
109	movie	109	movie
110	</widgettype>	110	</widgettype>
111	<impl>	111	<impl>
112	media_plugin_quicktime	112	media_plugin_gstreamer010
113	</impl>	113	</impl>
114	</scheme>	114	</scheme>
115	<mimetype name="blank">	115	<mimetype name="blank">
@@ -142,7 +142,7 @@
142	audio	142	audio
143	</widgettype>	143	</widgettype>
144	<impl>	144	<impl>
145	media_plugin_quicktime	145	media_plugin_gstreamer010
146	</impl>	146	</impl>
147	</mimetype>	147	</mimetype>
148	<mimetype name="video/*">	148	<mimetype name="video/*">
@@ -153,7 +153,7 @@
153	movie	153	movie
154	</widgettype>	154	</widgettype>
155	<impl>	155	<impl>
156	media_plugin_quicktime	156	media_plugin_gstreamer010
157	</impl>	157	</impl>
158	</mimetype>	158	</mimetype>
159	<mimetype name="image/*">	159	<mimetype name="image/*">
@@ -169,13 +169,13 @@
169	</mimetype>	169	</mimetype>
170	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">	170	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
171	<label name="vnd.secondlife.qt.legacy_label">	171	<label name="vnd.secondlife.qt.legacy_label">
172	Movie (QuickTime)	172	Movie (gstreamer)
173	</label>	173	</label>
174	<widgettype>	174	<widgettype>
175	movie	175	movie
176	</widgettype>	176	</widgettype>
177	<impl>	177	<impl>
178	media_plugin_quicktime	178	media_plugin_gstreamer010
179	</impl>	179	</impl>
180	</mimetype>	180	</mimetype>
181	<mimetype name="application/javascript">	181	<mimetype name="application/javascript">
@@ -197,7 +197,7 @@
197	audio	197	audio
198	</widgettype>	198	</widgettype>
199	<impl>	199	<impl>
200	media_plugin_quicktime	200	media_plugin_gstreamer010
201	</impl>	201	</impl>
202	</mimetype>	202	</mimetype>
203	<mimetype name="application/pdf">	203	<mimetype name="application/pdf">
@@ -274,7 +274,7 @@
274	audio	274	audio
275	</widgettype>	275	</widgettype>
276	<impl>	276	<impl>
277	media_plugin_quicktime	277	media_plugin_gstreamer010
278	</impl>	278	</impl>
279	</mimetype>	279	</mimetype>
280	<mimetype name="audio/mpeg">	280	<mimetype name="audio/mpeg">
@@ -285,7 +285,7 @@
285	audio	285	audio
286	</widgettype>	286	</widgettype>
287	<impl>	287	<impl>
288	media_plugin_quicktime	288	media_plugin_gstreamer010
289	</impl>	289	</impl>
290	</mimetype>	290	</mimetype>
291	<mimetype name="audio/x-aiff">	291	<mimetype name="audio/x-aiff">
@@ -296,7 +296,7 @@
296	audio	296	audio
297	</widgettype>	297	</widgettype>
298	<impl>	298	<impl>
299	media_plugin_quicktime	299	media_plugin_gstreamer010
300	</impl>	300	</impl>
301	</mimetype>	301	</mimetype>
302	<mimetype name="audio/x-wav">	302	<mimetype name="audio/x-wav">
@@ -307,7 +307,7 @@
307	audio	307	audio
308	</widgettype>	308	</widgettype>
309	<impl>	309	<impl>
310	media_plugin_quicktime	310	media_plugin_gstreamer010
311	</impl>	311	</impl>
312	</mimetype>	312	</mimetype>
313	<mimetype menu="1" name="image/bmp">	313	<mimetype menu="1" name="image/bmp">
@@ -417,7 +417,7 @@
417	movie	417	movie
418	</widgettype>	418	</widgettype>
419	<impl>	419	<impl>
420	media_plugin_quicktime	420	media_plugin_gstreamer010
421	</impl>	421	</impl>
422	</mimetype>	422	</mimetype>
423	<mimetype name="video/mp4">	423	<mimetype name="video/mp4">
@@ -428,18 +428,18 @@
428	movie	428	movie
429	</widgettype>	429	</widgettype>
430	<impl>	430	<impl>
431	media_plugin_quicktime	431	media_plugin_gstreamer010
432	</impl>	432	</impl>
433	</mimetype>	433	</mimetype>
434	<mimetype menu="1" name="video/quicktime">	434	<mimetype menu="1" name="video/gstreamer">
435	<label name="video/quicktime_label">	435	<label name="video/gstreamer_label">
436	Movie (QuickTime)	436	Movie (gstreamer)
437	</label>	437	</label>
438	<widgettype>	438	<widgettype>
439	movie	439	movie
440	</widgettype>	440	</widgettype>
441	<impl>	441	<impl>
442	media_plugin_quicktime	442	media_plugin_gstreamer010
443	</impl>	443	</impl>
444	</mimetype>	444	</mimetype>
445	<mimetype name="video/x-ms-asf">	445	<mimetype name="video/x-ms-asf">
@@ -450,7 +450,7 @@
450	movie	450	movie
451	</widgettype>	451	</widgettype>
452	<impl>	452	<impl>
453	media_plugin_quicktime	453	media_plugin_gstreamer010
454	</impl>	454	</impl>
455	</mimetype>	455	</mimetype>
456	<mimetype name="video/x-ms-wmv">	456	<mimetype name="video/x-ms-wmv">
@@ -461,7 +461,7 @@
461	movie	461	movie
462	</widgettype>	462	</widgettype>
463	<impl>	463	<impl>
464	media_plugin_quicktime	464	media_plugin_gstreamer010
465	</impl>	465	</impl>
466	</mimetype>	466	</mimetype>
467	<mimetype menu="1" name="video/x-msvideo">	467	<mimetype menu="1" name="video/x-msvideo">
@@ -472,7 +472,7 @@
472	movie	472	movie
473	</widgettype>	473	</widgettype>
474	<impl>	474	<impl>
475	media_plugin_quicktime	475	media_plugin_gstreamer010
476	</impl>	476	</impl>
477	</mimetype>	477	</mimetype>
478	</mimetypes>	478	</mimetypes>


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 4a7a6e1..d4d47cb 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
@@ -109,7 +109,7 @@
109	movie	109	movie
110	</widgettype>	110	</widgettype>
111	<impl>	111	<impl>
112	media_plugin_quicktime	112	media_plugin_gstreamer
113	</impl>	113	</impl>
114	</scheme>	114	</scheme>
115	<mimetype name="blank">	115	<mimetype name="blank">
@@ -120,7 +120,7 @@
120	none	120	none
121	</widgettype>	121	</widgettype>
122	<impl>	122	<impl>
123	media_plugin_quicktime	123	media_plugin_gstreamer
124	</impl>	124	</impl>
125	</mimetype>	125	</mimetype>
126	<mimetype name="none/none">	126	<mimetype name="none/none">
@@ -157,13 +157,13 @@
157	</mimetype>	157	</mimetype>
158	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">	158	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
159	<label name="vnd.secondlife.qt.legacy_label">	159	<label name="vnd.secondlife.qt.legacy_label">
160	Movie (QuickTime)	160	Movie (gstreamer)
161	</label>	161	</label>
162	<widgettype>	162	<widgettype>
163	movie	163	movie
164	</widgettype>	164	</widgettype>
165	<impl>	165	<impl>
166	media_plugin_quicktime	166	media_plugin_gstreamer
167	</impl>	167	</impl>
168	</mimetype>	168	</mimetype>
169	<mimetype name="application/javascript">	169	<mimetype name="application/javascript">
@@ -214,7 +214,7 @@
214	movie	214	movie
215	</widgettype>	215	</widgettype>
216	<impl>	216	<impl>
217	media_plugin_quicktime	217	media_plugin_gstreamer
218	</impl>	218	</impl>
219	</mimetype>	219	</mimetype>
220	<mimetype name="application/xhtml+xml">	220	<mimetype name="application/xhtml+xml">
@@ -241,7 +241,7 @@
241	audio	241	audio
242	</widgettype>	242	</widgettype>
243	<impl>	243	<impl>
244	media_plugin_quicktime	244	media_plugin_gstreamer
245	</impl>	245	</impl>
246	</mimetype>	246	</mimetype>
247	<mimetype name="audio/mpeg">	247	<mimetype name="audio/mpeg">
@@ -252,7 +252,7 @@
252	audio	252	audio
253	</widgettype>	253	</widgettype>
254	<impl>	254	<impl>
255	media_plugin_quicktime	255	media_plugin_gstreamer
256	</impl>	256	</impl>
257	</mimetype>	257	</mimetype>
258	<mimetype name="audio/x-aiff">	258	<mimetype name="audio/x-aiff">
@@ -263,7 +263,7 @@
263	audio	263	audio
264	</widgettype>	264	</widgettype>
265	<impl>	265	<impl>
266	media_plugin_quicktime	266	media_plugin_gstreamer
267	</impl>	267	</impl>
268	</mimetype>	268	</mimetype>
269	<mimetype name="audio/x-wav">	269	<mimetype name="audio/x-wav">
@@ -274,7 +274,7 @@
274	audio	274	audio
275	</widgettype>	275	</widgettype>
276	<impl>	276	<impl>
277	media_plugin_quicktime	277	media_plugin_gstreamer010
278	</impl>	278	</impl>
279	</mimetype>	279	</mimetype>
280	<mimetype menu="1" name="image/bmp">	280	<mimetype menu="1" name="image/bmp">
@@ -384,7 +384,7 @@
384	movie	384	movie
385	</widgettype>	385	</widgettype>
386	<impl>	386	<impl>
387	media_plugin_quicktime	387	media_plugin_gstreamer010010
388	</impl>	388	</impl>
389	</mimetype>	389	</mimetype>
390	<mimetype name="video/mp4">	390	<mimetype name="video/mp4">
@@ -395,18 +395,18 @@
395	movie	395	movie
396	</widgettype>	396	</widgettype>
397	<impl>	397	<impl>
398	media_plugin_quicktime	398	media_plugin_gstreamer010010
399	</impl>	399	</impl>
400	</mimetype>	400	</mimetype>
401	<mimetype menu="1" name="video/quicktime">	401	<mimetype menu="1" name="video/gstreamer">
402	<label name="video/quicktime_label">	402	<label name="video/gstreamer_label">
403	Movie (QuickTime)	403	Movie (gstreamer)
404	</label>	404	</label>
405	<widgettype>	405	<widgettype>
406	movie	406	movie
407	</widgettype>	407	</widgettype>
408	<impl>	408	<impl>
409	media_plugin_quicktime	409	media_plugin_gstreamer010010
410	</impl>	410	</impl>
411	</mimetype>	411	</mimetype>
412	<mimetype name="video/x-ms-asf">	412	<mimetype name="video/x-ms-asf">
@@ -417,7 +417,7 @@
417	movie	417	movie
418	</widgettype>	418	</widgettype>
419	<impl>	419	<impl>
420	media_plugin_quicktime	420	media_plugin_gstreamer010010
421	</impl>	421	</impl>
422	</mimetype>	422	</mimetype>
423	<mimetype name="video/x-ms-wmv">	423	<mimetype name="video/x-ms-wmv">
@@ -428,7 +428,7 @@
428	movie	428	movie
429	</widgettype>	429	</widgettype>
430	<impl>	430	<impl>
431	media_plugin_quicktime	431	media_plugin_gstreamer010010
432	</impl>	432	</impl>
433	</mimetype>	433	</mimetype>
434	<mimetype menu="1" name="video/x-msvideo">	434	<mimetype menu="1" name="video/x-msvideo">
@@ -439,7 +439,7 @@
439	movie	439	movie
440	</widgettype>	440	</widgettype>
441	<impl>	441	<impl>
442	media_plugin_quicktime	442	media_plugin_gstreamer010010
443	</impl>	443	</impl>
444	</mimetype>	444	</mimetype>
445	</mimetypes>	445	</mimetypes>