diff options
| author | callum_linden <none@none> | 2015-05-26 14:03:07 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-05-26 14:03:07 -0700 |
| commit | 80c67487c062b3105395d8dbf3dfc0be15cc678f (patch) | |
| tree | 67e8aec40d3cd58030d28e1929bf09dcb75b96bc /indra/newview/llsidepanelappearance.cpp | |
| parent | 80aa29eaec78d267b4fa1822cfbd3a33b268066a (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
Merge with viewer-release after layer-limits 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(); |