diff options
| author | callum <none@none> | 2011-03-14 17:35:30 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-03-14 17:35:30 -0700 |
| commit | ca6ca8793473bba8b7a417288e4f2ac112241116 (patch) | |
| tree | 7451a97db9b7ac85bb769f64b7678e15be0c7262 /indra/llprimitive | |
| parent | 91eb7f2e048369ddfc76eb2fbae83fa50ad8322a (diff) | |
| parent | 2c0f97ea392e770cc459b7b7974e9adad2249c87 (diff) | |
Merge with tip of viewer development
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) |