diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-06-10 16:31:05 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-06-10 16:31:05 -0400 |
| commit | 4cf208cc7c5065f55e3e6ec121ec65a85775e0c7 (patch) | |
| tree | ad137ec8ec8325ff2a7d8f8d9277eed4a191a0cd /indra/llui | |
| parent | 6d46132ef5218cd17d8d201f16e5a7df4b1e39a6 (diff) | |
| parent | b3d3eee3b8af2c24822cceb99086635841469974 (diff) | |
merge
Diffstat (limited to 'indra/llui')
| -rwxr-xr-x | indra/llui/llfloater.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 93eca8b62e..f8b01e106b 100755 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -716,22 +716,17 @@ void LLFloater::closeFloater(bool app_quitting) if (!app_quitting) { if ( mVerifyUponClose && !mForceCloseAfterVerify ) - { - - llinfos<<"prep#dogshit1"<<llendl; + { onClose( app_quitting ); if ( mForceCloseAfterVerify ) - { - - llinfos<<"prep#dogshit1b"<<llendl; + { return; } } } if (app_quitting) - { - llinfos<<"prep#dogshit2"<<llendl; + { LLFloater::sQuitting = true; } |