diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-05-28 17:47:37 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-05-28 17:47:37 -0400 |
| commit | d822d0e96bb69374f49fef8a827a042474deda8d (patch) | |
| tree | 91834ede57a52fb6e1d85dace0e1ea49bb62c394 /indra/newview/llsidepanelappearance.cpp | |
| parent | 25c7e0114085a296eb3e2f7fba7cd2cb5b6177f8 (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
merge
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
| -rwxr-xr-x | indra/newview/llsidepanelappearance.cpp | 3 |
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(); |