Fix MP4 Playback on windows, alchesync

indra/newview/CMakeLists.txt

@@ -1518,7 +1518,7 @@ if (WINDOWS)
       ${ARCH_PREBUILT_DIRS_DEBUG}/libeay32.dll
       ${ARCH_PREBUILT_DIRS_DEBUG}/ssleay32.dll
       SLPlugin
-      media_plugin_quicktime
+      media_plugin_libvlc
       media_plugin_cef
       windows-crash-logger
       )
@@ -1797,7 +1797,7 @@ if (DARWIN)
       ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
     )
 
-  add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit basic_plugin_filepicker)
+  add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_libvlc media_plugin_webkit basic_plugin_filepicker)
 
   if (PACKAGE)
       add_custom_target(llpackage ALL DEPENDS ${VIEWER_BINARY_NAME})

indra/newview/app_settings/mime_types.xml

@@ -7,7 +7,7 @@
 		none
 	</defaultwidget>
 	<defaultimpl>
-		media_plugin_webkit
+		media_plugin_cef
 	</defaultimpl>
 	<widgetset name="web">
 		<label name="web_label">
@@ -101,6 +101,27 @@
 			true
 		</allow_looping>
 	</widgetset>
+	<widgetset name="none">
+		<label name="none_label">
+			No Content
+		</label>
+		<default_type>
+			none/none
+		</default_type>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<tooltip name="none_tooltip">
+			No media here
+		</tooltip>
+		<playtip name="none_playtip" />
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			false
+		</allow_looping>
+	</widgetset>
 	<scheme name="rtsp">
 		<label name="rtsp_label">
 			Real Time Streaming
@@ -109,7 +130,18 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
+		</impl>
+	</scheme>
+  <scheme name="libvlc">
+    <label name="libvlc_label">
+      LibVLC supported media
+    </label>
+    <widgettype>
+      movie
+    </widgettype>
+    <impl>
+      media_plugin_libvlc
     </impl>
   </scheme>
   <mimetype name="blank">
@@ -120,7 +152,7 @@
 			none
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="none/none">
@@ -131,7 +163,7 @@
 			none
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="audio/*">
@@ -142,7 +174,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/*">
@@ -153,7 +185,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="image/*">
@@ -164,7 +196,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
@@ -175,7 +207,7 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -186,7 +218,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/ogg">
@@ -197,7 +229,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -208,7 +240,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/postscript">
@@ -219,7 +251,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/rtf">
@@ -230,7 +262,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/smil">
@@ -241,7 +273,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
@@ -252,7 +284,7 @@
 			web
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/x-director">
@@ -263,7 +295,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mid">
@@ -274,7 +306,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mpeg">
@@ -285,7 +317,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
@@ -296,7 +328,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-wav">
@@ -307,7 +339,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/bmp">
@@ -318,7 +350,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/gif">
@@ -329,7 +361,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/jpeg">
@@ -340,7 +372,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/png">
@@ -351,7 +383,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="image/svg+xml">
@@ -362,7 +394,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/tiff">
@@ -373,7 +405,7 @@
 			image
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="text/html">
@@ -384,7 +416,7 @@
 			web
 		</widgettype>
 		<impl>
-      media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="text/plain">
@@ -395,7 +427,7 @@
 			text
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="text/xml">
@@ -406,7 +438,7 @@
 			text
 		</widgettype>
 		<impl>
-			media_plugin_webkit
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/mpeg">
@@ -417,7 +449,7 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/mp4">
@@ -428,18 +460,29 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
-	<mimetype menu="1" name="video/quicktime">
+  <mimetype name="application/octet-stream">
-		<label name="video/quicktime_label">
+    <label name="video/octet-stream">
+      Movie
+    </label>
+    <widgettype>
+      movie
+    </widgettype>
+    <impl>
+      media_plugin_libvlc
+    </impl>
+	</mimetype>
+	<mimetype menu="1" name="video/libvlc">
+		<label name="video/libvlc_label">
 			Movie (QuickTime)
 		</label>
 		<widgettype>
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
@@ -450,7 +493,7 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
@@ -461,7 +504,7 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/x-msvideo">
@@ -472,7 +515,7 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+			media_plugin_cef
 		</impl>
 	</mimetype>
 </mimetypes>

indra/newview/llmimetypes.cpp

@@ -35,6 +35,7 @@
 
 #include "llmimetypes.h"
 #include "lltrans.h"
+#include "llxmlnode.h"
 
 #include "lluictrlfactory.h"
 
@@ -84,7 +85,7 @@ bool LLMIMETypes::parseMIMETypes(const std::string& xml_filename)
 	}
 
 	for (LLXMLNode* node = root->getFirstChild();
-		 node != NULL;
+		 node != nullptr;
 		 node = node->getNextSibling())
 	{
 		if (node->hasName("defaultlabel"))
@@ -105,7 +106,7 @@ bool LLMIMETypes::parseMIMETypes(const std::string& xml_filename)
 			node->getAttributeString("name", mime_type);
 			LLMIMEInfo info;
 			for (LLXMLNode* child = node->getFirstChild();
-				 child != NULL;
+				 child != nullptr;
 				 child = child->getNextSibling())
 			{
 				if (child->hasName("label"))
@@ -129,7 +130,7 @@ bool LLMIMETypes::parseMIMETypes(const std::string& xml_filename)
 			node->getAttributeString("name", set_name);
 			LLMIMEWidgetSet info;
 			for (LLXMLNode* child = node->getFirstChild();
-				child != NULL;
+				child != nullptr;
 				child = child->getNextSibling())
 			{
 				if (child->hasName("label"))

indra/newview/skins/default/xui/de/mime_types_linux.xml

@@ -189,8 +189,8 @@
 		<widgettype>Film</widgettype>
 		<impl>media_plugin_gstreamer</impl>
 	</mimetype>
-	<mimetype name="video/quicktime">
+	<mimetype name="video/libvlc">
-		<label name="video/quicktime_label">Video (QuickTime)</label>
+		<label name="video/libvlc_label">Video (QuickTime)</label>
 		<widgettype>Film</widgettype>
 		<impl>media_plugin_gstreamer</impl>
 	</mimetype>

indra/newview/skins/default/xui/de/mime_types_mac.xml

@@ -42,12 +42,12 @@
 	<scheme name="rtsp">
 		<label name="rtsp_label">Echtzeit-Streaming</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</scheme>
 	<mimetype name="blank">
 		<label name="blank_label">- Keine -</label>
 		<widgettype>keine</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="none/none">
 		<label name="none/none_label">- Keine -</label>
@@ -57,12 +57,12 @@
 	<mimetype name="audio/*">
 		<label name="audio2_label">Audio</label>
 		<widgettype>Musik</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="video/*">
 		<label name="video2_label">Video</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="image/*">
 		<label name="image2_label">Bild</label>
@@ -72,7 +72,7 @@
 	<mimetype name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">Video (QuickTime)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="application/javascript">
 		<label name="application/javascript_label">Javascript</label>
@@ -82,7 +82,7 @@
 	<mimetype name="application/ogg">
 		<label name="application/ogg_label">Ogg Audio/Video</label>
 		<widgettype>Musik</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="application/pdf">
 		<label name="application/pdf_label">PDF-Dokument</label>
@@ -117,22 +117,22 @@
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">Audio (MIDI)</label>
 		<widgettype>Musik</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="audio/mpeg">
 		<label name="audio/mpeg_label">Audio (MP3)</label>
 		<widgettype>Musik</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
 		<label name="audio/x-aiff_label">Audio (AIFF)</label>
 		<widgettype>Musik</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="audio/x-wav">
 		<label name="audio/x-wav_label">Audio (WAV)</label>
 		<widgettype>Musik</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="image/bmp">
 		<label name="image/bmp_label">Bild (BMP)</label>
@@ -182,31 +182,31 @@
 	<mimetype name="video/mpeg">
 		<label name="video/mpeg_label">Video (MPEG)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="video/mp4">
 		<label name="video/mp4_label">Video (MP4)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
-	<mimetype name="video/quicktime">
+	<mimetype name="video/libvlc">
-		<label name="video/quicktime_label">Video (QuickTime)</label>
+		<label name="video/libvlc_label">Video (QuickTime)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
 		<label name="video/x-ms-asf_label">Video (Windows Media ASF)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
 		<label name="video/x-ms-wmv_label">Video (Windows Media WMV)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="video/x-msvideo">
 		<label name="video/x-msvideo_label">Video (AVI)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 </mimetypes>

indra/newview/skins/default/xui/de/mime_types_windows.xml

@@ -42,7 +42,7 @@
 	<scheme name="rtsp">
 		<label name="rtsp_label">Echtzeit-Streaming</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</scheme>
 	<mimetype name="blank">
 		<label name="blank_label">- Keine -</label>
@@ -57,12 +57,12 @@
 	<mimetype name="audio/*">
 		<label name="audio2_label">Audio</label>
 		<widgettype>Musik</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="video/*">
 		<label name="video2_label">Video</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="image/*">
 		<label name="image2_label">Bild</label>
@@ -72,7 +72,7 @@
 	<mimetype name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">Video (QuickTime)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="application/javascript">
 		<label name="application/javascript_label">Javascript</label>
@@ -82,7 +82,7 @@
 	<mimetype name="application/ogg">
 		<label name="application/ogg_label">Ogg Audio/Video</label>
 		<widgettype>Musik</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="application/pdf">
 		<label name="application/pdf_label">PDF-Dokument</label>
@@ -117,22 +117,22 @@
 	<mimetype name="audio/mid">
 		<label name="audio/mid_label">Audio (MIDI)</label>
 		<widgettype>Musik</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="audio/mpeg">
 		<label name="audio/mpeg_label">Audio (MP3)</label>
 		<widgettype>Musik</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
 		<label name="audio/x-aiff_label">Audio (AIFF)</label>
 		<widgettype>Musik</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="audio/x-wav">
 		<label name="audio/x-wav_label">Audio (WAV)</label>
 		<widgettype>Musik</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="image/bmp">
 		<label name="image/bmp_label">Bild (BMP)</label>
@@ -182,31 +182,31 @@
 	<mimetype name="video/mpeg">
 		<label name="video/mpeg_label">Video (MPEG)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="video/mp4">
 		<label name="video/mp4_label">Video (MP4)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
-	<mimetype name="video/quicktime">
+	<mimetype name="video/libvlc">
-		<label name="video/quicktime_label">Video (QuickTime)</label>
+		<label name="video/libvlc_label">Video (QuickTime)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
 		<label name="video/x-ms-asf_label">Video (Windows Media ASF)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
 		<label name="video/x-ms-wmv_label">Video (Windows Media WMV)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 	<mimetype name="video/x-msvideo">
 		<label name="video/x-msvideo_label">Video (AVI)</label>
 		<widgettype>Film</widgettype>
-		<impl>media_plugin_quicktime</impl>
+		<impl>media_plugin_libvlc</impl>
 	</mimetype>
 </mimetypes>

indra/newview/skins/default/xui/de/notifications.xml

@@ -2000,7 +2000,7 @@ W&#xE4;hlen Sie eine kleinere Landfl&#xE4;che.</notification>
 [NAMES]</notification>
 
   <notification name="NoQuickTime">Apple QuickTime ist auf Ihrem System anscheinend nicht installiert.
-Laden Sie QuickTime von der QuickTime-Webseite (http://www.apple.com/de/quicktime) herunter, um auf Parzellen, die diese Funktion unterst&#xFC;tzen, Streaming-Inhalte wiederzugeben.</notification>
+Laden Sie QuickTime von der QuickTime-Webseite (http://www.apple.com/de/libvlc) herunter, um auf Parzellen, die diese Funktion unterst&#xFC;tzen, Streaming-Inhalte wiederzugeben.</notification>
   <notification name="NoPlugin">Kein Media Plugin wurde gefunden um "[MIME_TYPE]" an zu zeigen. Dieses Medium wird nicht verf&#xFC;gbar sein.</notification>
   <notification name="MediaPluginFailed">Das folgende Media Plugin konnte nicht gestartet werden
 [PLUGIN]

indra/newview/skins/default/xui/en-us/mime_types_linux.xml

@@ -431,8 +431,8 @@
 			media_plugin_gstreamer
 		</impl>
 	</mimetype>
-	<mimetype menu="1" name="video/quicktime">
+	<mimetype menu="1" name="video/libvlc">
-		<label name="video/quicktime_label">
+		<label name="video/libvlc_label">
 			Movie (QuickTime)
 		</label>
 		<widgettype>

indra/newview/skins/default/xui/en-us/mime_types_mac.xml

@@ -109,7 +109,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</scheme>
 	<mimetype name="blank">
@@ -120,7 +120,7 @@
 			none
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="none/none">
@@ -142,7 +142,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/*">
@@ -153,7 +153,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="image/*">
@@ -175,7 +175,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -197,7 +197,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -274,7 +274,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mpeg">
@@ -285,7 +285,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
@@ -296,7 +296,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-wav">
@@ -307,7 +307,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/bmp">
@@ -417,7 +417,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/mp4">
@@ -428,18 +428,18 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
-	<mimetype menu="1" name="video/quicktime">
+	<mimetype menu="1" name="video/libvlc">
-		<label name="video/quicktime_label">
+		<label name="video/libvlc_label">
 			Movie (QuickTime)
 		</label>
 		<widgettype>
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
@@ -450,7 +450,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
@@ -461,7 +461,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/x-msvideo">
@@ -472,7 +472,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 </mimetypes>

indra/newview/skins/default/xui/en-us/mime_types_windows.xml

@@ -101,6 +101,27 @@
 			true
 		</allow_looping>
 	</widgetset>
+	<widgetset name="none">
+		<label name="none_label">
+			No Content
+		</label>
+		<default_type>
+			none/none
+		</default_type>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<tooltip name="none_tooltip">
+			No media here
+		</tooltip>
+		<playtip name="none_playtip" />
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			false
+		</allow_looping>
+	</widgetset>
 	<scheme name="rtsp">
 		<label name="rtsp_label">
 			Real Time Streaming
@@ -109,7 +130,18 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
+		</impl>
+	</scheme>
+  <scheme name="libvlc">
+    <label name="libvlc_label">
+      LibVLC supported media
+    </label>
+    <widgettype>
+      movie
+    </widgettype>
+    <impl>
+      media_plugin_libvlc
     </impl>
   </scheme>
   <mimetype name="blank">
@@ -142,7 +174,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/*">
@@ -153,7 +185,7 @@
 			movie
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="image/*">
@@ -175,7 +207,7 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -197,7 +229,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -274,7 +306,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mpeg">
@@ -285,7 +317,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
@@ -296,7 +328,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-wav">
@@ -307,7 +339,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/bmp">
@@ -417,7 +449,7 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/mp4">
@@ -428,18 +460,29 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
-	<mimetype menu="1" name="video/quicktime">
+  <mimetype name="application/octet-stream">
-		<label name="video/quicktime_label">
+    <label name="video/octet-stream">
+      Movie
+    </label>
+    <widgettype>
+      movie
+    </widgettype>
+    <impl>
+      media_plugin_libvlc
+    </impl>
+	</mimetype>
+	<mimetype menu="1" name="video/libvlc">
+		<label name="video/libvlc_label">
 			Movie (QuickTime)
 		</label>
 		<widgettype>
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
@@ -450,7 +493,7 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
@@ -461,7 +504,7 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+			media_plugin_cef
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/x-msvideo">
@@ -472,7 +515,7 @@
 			movie
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+			media_plugin_cef
 		</impl>
 	</mimetype>
 </mimetypes>

indra/newview/skins/default/xui/en-us/notifications.xml

@@ -6973,7 +6973,7 @@ Deactivated gestures with same trigger:
    persist="true"
    type="notify">
 Apple's QuickTime software does not appear to be installed on your system.
-If you want to view streaming media on parcels that support it you should go to the QuickTime site (http://www.apple.com/quicktime) and install the QuickTime Player.
+If you want to view streaming media on parcels that support it you should go to the QuickTime site (http://www.apple.com/libvlc) and install the QuickTime Player.
   <tag>fail</tag>
   </notification>
 

indra/newview/skins/default/xui/es/mime_types_linux.xml

@@ -431,8 +431,8 @@
 			media_plugin_gstreamer
 		</impl>
 	</mimetype>
-	<mimetype menu="1" name="video/quicktime">
+	<mimetype menu="1" name="video/libvlc">
-		<label name="video/quicktime_label">
+		<label name="video/libvlc_label">
 			Película (QuickTime)
 		</label>
 		<widgettype>

indra/newview/skins/default/xui/es/mime_types_mac.xml

@@ -109,7 +109,7 @@
 			película
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</scheme>
 	<mimetype name="blank">
@@ -120,7 +120,7 @@
 			ninguno
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="none/none">
@@ -142,7 +142,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/*">
@@ -153,7 +153,7 @@
 			película
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="image/*">
@@ -175,7 +175,7 @@
 			película
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -197,7 +197,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -274,7 +274,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mpeg">
@@ -285,7 +285,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
@@ -296,7 +296,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-wav">
@@ -307,7 +307,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/bmp">
@@ -417,7 +417,7 @@
 			película
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/mp4">
@@ -428,18 +428,18 @@
 			película
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
-	<mimetype menu="1" name="video/quicktime">
+	<mimetype menu="1" name="video/libvlc">
-		<label name="video/quicktime_label">
+		<label name="video/libvlc_label">
 			Película (QuickTime)
 		</label>
 		<widgettype>
 			película
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
@@ -450,7 +450,7 @@
 			película
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
@@ -461,7 +461,7 @@
 			película
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="video/x-msvideo">
@@ -472,7 +472,7 @@
 			película
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 </mimetypes>

indra/newview/skins/default/xui/es/mime_types_windows.xml

@@ -109,7 +109,7 @@
 			película
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</scheme>
 	<mimetype name="blank">
@@ -142,7 +142,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="video/*">
@@ -153,7 +153,7 @@
 			película
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="image/*">
@@ -175,7 +175,7 @@
 			película
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+      media_plugin_libvlc
     </impl>
 	</mimetype>
 	<mimetype name="application/javascript">
@@ -197,7 +197,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="application/pdf">
@@ -274,7 +274,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="audio/mpeg">
@@ -285,7 +285,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-aiff">
@@ -296,7 +296,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype name="audio/x-wav">
@@ -307,7 +307,7 @@
 			audio
 		</widgettype>
 		<impl>
-			media_plugin_quicktime
+			media_plugin_libvlc
 		</impl>
 	</mimetype>
 	<mimetype menu="1" name="image/bmp">
@@ -417,7 +417,7 @@
 			película
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+      media_plugin_libvlc
     </impl>
 	</mimetype>
 	<mimetype name="video/mp4">
@@ -428,18 +428,18 @@
 			película
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+      media_plugin_libvlc
     </impl>
 	</mimetype>
-	<mimetype menu="1" name="video/quicktime">
+	<mimetype menu="1" name="video/libvlc">
-		<label name="video/quicktime_label">
+		<label name="video/libvlc_label">
 			Película (QuickTime)
 		</label>
 		<widgettype>
 			película
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+      media_plugin_libvlc
     </impl>
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
@@ -450,7 +450,7 @@
 			película
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+      media_plugin_libvlc
     </impl>
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
@@ -461,7 +461,7 @@
 			película
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+      media_plugin_libvlc
     </impl>
 	</mimetype>
 	<mimetype menu="1" name="video/x-msvideo">
@@ -472,7 +472,7 @@
 			película
 		</widgettype>
 		<impl>
-      media_plugin_quicktime
+      media_plugin_libvlc
     </impl>
 	</mimetype>
 </mimetypes>

indra/newview/skins/default/xui/es/notifications.xml

@@ -3631,7 +3631,7 @@ Inténtalo seleccionando un trozo más pequeño de terreno.
 	
 	<notification name="NoQuickTime">
 		No se ve como instalado en tu sistema el software QuickTime de Apple.
-Si quieres ver por streaming elementos multimedia en las parcelas que los tengan, debes ir al sitio web de QuickTime (http://www.apple.com/quicktime) e instalar el QuickTime Player.
+Si quieres ver por streaming elementos multimedia en las parcelas que los tengan, debes ir al sitio web de QuickTime (http://www.apple.com/libvlc) e instalar el QuickTime Player.
 	</notification>
 	
 	<notification name="NoPlugin">

indra/newview/skins/default/xui/fr/notifications.xml

@@ -3026,7 +3026,7 @@ Gestes désactivés ayant le même mot-clé :
 
 	<notification name="NoQuickTime">
 Le logiciel Apple QuickTime ne semble pas installé sur votre système.
-Pour voir les vidéos sur les terrains qui le permettent, allez sur le site de QuickTime (http://www.apple.com/fr/quicktime/download) et installez le lecteur QuickTime.
+Pour voir les vidéos sur les terrains qui le permettent, allez sur le site de QuickTime (http://www.apple.com/fr/libvlc/download) et installez le lecteur QuickTime.
 	</notification>
 
   <notification

indra/newview/skins/default/xui/it/notifications.xml

@@ -2604,7 +2604,7 @@ Prova a selezionare una parte di terreno più piccola.
 	</notification>
 	<notification name="NoQuickTime">
 		Il software Apple QuickTime sembra non essere installato nel tuo sistema.
-Se desideri visualizzare il video streaming nei terreni supportati si consiglia di andare sul sito di QuickTime (http://www.apple.com/quicktime) e procedere con l&apos;installazione di QuickTime Player.
+Se desideri visualizzare il video streaming nei terreni supportati si consiglia di andare sul sito di QuickTime (http://www.apple.com/libvlc) e procedere con l&apos;installazione di QuickTime Player.
 	</notification>
 	<notification name="OwnedObjectsReturned">
 		Gli oggetti che possiedi sul terreno selezionato ti sono stati restituiti nell&apos;inventario.

indra/newview/skins/default/xui/pt/notifications.xml

@@ -3281,7 +3281,7 @@ Dê um duplo-clique num cartão de visita e em Mensagem Instantânea, digite sua
 
 	<notification name="NoQuickTime">
 		O software QuickTime da Apple parece não estar instalado em seu sistema.
-Se você deseja ver fluxo de mídia em terrenos que aceitem isso, você deverá ir ao site do QickTime (http://www.apple.com/quicktime) e instalar o player do QuickTime.
+Se você deseja ver fluxo de mídia em terrenos que aceitem isso, você deverá ir ao site do QickTime (http://www.apple.com/libvlc) e instalar o player do QuickTime.
 	</notification>
 	<notification name="NoPlugin">
 		Nenhum plugin de mídia detectado para lidar com o tipo de mime &quot;[MIME_TYPE]&quot;.  Este tipo de mídia não poderão ser acessados.