livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SH-4035 spec change. If you revert after quiting, SL shutsdown.

meow-7.2.2
prep 2013-06-03 18:08:48 -04:00
parent c81b685b42
commit c5c2e7b405
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llui/llfloater.cpp
View File

@ -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;
}

3
indra/newview/llfloatersidepanelcontainer.h
View File

@ -89,7 +89,8 @@ public:
private:
LLSidepanelAppearance* getSidePanelAppearance();
private:
public:
bool mAppQuiting;
};

10
indra/newview/llsidepanelappearance.cpp
View File

@ -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;
}