summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepanelappearance.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/llsidepanelappearance.cpp
parent33c88a1c6037290924691db59c6538a370946ea4 (diff)
parent687efd84eabc524e339e61458b0cbf53f9a38f8a (diff)
MAINT-5232: merge LLError::Log::demangle() to tip
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
-rwxr-xr-xindra/newview/llsidepanelappearance.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index 64f24cd291..ea7cf82674 100755
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -212,7 +212,8 @@ void LLSidepanelAppearance::updateToVisibility(const LLSD &new_visibility)
}
if (is_wearable_edit_visible)
{
- if (gAgentWearables.getWearableIndex(wearable_ptr) == LLAgentWearables::MAX_CLOTHING_PER_TYPE)
+ U32 index;
+ if (!gAgentWearables.getWearableIndex(wearable_ptr,index))
{
// we're no longer wearing the wearable we were last editing, switch back to outfit editor
showOutfitEditPanel();