diff options
| author | callum_linden <none@none> | 2015-05-26 14:03:07 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-05-26 14:03:07 -0700 |
| commit | 80c67487c062b3105395d8dbf3dfc0be15cc678f (patch) | |
| tree | 67e8aec40d3cd58030d28e1929bf09dcb75b96bc /indra/newview/llvoavatarself.cpp | |
| parent | 80aa29eaec78d267b4fa1822cfbd3a33b268066a (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
Merge with viewer-release after layer-limits release
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 1e9945b514..56997c928a 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -1570,8 +1570,16 @@ BOOL LLVOAvatarSelf::isTextureVisible(LLAvatarAppearanceDefines::ETextureIndex t return LLVOAvatar::isTextureVisible(type); } - U32 index = gAgentWearables.getWearableIndex(wearable); - return isTextureVisible(type,index); + U32 index; + if (gAgentWearables.getWearableIndex(wearable,index)) + { + return isTextureVisible(type,index); + } + else + { + LL_WARNS() << "Wearable not found" << LL_ENDL; + return FALSE; + } } bool LLVOAvatarSelf::areTexturesCurrent() const |