diff options
| author | prep@lindenlab.com <prep@lindenlab.com> | 2013-04-09 15:14:51 -0500 |
|---|---|---|
| committer | prep@lindenlab.com <prep@lindenlab.com> | 2013-04-09 15:14:51 -0500 |
| commit | 67790d0dd8fec2750906ae3d3fed1e735be6b078 (patch) | |
| tree | 1ad4aedeb91b5318b11a752bfa7344409d3ba7ab /indra/newview/llsidepanelappearance.cpp | |
| parent | a2a25c9ed5de12cfb8a08844682368dc236a1b42 (diff) | |
SH-4035: Bug fix to handle closing the panel when editing a specific wearable
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
| -rw-r--r-- | indra/newview/llsidepanelappearance.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index 53b5593ac9..3899450804 100644 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -131,7 +131,9 @@ void LLSidepanelAppearance::onClickConfirmExitWithoutSaveViaBack() void LLSidepanelAppearance::onClose(LLFloaterSidePanelContainer* obj) { mLLFloaterSidePanelContainer = obj; - if ( LLAppearanceMgr::getInstance()->isOutfitDirty() && !LLAppearanceMgr::getInstance()->isOutfitLocked() ) + if ( LLAppearanceMgr::getInstance()->isOutfitDirty() && + !LLAppearanceMgr::getInstance()->isOutfitLocked() || + ( mEditWearable->isAvailable() && mEditWearable->isDirty() ) ) { LLSidepanelAppearance* pSelf = (LLSidepanelAppearance *)this; LLNotificationsUtil::add("ConfirmExitWithoutSave", LLSD(), LLSD(), boost::bind(&LLSidepanelAppearance::callBackExitWithoutSaveViaClose,pSelf,_1,_2) ); |