diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_web_content.xml | 88 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/mime_types.xml | 25 |
2 files changed, 104 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml index a80440e844..86be363245 100755 --- a/indra/newview/skins/default/xui/en/floater_web_content.xml +++ b/indra/newview/skins/default/xui/en/floater_web_content.xml @@ -25,10 +25,10 @@ <layout_panel auto_resize="false" default_tab_group="1" - height="22" + height="44" layout="topleft" left="0" - min_height="20" + min_height="40" name="nav_controls" top="400" width="770"> @@ -152,6 +152,90 @@ <button.commit_callback function="WebContent.PopExternal" /> </button> + + <button + image_overlay="Video_URL_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + chrome="true" + tool_tip="MPEG4 Video Test" + enabled="true" + follows="left|top" + height="22" + layout="topleft" + left="1" + name="VLC Plugin Test" + top="22" + width="22"> + <button.commit_callback + function="WebContent.TestVideo" + parameter="https://callum-linden.s3.amazonaws.com/sample_media/ss.mp4"/> + </button> + + <button + image_overlay="Video_URL_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + chrome="true" + tool_tip="MKV Video Test" + enabled="true" + follows="left|top" + height="22" + layout="topleft" + left="27" + name="VLC Plugin Test" + top="22" + width="22"> + <button.commit_callback + function="WebContent.TestVideo" + parameter="https://callum-linden.s3.amazonaws.com/sample_media/jellyfish.mkv"/> + </button> + + <button + image_overlay="Video_URL_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + chrome="true" + tool_tip="WebM Video Test" + enabled="true" + follows="left|top" + height="22" + layout="topleft" + left="51" + name="VLC Plugin Test" + top="22" + width="22"> + <button.commit_callback + function="WebContent.TestVideo" + parameter="https://callum-linden.s3.amazonaws.com/sample_media/kubo.webm"/> + </button> + + <button + image_overlay="Video_URL_Off" + image_disabled="PushButton_Disabled" + image_disabled_selected="PushButton_Disabled" + image_selected="PushButton_Selected" + image_unselected="PushButton_Off" + chrome="true" + tool_tip="MP3 audio Test" + enabled="true" + follows="left|top" + height="22" + layout="topleft" + left="75" + name="VLC Plugin Test" + top="22" + width="22"> + function="WebContent.TestVideo" + parameter="https://callum-linden.s3.amazonaws.com/alegria.mp3"/> + </button> + </layout_panel> <layout_panel height="40" diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml index e2dcc11fb0..2867204318 100755 --- a/indra/newview/skins/default/xui/en/mime_types.xml +++ b/indra/newview/skins/default/xui/en/mime_types.xml @@ -185,7 +185,7 @@ movie </widgettype> <impl> - media_plugin_cef + media_plugin_libvlc </impl> </mimetype> <mimetype name="image/*"> @@ -207,7 +207,7 @@ movie </widgettype> <impl> - media_plugin_cef + media_plugin_libvlc </impl> </mimetype> <mimetype name="application/javascript"> @@ -449,7 +449,7 @@ movie </widgettype> <impl> - media_plugin_cef + media_plugin_libvlc </impl> </mimetype> <mimetype name="video/mp4"> @@ -460,10 +460,21 @@ movie </widgettype> <impl> - media_plugin_cef + media_plugin_libvlc </impl> </mimetype> - <mimetype menu="1" name="video/quicktime"> + <mimetype name="application/octet-stream"> + <label name="video/octet-stream"> + Movie + </label> + <widgettype> + movie + </widgettype> + <impl> + media_plugin_libvlc + </impl> + </mimetype> + <mimetype menu="1" name="video/quicktime"> <label name="video/quicktime_label"> Movie (QuickTime) </label> @@ -471,7 +482,7 @@ movie </widgettype> <impl> - media_plugin_cef + media_plugin_libvlc </impl> </mimetype> <mimetype name="video/x-ms-asf"> @@ -482,7 +493,7 @@ movie </widgettype> <impl> - media_plugin_cef + media_plugin_libvlc </impl> </mimetype> <mimetype name="video/x-ms-wmv"> |