diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-13 08:57:53 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-13 08:57:53 -0400 |
| commit | b7635b6112b7c7fd448aa4400bba2edbf15a5b0a (patch) | |
| tree | 71a591c69a0bae36666e96f9ff23dcc563cbb193 /indra/llprimitive | |
| parent | c556efbce8e093883a7c7474b1cdac0d53c39cfb (diff) | |
| parent | 522af96acaf07e098e8ce4a3eb9187a5eaeda6d7 (diff) | |
pull transplanted crash fix changesets back from viewer-release
Diffstat (limited to 'indra/llprimitive')
| -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) |