diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-06-08 10:57:49 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-06-08 10:57:49 -0700 |
| commit | ce2fc7d775d313a7dfe528b9c09a1d03ad077b50 (patch) | |
| tree | 40ffdfa0e44a8ad12c35940f4f62ab5cc5fdaeca /indra/newview/llvoavatarself.cpp | |
| parent | dde75d76210c9e4df0516b89f8f199fe081a5e87 (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
Merge
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 0d99c9ac14..ba4fd59feb 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -1557,8 +1557,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 |