diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-01-30 17:33:16 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-01-30 17:33:16 +0000 |
| commit | baebf981ac90769905980da2fc9a73f8f88b1ba0 (patch) | |
| tree | b5524435c9a4c2f9af37a371b1ea9263cac45748 /indra/newview/llface.cpp | |
| parent | c8a79a59c94192741c8239eac6b34e50fe835bcd (diff) | |
| parent | 12cd42221e16b8bbcd0ad115e0436b075d47d485 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #247)
SL-10415, SL-10434, SL-10416
Diffstat (limited to 'indra/newview/llface.cpp')
| -rw-r--r-- | indra/newview/llface.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 8df898f8a9..6d0e999845 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -389,16 +389,20 @@ void LLFace::switchTexture(U32 ch, LLViewerTexture* new_texture) return; } - llassert(mTexture[ch].notNull()); - - new_texture->addTextureStats(mTexture[ch]->getMaxVirtualSize()) ; + if (mTexture[ch].notNull()) + { + new_texture->addTextureStats(mTexture[ch]->getMaxVirtualSize()) ; + } if (ch == LLRender::DIFFUSE_MAP) { - getViewerObject()->changeTEImage(mTEOffset, new_texture) ; + if (getViewerObject()) + { + getViewerObject()->changeTEImage(mTEOffset, new_texture); + } } - setTexture(ch, new_texture) ; + setTexture(ch, new_texture); dirtyTexture(); } |