summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-08-03 13:33:06 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-08-03 13:33:06 +0100
commit4f2641aef00d51cae59b0cd3890c597544887bf6 (patch)
treea033e2809d98ebea2fa74a5808c235276f5f5df2
parentd10b9a7f37bec670342136eeea2c8c2604fdfeef (diff)
parentb12201bf01caeef0f5a13951980be187ac3936c8 (diff)
merge from PE's viewer-release
-rw-r--r--indra/newview/llpanellandmedia.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmedia.cpp b/indra/newview/llpanellandmedia.cpp
index e834e229cd..240139d714 100644
--- a/indra/newview/llpanellandmedia.cpp
+++ b/indra/newview/llpanellandmedia.cpp
@@ -151,7 +151,7 @@ void LLPanelLandMedia::refresh()
mMediaDescEdit->setEnabled( can_change_media );
std::string mime_type = parcel->getMediaType();
- if (mime_type.empty())
+ if (mime_type.empty() || mime_type == LLMIMETypes::getDefaultMimeType())
{
mime_type = LLMIMETypes::getDefaultMimeTypeTranslation();
}