From c0bba7e7812622120e81154cfe5dcd1131c5e4da Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 1 Jul 2010 18:03:08 -0400 Subject: EXT-7993 FIX able to edit a clothing item you're not wearing Added check on restoring appearance sidepanel to ensure you're still wearing the wearable you're editing. Code reviewed by Seraph --- indra/newview/llsidepanelappearance.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra') 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 -- cgit v1.2.3