summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatarself.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-06-26 15:27:34 -0400
committerNat Goodspeed <nat@lindenlab.com>2015-06-26 15:27:34 -0400
commit3f52cefcc4b4cc00caef56a40e0da1ea981a3073 (patch)
tree7697fdea468261e1cd266eed1ba37ecab08c1e16 /indra/newview/llvoavatarself.cpp
parent33c88a1c6037290924691db59c6538a370946ea4 (diff)
parent687efd84eabc524e339e61458b0cbf53f9a38f8a (diff)
MAINT-5232: merge LLError::Log::demangle() to tip
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
-rwxr-xr-xindra/newview/llvoavatarself.cpp12
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