diff options
| author | simon <none@none> | 2014-04-21 12:48:50 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-04-21 12:48:50 -0700 |
| commit | a5a0a0b1362da5d00cc6d09bb841ef6167bb2922 (patch) | |
| tree | 0b58bf76487dca0bc439d1f99cd568f970b9cc32 /indra/newview/llvoavatarself.cpp | |
| parent | 114084bb80d4991519e2ca4020823319810c64b2 (diff) | |
| parent | 0b9a777bfd3c85390c55d91fc3dc5c4bee9bf71b (diff) | |
Merge downstream code
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index ca004962d5..082a85e217 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -818,8 +818,7 @@ void LLVOAvatarSelf::setLocalTextureTE(U8 te, LLViewerTexture* image, U32 index) return; } - LLViewerTexture * tx = getTEImage(te); - if (!tx || tx->getID() == image->getID()) + if (getTEImage(te)->getID() == image->getID()) { return; } @@ -1699,7 +1698,6 @@ S32 LLVOAvatarSelf::getLocalDiscardLevel(ETextureIndex type, U32 wearable_index) const LLViewerFetchedTexture* image = dynamic_cast<LLViewerFetchedTexture*>( local_tex_obj->getImage() ); if (type >= 0 && local_tex_obj->getID() != IMG_DEFAULT_AVATAR - && image && !image->isMissingAsset()) { return image->getDiscardLevel(); @@ -2038,10 +2036,7 @@ BOOL LLVOAvatarSelf::getIsCloud() const /*static*/ void LLVOAvatarSelf::debugOnTimingLocalTexLoaded(BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata) { - if (gAgentAvatarp) - { - gAgentAvatarp->debugTimingLocalTexLoaded(success, src_vi, src, aux_src, discard_level, final, userdata); - } + gAgentAvatarp->debugTimingLocalTexLoaded(success, src_vi, src, aux_src, discard_level, final, userdata); } void LLVOAvatarSelf::debugTimingLocalTexLoaded(BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, BOOL final, void* userdata) |