diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-20 10:30:11 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-20 10:30:11 +0100 |
| commit | 625b15fa7525944ff81e1d7f54b1ed61ee2768ea (patch) | |
| tree | ac69028bb788f92ee50fd699a2c262bbe49b1c91 /indra/newview/llviewermedia.cpp | |
| parent | 41357bb01297ce0977da7a3e2e9308d3c903d3a8 (diff) | |
| parent | 1ce1e7f9a121cad473c84fced770837da9e6e55c (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 2 |
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()) |