summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-04-22 16:48:53 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-04-22 16:48:53 -0400
commit6290fc1b1aa68a8d2e67bb7b71c73bda7a38465c (patch)
treef700755ca0e4c97ebb5c1730741806e7f041ab39 /indra
parentd807a9162662aa3b921020af2df2c30cc71b1b32 (diff)
parentb29e6f656eb28d557ef4488a022b6757a58d29e1 (diff)
merge
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llsidepanelappearance.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index 3c21219dc1..77e9604460 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -90,8 +90,10 @@ bool LLSidepanelAppearance::callBackExitWithoutSaveViaClose(const LLSD& notifica
S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
if ( option == 0 )
{
+ //revert curernt edits
mEditWearable->revertChanges();
- LLAppearanceMgr::getInstance()->wearBaseOutfit();
+ toggleWearableEditPanel(FALSE);
+ LLVOAvatarSelf::onCustomizeEnd(FALSE);
mLLFloaterSidePanelContainer->close();
return true;
}
@@ -137,6 +139,7 @@ void LLSidepanelAppearance::onClose(LLFloaterSidePanelContainer* obj)
else
{
LLVOAvatarSelf::onCustomizeEnd(FALSE);
+ toggleWearableEditPanel(FALSE);
mLLFloaterSidePanelContainer->close();
}
}