diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-15 09:26:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-15 09:26:38 -0400 |
| commit | ae3e97024ec60d2c0555bf01ff6e2786232b6dd5 (patch) | |
| tree | c3469e40b8ae0edc3b8695a346942d3897666115 /indra/llprimitive | |
| parent | 845405cce6e432c60f1733e7b8d529682a107a86 (diff) | |
| parent | 2c0f97ea392e770cc459b7b7974e9adad2249c87 (diff) | |
merge changes for storm-1021
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) |