diff options
| author | Richard Linden <none@none> | 2010-08-05 11:19:42 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-05 11:19:42 -0700 |
| commit | 5e56b2d4acaecf6b1c9e1789748b90836a7bd2c6 (patch) | |
| tree | fc6a18bce3c560e5a5fbd25b224cc0d9ab580628 /indra/newview/llpanellandmedia.cpp | |
| parent | b2028085fdfddfd5a7ac0f52d9f34b84457b3b98 (diff) | |
| parent | c89ff6e80be24f3c4c910b7f380ff587f5853455 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanellandmedia.cpp')
| -rw-r--r-- | indra/newview/llpanellandmedia.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmedia.cpp b/indra/newview/llpanellandmedia.cpp index f428e1f795..f0f386c5d1 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(); } |