From 282956e7688169e539059385962cbd6a295255f6 Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Fri, 27 May 2016 16:53:16 -0700
Subject: [PATCH] Some simple tidy up and added a proper URL for video test
 button in web content floater

---
 .../media_plugins/libvlc/media_plugin_libvlc.cpp  |  14 +++-----------
 .../default/textures/icons/Video_URL_Off.png      | Bin 0 -> 282 bytes
 indra/newview/skins/default/textures/textures.xml |   5 ++++-
 3 files changed, 7 insertions(+), 12 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/icons/Video_URL_Off.png

diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
index 92bfc15113..43d4e95243 100644
--- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
+++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
@@ -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;
diff --git a/indra/newview/skins/default/textures/icons/Video_URL_Off.png b/indra/newview/skins/default/textures/icons/Video_URL_Off.png
new file mode 100644
index 0000000000000000000000000000000000000000..40e5df7d81372cf23f9e924e6f2dc9241a48f0f8
GIT binary patch
literal 282
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9F5M?jcysy3fAQ1FbW
zi(`n!#JQ6Wu3}c?aW!7>z$u`qNnwYCIHP&ir~m)29i8$i&Yk=1-A>C{!c6z7*P1dY
zB;8;UWOT@WyO&+i(IxqegtM7svP7~#pi4sd7VZuX!K+a-E5nbR*&3!)#dIx-;l<wf
z4fm`WBC_W@XsRwXdA?^|a?kV1f2_~uXf6#pb?cx+@!soE(biAqICHF**JEJld)#4Y
z^m&eP%Y@=M>pP9*?boCP_bw~R@0{8B!b(r(-KF<@=PZ|AdA?C=>73&IO!29Twdd_$
d=3oEKSn;q}ch`aPjX-}fc)I$ztaD0e0ss}VZJ+=E

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 72037a84b3..01e8c16937 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -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" />