diff options
| author | simon <none@none> | 2015-06-08 14:54:22 -0700 |
|---|---|---|
| committer | simon <none@none> | 2015-06-08 14:54:22 -0700 |
| commit | 316bdc0ab04f8cfb587bbfbe0966963f7614cce2 (patch) | |
| tree | 0f8e8ef231c7df1d2825adf9929c6b6f9a84f880 /indra/newview/llsidepanelappearance.cpp | |
| parent | 4647dc6fe7aacccf089d214bf26b47f417bd7ae6 (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
Merge viewer-release and become version 3.7.30
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(); |