summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorprep@lindenlab.com <prep@lindenlab.com>2013-05-13 16:03:22 -0500
committerprep@lindenlab.com <prep@lindenlab.com>2013-05-13 16:03:22 -0500
commitb7161fcd58853fb60900e51a4ac221b02941905e (patch)
tree3b6b8f8b795aaa9a18e0c6199d35bb9822a6f53a /indra
parentad307352f2727c1c0e32fe1c09422370aafb70c2 (diff)
SH-4035: Removed prompt to save if av just has outfit changes and you click on the back button
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llsidepanelappearance.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index cf759dd8f7..1b56aff3b6 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -145,12 +145,14 @@ void LLSidepanelAppearance::onClickConfirmExitWithoutSaveIntoAppearance()
}
void LLSidepanelAppearance::onClickConfirmExitWithoutSaveViaBack()
{
- if ( LLAppearanceMgr::getInstance()->isOutfitDirty() && !mSidePanelJustOpened /*&& !LLAppearanceMgr::getInstance()->isOutfitLocked()*/ )
+ /*
+ if ( LLAppearanceMgr::getInstance()->isOutfitDirty() && !mSidePanelJustOpened && !LLAppearanceMgr::getInstance()->isOutfitLocked() )
{
LLSidepanelAppearance* pSelf = (LLSidepanelAppearance *)this;
LLNotificationsUtil::add("ConfirmExitWithoutSave", LLSD(), LLSD(), boost::bind(&LLSidepanelAppearance::callBackExitWithoutSaveViaBack,pSelf,_1,_2) );
}
else
+ */
{
showOutfitsInventoryPanel();
}