diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-11 15:09:44 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-11 15:09:44 -0800 |
| commit | 16443c4df389b5d43bae129ba64d4311f5625ca3 (patch) | |
| tree | fe28a0bc7c32ebea3866138ea03d16293b805b58 | |
| parent | 1426765e82549ec9d17a0f90d902f25c0e785bbd (diff) | |
STORM-1001 : Fix ObjectMedia cap flooding (Fix by Kitty Barnett)
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/llprimitive/lltextureentry.cpp | 22 |
2 files changed, 5 insertions, 18 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index e94acb566a..f2c0130cd0 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -423,6 +423,7 @@ Kitty Barnett STORM-288 STORM-799 STORM-800 + STORM-1001 VWR-24217 Kunnis Basiat VWR-82 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) |