summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorcallum_linden <none@none>2016-06-28 15:24:01 -0700
committercallum_linden <none@none>2016-06-28 15:24:01 -0700
commit26e4a99f40e4bb54ab3206d0c57faed1edc560ff (patch)
treea4514ca4fc4561efd52a7626cd1a0cac78b9bb2d /indra/newview/skins/default/xui/en
parentd91722edbfa9b6bedb75f49a7bc5736935f398e5 (diff)
Fixed up broken XML for Web Content Browser test video URL buttons
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_web_content.xml28
1 files changed, 25 insertions, 3 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 86be363245..7b63a67415 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -213,7 +213,7 @@
width="22">
<button.commit_callback
function="WebContent.TestVideo"
- parameter="https://callum-linden.s3.amazonaws.com/sample_media/kubo.webm"/>
+ parameter="https://callum-linden.s3.amazonaws.com/sample_media/jumprope.webm"/>
</button>
<button
@@ -232,8 +232,30 @@
name="VLC Plugin Test"
top="22"
width="22">
- function="WebContent.TestVideo"
- parameter="https://callum-linden.s3.amazonaws.com/alegria.mp3"/>
+ <button.commit_callback
+ function="WebContent.TestVideo"
+ parameter="https://callum-linden.s3.amazonaws.com/alegria.mp3"/>
+ </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="FLV Test"
+ enabled="true"
+ follows="left|top"
+ height="22"
+ layout="topleft"
+ left="99"
+ name="VLC Plugin Test"
+ top="22"
+ width="22">
+ <button.commit_callback
+ function="WebContent.TestVideo"
+ parameter="https://callum-linden.s3.amazonaws.com/sample_media/vandal.flv"/>
</button>
</layout_panel>