diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-07-02 07:07:23 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-02 07:07:23 -0700 |
| commit | ef735d839317c5d8837c3ce9afd66cb576a2ba94 (patch) | |
| tree | 12a993fde38848529cdcdbadbce2d58cc383d7d2 /indra/newview/llsidepanelappearance.cpp | |
| parent | 9cef95ca2bf8a7194c6ce80ba744d9c936695e86 (diff) | |
| parent | 1417bd3985f339915f259bf5971ef21e47e30163 (diff) | |
Merged from viewer-release
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
| -rw-r--r-- | indra/newview/llsidepanelappearance.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index 951323551c..7a7ffb9983 100644 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -196,6 +196,15 @@ void LLSidepanelAppearance::onVisibilityChange(const LLSD &new_visibility) { gAgentCamera.changeCameraToCustomizeAvatar(); } + if (mEditWearable && mEditWearable->getVisible()) + { + LLWearable *wearable_ptr = mEditWearable->getWearable(); + if (gAgentWearables.getWearableIndex(wearable_ptr) == LLAgentWearables::MAX_CLOTHING_PER_TYPE) + { + // we're no longer wearing the wearable we were last editing, switch back to outfit editor + showOutfitEditPanel(); + } + } } } else |