diff options
| author | Armin Weatherwax | 2010-06-14 12:27:35 +0200 |
|---|---|---|
| committer | Armin Weatherwax | 2010-09-23 15:40:23 +0200 |
| commit | 791d4c2de7c0219392aeb625cf7940290dc1e79a (patch) | |
| tree | 4050377f59ec8532a5d3ee5cc1202b38a1878c7a /linden/indra/newview | |
| parent | port SG2.0 Mediaplugs (webkit supports flash now) (diff) | |
| download | meta-impy-791d4c2de7c0219392aeb625cf7940290dc1e79a.zip meta-impy-791d4c2de7c0219392aeb625cf7940290dc1e79a.tar.gz meta-impy-791d4c2de7c0219392aeb625cf7940290dc1e79a.tar.bz2 meta-impy-791d4c2de7c0219392aeb625cf7940290dc1e79a.tar.xz | |
port llprimitive from SG2.0
Diffstat (limited to 'linden/indra/newview')
| -rw-r--r-- | linden/indra/newview/llselectmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp index 558d278..b2904b9 100644 --- a/linden/indra/newview/llselectmgr.cpp +++ b/linden/indra/newview/llselectmgr.cpp | |||
| @@ -1715,7 +1715,7 @@ void LLSelectMgr::selectionSetMediaTypeAndURL(U8 media_type, const std::string& | |||
| 1715 | U8 media_flags = LLTextureEntry::MF_NONE; | 1715 | U8 media_flags = LLTextureEntry::MF_NONE; |
| 1716 | if (media_type == LLViewerObject::MEDIA_TYPE_WEB_PAGE) | 1716 | if (media_type == LLViewerObject::MEDIA_TYPE_WEB_PAGE) |
| 1717 | { | 1717 | { |
| 1718 | media_flags = LLTextureEntry::MF_WEB_PAGE; | 1718 | media_flags = LLTextureEntry::MF_HAS_MEDIA; |
| 1719 | } | 1719 | } |
| 1720 | 1720 | ||
| 1721 | struct f : public LLSelectedTEFunctor | 1721 | struct f : public LLSelectedTEFunctor |