diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 63491aa29641be2d2df0823b3010af77fcbe1ce2..93eca8b62ee5b42096133512f82d45e1d58c3978 100755 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -717,9 +717,13 @@ void LLFloater::closeFloater(bool app_quitting) { if ( mVerifyUponClose && !mForceCloseAfterVerify ) { + + llinfos<<"prep#dogshit1"<<llendl; onClose( app_quitting ); if ( mForceCloseAfterVerify ) { + + llinfos<<"prep#dogshit1b"<<llendl; return; } } @@ -727,6 +731,7 @@ void LLFloater::closeFloater(bool app_quitting) if (app_quitting) { + llinfos<<"prep#dogshit2"<<llendl; LLFloater::sQuitting = true; } diff --git a/indra/newview/llfloatersidepanelcontainer.h b/indra/newview/llfloatersidepanelcontainer.h index f543cfd5c4dadca07774ac6a6ae5dde695c8b6ac..b276821805b7f543346f57eb4bbedac7aef4de27 100755 --- a/indra/newview/llfloatersidepanelcontainer.h +++ b/indra/newview/llfloatersidepanelcontainer.h @@ -89,7 +89,8 @@ class LLFloaterSidePanelContainer : public LLFloater private: LLSidepanelAppearance* getSidePanelAppearance(); -private: + +public: bool mAppQuiting; }; diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index 70da576c83eab87c7e30d2d7b0b06c5c2df7c63a..775c148ea1401cf16e7ab06c212fc08794967f9d 100755 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -151,11 +151,17 @@ bool LLSidepanelAppearance::callBackExitWithoutSaveViaClose(const LLSD& notifica toggleWearableEditPanel(FALSE); showOutfitEditPanel(); LLVOAvatarSelf::onCustomizeEnd( FALSE ); - mRevertSet = true; + if ( !mLLFloaterSidePanelContainer->mAppQuiting ) + { + mRevertSet = true; + } + else + { + mLLFloaterSidePanelContainer->closeFloater( true ); + } return false; } mLLFloaterSidePanelContainer->mForceCloseAfterVerify = false; - //mRevertSet = true; return false; }