diff options
| author | simon <none@none> | 2014-06-18 19:02:25 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-06-18 19:02:25 -0700 |
| commit | d760a6889dbe1ca5ff0775343a6a01f735ec740b (patch) | |
| tree | 421a79d29dec1544c0347635113202a4bc7ba18a /indra/newview/llviewerparcelmedia.cpp | |
| parent | 3686dc3e37511009be02b61edcd483cb9a032b1b (diff) | |
| parent | 592024b5805a116c9d0bef893127427df0741b41 (diff) | |
Merge downstream code
Diffstat (limited to 'indra/newview/llviewerparcelmedia.cpp')
| -rwxr-xr-x | indra/newview/llviewerparcelmedia.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index b55154f889..37b249dddd 100755 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -99,7 +99,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel) std::string mediaCurrentUrl = std::string( parcel->getMediaCurrentURL()); // if we have a current (link sharing) url, use it instead - if (mediaCurrentUrl != "" && parcel->getMediaType() == "text/html") + if (mediaCurrentUrl != "" && parcel->getMediaType() == HTTP_CONTENT_TEXT_HTML) { mediaUrl = mediaCurrentUrl; } |