diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-11 16:05:27 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-11 16:05:27 -0800 |
| commit | 522af96acaf07e098e8ce4a3eb9187a5eaeda6d7 (patch) | |
| tree | bc8c32b49908e87e6ac186faba4f3c764110505d /indra/llprimitive/lltextureentry.cpp | |
| parent | 4790944923bf9c90c21e99e0ba5be994f1e8e1fa (diff) | |
| parent | 16443c4df389b5d43bae129ba64d4311f5625ca3 (diff) | |
STORM-1001 : pull into viewer-development
Diffstat (limited to 'indra/llprimitive/lltextureentry.cpp')
| -rw-r--r-- | indra/llprimitive/lltextureentry.cpp | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/indra/llprimitive/lltextureentry.cpp b/indra/llprimitive/lltextureentry.cpp index 861bde5c89..34eff17519 100644 --- a/indra/llprimitive/lltextureentry.cpp +++ b/indra/llprimitive/lltextureentry.cpp @@ -423,24 +423,10 @@ S32 LLTextureEntry::setBumpShinyFullbright(U8 bump) S32 LLTextureEntry::setMediaTexGen(U8 media) { - if (mMediaFlags != media) - { - mMediaFlags = media; - - // Special code for media handling - if( hasMedia() && mMediaEntry == NULL) - { - mMediaEntry = new LLMediaEntry; - } - else if ( ! hasMedia() && mMediaEntry != NULL) - { - delete mMediaEntry; - mMediaEntry = NULL; - } - - return TEM_CHANGE_MEDIA; - } - return TEM_CHANGE_NONE; + S32 result = TEM_CHANGE_NONE; + result |= setTexGen(media & TEM_TEX_GEN_MASK); + result |= setMediaFlags(media & TEM_MEDIA_MASK); + return result; } S32 LLTextureEntry::setBumpmap(U8 bump) |