summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-01-18 22:00:01 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-01-18 22:00:01 +0200
commite3a90ba4c1b7fffbb27361155dd67f86097f9a4d (patch)
treebd075cc048b50486b70d7158d14286cc86782cd9 /indra/newview
parent8ec8732ec9a6dd109b3d40762148f0c951566e9b (diff)
SL-3033 flv files prompt download instead of playing
Viewer doesn't support web downloads, it should be safe to assume stream and play it
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/mime_types.xml22
-rw-r--r--indra/newview/skins/default/xui/en/mime_types_mac.xml22
2 files changed, 44 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml
index de9ac4247f..a9d99dad27 100644
--- a/indra/newview/skins/default/xui/en/mime_types.xml
+++ b/indra/newview/skins/default/xui/en/mime_types.xml
@@ -309,6 +309,17 @@
media_plugin_cef
</impl>
</mimetype>
+ <mimetype name="application/octet-stream">
+ <label name="application/octet-stream_label">
+ Stream
+ </label>
+ <widgettype>
+ movie
+ </widgettype>
+ <impl>
+ media_plugin_libvlc
+ </impl>
+ </mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
Audio (MIDI)
@@ -474,6 +485,17 @@
media_plugin_libvlc
</impl>
</mimetype>
+ <mimetype name="video/x-flv">
+ <label name="video/x-flv_label">
+ Movie (flv)
+ </label>
+ <widgettype>
+ movie
+ </widgettype>
+ <impl>
+ media_plugin_libvlc
+ </impl>
+ </mimetype>
<mimetype name="application/octet-stream">
<label name="video/octet-stream">
Movie
diff --git a/indra/newview/skins/default/xui/en/mime_types_mac.xml b/indra/newview/skins/default/xui/en/mime_types_mac.xml
index 2d96708b86..7fa0a676dd 100644
--- a/indra/newview/skins/default/xui/en/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/en/mime_types_mac.xml
@@ -287,6 +287,17 @@
media_plugin_cef
</impl>
</mimetype>
+ <mimetype name="application/octet-stream">
+ <label name="application/octet-stream_label">
+ Stream
+ </label>
+ <widgettype>
+ movie
+ </widgettype>
+ <impl>
+ media_plugin_libvlc
+ </impl>
+ </mimetype>
<mimetype name="audio/mid">
<label name="audio/mid_label">
Audio (MIDI)
@@ -452,6 +463,17 @@
media_plugin_libvlc
</impl>
</mimetype>
+ <mimetype name="video/x-flv">
+ <label name="video/x-flv_label">
+ Movie (flv)
+ </label>
+ <widgettype>
+ movie
+ </widgettype>
+ <impl>
+ media_plugin_libvlc
+ </impl>
+ </mimetype>
<mimetype menu="1" name="video/quicktime">
<label name="video/quicktime_label">
Movie (QuickTime)