diff options
author | andreykproductengine <akleshchev@productengine.com> | 2015-06-02 13:57:54 +0300 |
---|---|---|
committer | andreykproductengine <akleshchev@productengine.com> | 2015-06-02 13:57:54 +0300 |
commit | af203304a37c153af77d3a46e29ad4ecd6489512 (patch) | |
tree | 3a98e664ddd823222354de4e2a44dc63dbd25869 /indra/newview/llvoavatarself.cpp | |
parent | b90b1ccca0fe5c88fdfed36647ea2a7e3f002fb0 (diff) | |
parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) |
Merge from viewer-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 |