diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-05-29 17:11:37 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-05-29 17:11:37 -0700 |
| commit | 5cd0e7cf9065efc8402637d25d9bdae2eba44478 (patch) | |
| tree | a28a25a58426ef698fc506559a0192d3e921c753 /indra/newview/llsidepanelappearance.cpp | |
| parent | dad6f5d29f09955ad3fef243d52de9636a03fb53 (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
Pull merge from lindenlab/viewer-release
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(); |