aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/mime_types.xml478
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/mime_types_windows.xml14
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py2
3 files changed, 8 insertions, 486 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
deleted file mode 100644
index 360438a..0000000
--- a/linden/indra/newview/skins/default/xui/en-us/mime_types.xml
+++ /dev/null
@@ -1,478 +0,0 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<mimetypes name="default">
3 <defaultlabel>
4 (Unknown)
5 </defaultlabel>
6 <defaultwidget>
7 none
8 </defaultwidget>
9 <defaultimpl>
10 media_plugin_webkit
11 </defaultimpl>
12 <widgetset name="web">
13 <label name="web_label">
14 Web Content
15 </label>
16 <icon>
17 icn_media_web.tga
18 </icon>
19 <default_type>
20 text/html
21 </default_type>
22 <tooltip name="web_tooltip">
23 This location has Web content
24 </tooltip>
25 <playtip name="web_playtip">
26 Show Web content
27 </playtip>
28 <allow_resize>
29 true
30 </allow_resize>
31 <allow_looping>
32 false
33 </allow_looping>
34 </widgetset>
35 <widgetset name="movie">
36 <label name="movie_label">
37 Movie
38 </label>
39 <default_type>
40 video/*
41 </default_type>
42 <icon>
43 icn_media_movie.tga
44 </icon>
45 <tooltip name="movie_tooltip">
46 There is a movie to play here
47 </tooltip>
48 <playtip name="movie_playtip">
49 Play movie
50 </playtip>
51 <allow_resize>
52 false
53 </allow_resize>
54 <allow_looping>
55 true
56 </allow_looping>
57 </widgetset>
58 <widgetset name="image">
59 <label name="image_label">
60 Image
61 </label>
62 <icon>
63 icn_media_web.tga
64 </icon>
65 <default_type>
66 image/*
67 </default_type>
68 <tooltip name="image_tooltip">
69 There is an image at this location
70 </tooltip>
71 <playtip name="image_playtip">
72 View this location&apos;s image
73 </playtip>
74 <allow_resize>
75 false
76 </allow_resize>
77 <allow_looping>
78 false
79 </allow_looping>
80 </widgetset>
81 <widgetset name="audio">
82 <label name="audio_label">
83 Audio
84 </label>
85 <icon>
86 icn_media_web.tga
87 </icon>
88 <default_type>
89 audio/*
90 </default_type>
91 <tooltip name="audio_tooltip">
92 There is audio at this location
93 </tooltip>
94 <playtip name="audio_playtip">
95 Play this location&apos;s audio
96 </playtip>
97 <allow_resize>
98 false
99 </allow_resize>
100 <allow_looping>
101 true
102 </allow_looping>
103 </widgetset>
104 <scheme name="rtsp">
105 <label name="rtsp_label">
106 Real Time Streaming
107 </label>
108 <widgettype>
109 movie
110 </widgettype>
111 <impl>
112 media_plugin_gstreamer010
113 </impl>
114 </scheme>
115 <mimetype name="blank">
116 <label name="blank_label">
117 - None -
118 </label>
119 <widgettype>
120 none
121 </widgettype>
122 <impl>
123 media_plugin_webkit
124 </impl>
125 </mimetype>
126 <mimetype name="none/none">
127 <label name="none/none_label">
128 - None -
129 </label>
130 <widgettype>
131 none
132 </widgettype>
133 <impl>
134 media_plugin_webkit
135 </impl>
136 </mimetype>
137 <mimetype name="audio/*">
138 <label name="audio2_label">
139 Audio
140 </label>
141 <widgettype>
142 audio
143 </widgettype>
144 <impl>
145 media_plugin_gstreamer010
146 </impl>
147 </mimetype>
148 <mimetype name="video/*">
149 <label name="video2_label">
150 Video
151 </label>
152 <widgettype>
153 movie
154 </widgettype>
155 <impl>
156 media_plugin_gstreamer010
157 </impl>
158 </mimetype>
159 <mimetype name="image/*">
160 <label name="image2_label">
161 Image
162 </label>
163 <widgettype>
164 image
165 </widgettype>
166 <impl>
167 media_plugin_webkit
168 </impl>
169 </mimetype>
170 <mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
171 <label name="vnd.secondlife.qt.legacy_label">
172 Movie (gstreamer)
173 </label>
174 <widgettype>
175 movie
176 </widgettype>
177 <impl>
178 media_plugin_gstreamer010
179 </impl>
180 </mimetype>
181 <mimetype name="application/javascript">
182 <label name="application/javascript_label">
183 Javascript
184 </label>
185 <widgettype>
186 web
187 </widgettype>
188 <impl>
189 media_plugin_webkit
190 </impl>
191 </mimetype>
192 <mimetype name="application/ogg">
193 <label name="application/ogg_label">
194 Ogg Audio/Video
195 </label>
196 <widgettype>
197 audio
198 </widgettype>
199 <impl>
200 media_plugin_gstreamer010
201 </impl>
202 </mimetype>
203 <mimetype name="application/pdf">
204 <label name="application/pdf_label">
205 PDF Document
206 </label>
207 <widgettype>
208 image
209 </widgettype>
210 <impl>
211 media_plugin_webkit
212 </impl>
213 </mimetype>
214 <mimetype name="application/postscript">
215 <label name="application/postscript_label">
216 Postscript Document
217 </label>
218 <widgettype>
219 image
220 </widgettype>
221 <impl>
222 media_plugin_webkit
223 </impl>
224 </mimetype>
225 <mimetype name="application/rtf">
226 <label name="application/rtf_label">
227 Rich Text (RTF)
228 </label>
229 <widgettype>
230 image
231 </widgettype>
232 <impl>
233 media_plugin_webkit
234 </impl>
235 </mimetype>
236 <mimetype name="application/smil">
237 <label name="application/smil_label">
238 Synchronized Multimedia Integration Language (SMIL)
239 </label>
240 <widgettype>
241 movie
242 </widgettype>
243 <impl>
244 media_plugin_webkit
245 </impl>
246 </mimetype>
247 <mimetype name="application/xhtml+xml">
248 <label name="application/xhtml+xml_label">
249 Web Page (XHTML)
250 </label>
251 <widgettype>
252 web
253 </widgettype>
254 <impl>
255 media_plugin_webkit
256 </impl>
257 </mimetype>
258 <mimetype name="application/x-director">
259 <label name="application/x-director_label">
260 Macromedia Director
261 </label>
262 <widgettype>
263 image
264 </widgettype>
265 <impl>
266 media_plugin_webkit
267 </impl>
268 </mimetype>
269 <mimetype name="audio/mid">
270 <label name="audio/mid_label">
271 Audio (MIDI)
272 </label>
273 <widgettype>
274 audio
275 </widgettype>
276 <impl>
277 media_plugin_gstreamer010
278 </impl>
279 </mimetype>
280 <mimetype name="audio/mpeg">
281 <label name="audio/mpeg_label">
282 Audio (MP3)
283 </label>
284 <widgettype>
285 audio
286 </widgettype>
287 <impl>
288 media_plugin_gstreamer010
289 </impl>
290 </mimetype>
291 <mimetype name="audio/x-aiff">
292 <label name="audio/x-aiff_label">
293 Audio (AIFF)
294 </label>
295 <widgettype>
296 audio
297 </widgettype>
298 <impl>
299 media_plugin_gstreamer010
300 </impl>
301 </mimetype>
302 <mimetype name="audio/x-wav">
303 <label name="audio/x-wav_label">
304 Audio (WAV)
305 </label>
306 <widgettype>
307 audio
308 </widgettype>
309 <impl>
310 media_plugin_gstreamer010
311 </impl>
312 </mimetype>
313 <mimetype menu="1" name="image/bmp">
314 <label name="image/bmp_label">
315 Image (BMP)
316 </label>
317 <widgettype>
318 image
319 </widgettype>
320 <impl>
321 media_plugin_webkit
322 </impl>
323 </mimetype>
324 <mimetype menu="1" name="image/gif">
325 <label name="image/gif_label">
326 Image (GIF)
327 </label>
328 <widgettype>
329 image
330 </widgettype>
331 <impl>
332 media_plugin_webkit
333 </impl>
334 </mimetype>
335 <mimetype menu="1" name="image/jpeg">
336 <label name="image/jpeg_label">
337 Image (JPEG)
338 </label>
339 <widgettype>
340 image
341 </widgettype>
342 <impl>
343 media_plugin_webkit
344 </impl>
345 </mimetype>
346 <mimetype menu="1" name="image/png">
347 <label name="image/png_label">
348 Image (PNG)
349 </label>
350 <widgettype>
351 image
352 </widgettype>
353 <impl>
354 media_plugin_webkit
355 </impl>
356 </mimetype>
357 <mimetype name="image/svg+xml">
358 <label name="image/svg+xml_label">
359 Image (SVG)
360 </label>
361 <widgettype>
362 image
363 </widgettype>
364 <impl>
365 media_plugin_webkit
366 </impl>
367 </mimetype>
368 <mimetype menu="1" name="image/tiff">
369 <label name="image/tiff_label">
370 Image (TIFF)
371 </label>
372 <widgettype>
373 image
374 </widgettype>
375 <impl>
376 media_plugin_webkit
377 </impl>
378 </mimetype>
379 <mimetype menu="1" name="text/html">
380 <label name="text/html_label">
381 Web Page
382 </label>
383 <widgettype>
384 web
385 </widgettype>
386 <impl>
387 media_plugin_webkit
388 </impl>
389 </mimetype>
390 <mimetype menu="1" name="text/plain">
391 <label name="text/plain_label">
392 Text
393 </label>
394 <widgettype>
395 text
396 </widgettype>
397 <impl>
398 media_plugin_webkit
399 </impl>
400 </mimetype>
401 <mimetype name="text/xml">
402 <label name="text/xml_label">
403 XML
404 </label>
405 <widgettype>
406 text
407 </widgettype>
408 <impl>
409 media_plugin_webkit
410 </impl>
411 </mimetype>
412 <mimetype menu="1" name="video/mpeg">
413 <label name="video/mpeg_label">
414 Movie (MPEG)
415 </label>
416 <widgettype>
417 movie
418 </widgettype>
419 <impl>
420 media_plugin_gstreamer010
421 </impl>
422 </mimetype>
423 <mimetype name="video/mp4">
424 <label name="video/mp4_label">
425 Movie (MP4)
426 </label>
427 <widgettype>
428 movie
429 </widgettype>
430 <impl>
431 media_plugin_gstreamer010
432 </impl>
433 </mimetype>
434 <mimetype menu="1" name="video/gstreamer">
435 <label name="video/gstreamer_label">
436 Movie (gstreamer)
437 </label>
438 <widgettype>
439 movie
440 </widgettype>
441 <impl>
442 media_plugin_gstreamer010
443 </impl>
444 </mimetype>
445 <mimetype name="video/x-ms-asf">
446 <label name="video/x-ms-asf_label">
447 Movie (Windows Media ASF)
448 </label>
449 <widgettype>
450 movie
451 </widgettype>
452 <impl>
453 media_plugin_gstreamer010
454 </impl>
455 </mimetype>
456 <mimetype name="video/x-ms-wmv">
457 <label name="video/x-ms-wmv_label">
458 Movie (Windows Media WMV)
459 </label>
460 <widgettype>
461 movie
462 </widgettype>
463 <impl>
464 media_plugin_gstreamer010
465 </impl>
466 </mimetype>
467 <mimetype menu="1" name="video/x-msvideo">
468 <label name="video/x-msvideo_label">
469 Movie (AVI)
470 </label>
471 <widgettype>
472 movie
473 </widgettype>
474 <impl>
475 media_plugin_gstreamer010
476 </impl>
477 </mimetype>
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 d4d47cb..5ff3b19 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
@@ -274,7 +274,7 @@
274 audio 274 audio
275 </widgettype> 275 </widgettype>
276 <impl> 276 <impl>
277 media_plugin_gstreamer010 277 media_plugin_gstreamer
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_gstreamer010010 387 media_plugin_gstreamer
388 </impl> 388 </impl>
389 </mimetype> 389 </mimetype>
390 <mimetype name="video/mp4"> 390 <mimetype name="video/mp4">
@@ -395,7 +395,7 @@
395 movie 395 movie
396 </widgettype> 396 </widgettype>
397 <impl> 397 <impl>
398 media_plugin_gstreamer010010 398 media_plugin_gstreamer
399 </impl> 399 </impl>
400 </mimetype> 400 </mimetype>
401 <mimetype menu="1" name="video/gstreamer"> 401 <mimetype menu="1" name="video/gstreamer">
@@ -406,7 +406,7 @@
406 movie 406 movie
407 </widgettype> 407 </widgettype>
408 <impl> 408 <impl>
409 media_plugin_gstreamer010010 409 media_plugin_gstreamer
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_gstreamer010010 420 media_plugin_gstreamer
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_gstreamer010010 431 media_plugin_gstreamer
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_gstreamer010010 442 media_plugin_gstreamer
443 </impl> 443 </impl>
444 </mimetype> 444 </mimetype>
445</mimetypes> 445</mimetypes>
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 143d946..65e615c 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -271,7 +271,7 @@ class WindowsManifest(ViewerManifest):
271 271
272 # Media plugins - Gstreamer 272 # Media plugins - Gstreamer
273 if self.prefix(src='../media_plugins/gstreamer/%s' % self.args['configuration'], dst="llplugin"): 273 if self.prefix(src='../media_plugins/gstreamer/%s' % self.args['configuration'], dst="llplugin"):
274 self.path("media_plugin_gstreamer010.dll") 274 self.path("media_plugin_gstreamer010.dll", "media_plugin_gstreamer.dll")
275 self.end_prefix() 275 self.end_prefix()
276 276
277 # For WebKit/Qt plugin runtimes 277 # For WebKit/Qt plugin runtimes
generated by cgit v1.1 at 2024-11-15 17:42:04 +0000