diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-07-01 18:03:20 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-07-01 18:03:20 -0400 |
| commit | 80be055938a3ecbec79ec20193599407d0dcdcba (patch) | |
| tree | fd48d8cad9a5a97637b9d2b359144ec60ffe627e | |
| parent | d875b34de0dbc34d5435fe1f87822a70974851d6 (diff) | |
| parent | c0bba7e7812622120e81154cfe5dcd1131c5e4da (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release/
| -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 |