From 5beccac1d29fb8c121fe84a3a3495dd46c764bef Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Sun, 17 Jul 2011 19:30:58 +0200 Subject: [PATCH] This should make media less crashy --- indra/newview/llviewermedia.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 0beed949a..4b086f808 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -690,7 +690,7 @@ void LLViewerMediaImpl::navigateTo(const std::string& url, const std::string& mi { // FIXME: figure out how to really discover the type for these schemes // We use "data" internally for a text/html url for loading the login screen - if(initializeMedia("text/html")) + if(initializeMedia("text/html") && (plugin = getMediaPlugin())) { plugin->loadURI( url ); } @@ -698,7 +698,7 @@ void LLViewerMediaImpl::navigateTo(const std::string& url, const std::string& mi else { // This catches 'rtsp://' urls - if(initializeMedia(scheme)) + if(initializeMedia(scheme) && (plugin = getMediaPlugin())) { plugin->loadURI( url ); }