diff options
| author | Nicky <sl.nicky.ml@googlemail.com> | 2016-06-02 11:34:26 +0200 |
|---|---|---|
| committer | Nicky <sl.nicky.ml@googlemail.com> | 2016-06-02 11:34:26 +0200 |
| commit | 336121312b9ea30fcc46a033f3b6c4b23358ab1b (patch) | |
| tree | 2e3bb4b64458ef4dd62182316aae3972ec6fa968 /indra/newview | |
| parent | 76947b8fdcabe6904f86f233034304056fea388a (diff) | |
| parent | 66e8ed280707b2ada96708bb97f472280bf9431e (diff) | |
Merge.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/en/mime_types.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml index 2867204318..c27fac6731 100644 --- a/indra/newview/skins/default/xui/en/mime_types.xml +++ b/indra/newview/skins/default/xui/en/mime_types.xml @@ -174,7 +174,7 @@ audio </widgettype> <impl> - media_plugin_cef + media_plugin_libvlc </impl> </mimetype> <mimetype name="video/*"> @@ -317,7 +317,7 @@ audio </widgettype> <impl> - media_plugin_cef + media_plugin_libvlc </impl> </mimetype> <mimetype name="audio/x-aiff"> @@ -328,7 +328,7 @@ audio </widgettype> <impl> - media_plugin_cef + media_plugin_libvlc </impl> </mimetype> <mimetype name="audio/x-wav"> @@ -339,7 +339,7 @@ audio </widgettype> <impl> - media_plugin_cef + media_plugin_libvlc </impl> </mimetype> <mimetype menu="1" name="image/bmp"> |