livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some simple tidy up and added a proper URL for video test button in web content floater

meow-7.2.2
callum_linden 2016-05-27 16:53:16 -07:00
parent ccfb18948d
commit 282956e768
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/media_plugins/libvlc/media_plugin_libvlc.cpp
View File

@ -173,26 +173,18 @@ void MediaPluginLibVLC::playMedia()
gLibVLCMedia = libvlc_media_new_location(gLibVLC, mURL.c_str());
if (!gLibVLCMedia)
{
printf("libvlc_media_new_location failed\n");
}
else
{
printf("libvlc_media_new_location ok\n");
gLibVLCMediaPlayer = 0;
return;
}
gLibVLCMediaPlayer = libvlc_media_player_new_from_media(gLibVLCMedia);
if (!gLibVLCMediaPlayer)
{
printf("libvlc_media_player_new_from_media failed\n");
}
else
{
printf("libvlc_media_player_new_from_media ok...\n");
return;
}
libvlc_media_release(gLibVLCMedia);
gVLCCallbackContext.parent = this;
gVLCCallbackContext.texture_pixels = mPixels;
gVLCCallbackContext.mp = gLibVLCMediaPlayer;

BIN
indra/newview/skins/default/textures/icons/Video_URL_Off.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 282 B

5
indra/newview/skins/default/textures/textures.xml
View File

@ -676,7 +676,10 @@ with the same filename but different name
<texture name="Unread_Chiclet" file_name="bottomtray/Unread_Chiclet.png" preload="false" />
<texture name="UpArrow_Off" file_name="icons/UpArrow_Off.png" preload="false" />
<texture name="Vertical Drag Handle" file_name="widgets/vertical_drag_handle.png" scale.left="2" scale.right="7" scale.bottom="8" scale.top="120" scale_type="scale_outer"/>
<texture name="Video_URL_Off" file_name="icons/Video_URL_Off.png" preload="true" />
<texture name="Vertical Drag Handle" file_name="widgets/vertical_drag_handle.png" scale.left="2" scale.right="7" scale.bottom="8" scale.top="120" scale_type="scale_outer"/>
<texture name="Volume_Background" file_name="windows/Volume_Background.png" preload="false"
scale.left="6" scale.top="33" scale.right="63" scale.bottom="10" />