Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This should fix KV TVs

Browse Source
This commit is contained in:
Siana Gearz
2011-08-08 02:39:29 +02:00
parent 5f4328767b
commit 2cb0dedbd1
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llviewermedia.cpp
View File

@@ -682,10 +682,17 @@ void LLViewerMediaImpl::navigateTo(const std::string& url, const std::string& mi
LLURI uri(url); LLURI uri(url);
std::string scheme = uri.scheme(); std::string scheme = uri.scheme();
if(scheme.empty() || "http" == scheme || "https" == scheme) if(scheme.empty() || ("http" == scheme || "https" == scheme))
{
if(mime_type.empty())
{ {
LLHTTPClient::getHeaderOnly( url, new LLMimeDiscoveryResponder(this)); LLHTTPClient::getHeaderOnly( url, new LLMimeDiscoveryResponder(this));
} }
else if(initializeMedia(mime_type) && (plugin = getMediaPlugin()))
{
plugin->loadURI( url );
}
}
else if("data" == scheme || "file" == scheme || "about" == scheme) else if("data" == scheme || "file" == scheme || "about" == scheme)
{ {
// FIXME: figure out how to really discover the type for these schemes // FIXME: figure out how to really discover the type for these schemes