summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2013-04-17 11:32:49 -0400
committerprep <prep@lindenlab.com>2013-04-17 11:32:49 -0400
commitb29e6f656eb28d557ef4488a022b6757a58d29e1 (patch)
treeb89f1fed6d8fc87051bfc33cbb269dc6fa8687ae
parent392f561b6c28aede2b61bc9cc2cc75de587926b6 (diff)
Fix for SH-4124: Closing appearance panel also closes the edit wearable panel if it was active
-rw-r--r--indra/newview/llsidepanelappearance.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index 75da23b558..77e9604460 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -92,6 +92,7 @@ bool LLSidepanelAppearance::callBackExitWithoutSaveViaClose(const LLSD& notifica
{
//revert curernt edits
mEditWearable->revertChanges();
+ toggleWearableEditPanel(FALSE);
LLVOAvatarSelf::onCustomizeEnd(FALSE);
mLLFloaterSidePanelContainer->close();
return true;
@@ -138,6 +139,7 @@ void LLSidepanelAppearance::onClose(LLFloaterSidePanelContainer* obj)
else
{
LLVOAvatarSelf::onCustomizeEnd(FALSE);
+ toggleWearableEditPanel(FALSE);
mLLFloaterSidePanelContainer->close();
}
}