diff options
| author | thickbrick | 2011-03-26 12:50:47 +0200 |
|---|---|---|
| committer | thickbrick | 2011-03-26 12:50:47 +0200 |
| commit | e2c84771ca57722751d6cd9e77bd99f5317d5ea9 (patch) | |
| tree | 26d8a4436cc38d0892e4073361d90de7c7c4ec83 /linden | |
| parent | Fix #824/SNOW-466: Window Creation Error related to FSAA (diff) | |
| download | meta-impy-e2c84771ca57722751d6cd9e77bd99f5317d5ea9.zip meta-impy-e2c84771ca57722751d6cd9e77bd99f5317d5ea9.tar.gz meta-impy-e2c84771ca57722751d6cd9e77bd99f5317d5ea9.tar.bz2 meta-impy-e2c84771ca57722751d6cd9e77bd99f5317d5ea9.tar.xz | |
Fix #810: Add video/x-m4v to mime_types_*.xml
Diffstat (limited to 'linden')
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 @@ | |||
| 431 | media_plugin_gstreamer | 431 | media_plugin_gstreamer |
| 432 | </impl> | 432 | </impl> |
| 433 | </mimetype> | 433 | </mimetype> |
| 434 | <mimetype name="video/x-m4v"> | ||
| 435 | <label name="video/m4v_label"> | ||
| 436 | Movie (M4V) | ||
| 437 | </label> | ||
| 438 | <widgettype> | ||
| 439 | movie | ||
| 440 | </widgettype> | ||
| 441 | <impl> | ||
| 442 | media_plugin_gstreamer | ||
| 443 | </impl> | ||
| 444 | </mimetype> | ||
| 434 | <mimetype menu="1" name="video/quicktime"> | 445 | <mimetype menu="1" name="video/quicktime"> |
| 435 | <label name="video/quicktime_label"> | 446 | <label name="video/quicktime_label"> |
| 436 | Movie (QuickTime) | 447 | 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 @@ | |||
| 431 | media_plugin_quicktime | 431 | media_plugin_quicktime |
| 432 | </impl> | 432 | </impl> |
| 433 | </mimetype> | 433 | </mimetype> |
| 434 | <mimetype name="video/x-m4v"> | ||
| 435 | <label name="video/m4v_label"> | ||
| 436 | Movie (M4V) | ||
| 437 | </label> | ||
| 438 | <widgettype> | ||
| 439 | movie | ||
| 440 | </widgettype> | ||
| 441 | <impl> | ||
| 442 | media_plugin_gstreamer | ||
| 443 | </impl> | ||
| 444 | </mimetype> | ||
| 434 | <mimetype menu="1" name="video/quicktime"> | 445 | <mimetype menu="1" name="video/quicktime"> |
| 435 | <label name="video/quicktime_label"> | 446 | <label name="video/quicktime_label"> |
| 436 | Movie (QuickTime) | 447 | 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 @@ | |||
| 428 | movie | 428 | movie |
| 429 | </widgettype> | 429 | </widgettype> |
| 430 | <impl> | 430 | <impl> |
| 431 | media_plugin_quicktime | 431 | media_plugin_quicktime |
| 432 | </impl> | 432 | </impl> |
| 433 | </mimetype> | ||
| 434 | <mimetype name="video/x-m4v"> | ||
| 435 | <label name="video/m4v_label"> | ||
| 436 | Movie (M4V) | ||
| 437 | </label> | ||
| 438 | <widgettype> | ||
| 439 | movie | ||
| 440 | </widgettype> | ||
| 441 | <impl> | ||
| 442 | media_plugin_gstreamer | ||
| 443 | </impl> | ||
| 433 | </mimetype> | 444 | </mimetype> |
| 434 | <mimetype menu="1" name="video/quicktime"> | 445 | <mimetype menu="1" name="video/quicktime"> |
| 435 | <label name="video/quicktime_label"> | 446 | <label name="video/quicktime_label"> |