diff options
| author | Anchor Linden <anchor@lindenlab.com> | 2018-05-30 05:51:37 +0530 |
|---|---|---|
| committer | Anchor Linden <anchor@lindenlab.com> | 2018-05-30 05:51:37 +0530 |
| commit | 71fa94b3665b4554470314f481c9f0a35f8e6ef2 (patch) | |
| tree | 42c70f6b9df687aaf5e715060dde12b4f21ed22f /indra/newview/llfloateravatartextures.cpp | |
| parent | 0a36c8d3be17032db20a9bdeff2b00ae2ed608a0 (diff) | |
[MAINT-8693] - fix null check
Diffstat (limited to 'indra/newview/llfloateravatartextures.cpp')
| -rw-r--r-- | indra/newview/llfloateravatartextures.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloateravatartextures.cpp b/indra/newview/llfloateravatartextures.cpp index 78807a8e99..8e654a53c4 100644 --- a/indra/newview/llfloateravatartextures.cpp +++ b/indra/newview/llfloateravatartextures.cpp @@ -78,7 +78,7 @@ static void update_texture_ctrl(LLVOAvatar* avatarp, { LLUUID id = IMG_DEFAULT_AVATAR; const LLAvatarAppearanceDictionary::TextureEntry* tex_entry = LLAvatarAppearanceDictionary::getInstance()->getTexture(te); - if (tex_entry->mIsLocalTexture) + if (tex_entry && tex_entry->mIsLocalTexture) { if (avatarp->isSelf()) { @@ -96,7 +96,7 @@ static void update_texture_ctrl(LLVOAvatar* avatarp, } else { - id = avatarp->getTE(te)->getID(); + id = tex_entry ? avatarp->getTE(te)->getID() : IMG_DEFAULT_AVATAR; } //id = avatarp->getTE(te)->getID(); if (id == IMG_DEFAULT_AVATAR) |