summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-04-20 17:14:00 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-04-20 17:14:00 +0300
commit407cf3bd08b5561cbf2905fb7d8c14320d9bde54 (patch)
tree9b4663f7732e9cae977fce8599bedaeb8e447abe /indra/newview/llviewermedia.cpp
parent5c78d1f1a999d5a2694e2794aa6712f6d9740ade (diff)
parent5acf8a5f13e064fcfb5d8fbd42e631a18244a674 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r--indra/newview/llviewermedia.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 58138d9917..3c0345df90 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -2245,7 +2245,7 @@ void LLViewerMediaImpl::navigateInternal()
// This helps in supporting legacy media content where the server the media resides on returns a bogus MIME type
// but the parcel owner has correctly set the MIME type in the parcel media settings.
- if(!mMimeType.empty() && (mMimeType != "none/none"))
+ if(!mMimeType.empty() && (mMimeType != LLMIMETypes::getDefaultMimeType()))
{
std::string plugin_basename = LLMIMETypes::implType(mMimeType);
if(!plugin_basename.empty())