don't ask before quitting when login or download progress is being shown.

master
Andrew A. de Laix 2010-12-15 13:24:47 -08:00
parent d785a43ea2
commit 6f996302ef
1 changed files with 2 additions and 1 deletions

View File

@ -81,6 +81,7 @@
#include "llurlmatch.h"
#include "lltextutil.h"
#include "lllogininstance.h"
#include "llprogressview.h"
#include "llweb.h"
#include "llsecondlifeurls.h"
@ -3138,7 +3139,7 @@ static LLNotificationFunctorRegistration finish_quit_reg("ConfirmQuit", finish_q
void LLAppViewer::userQuit()
{
if (gDisconnected)
if (gDisconnected || gViewerWindow->getProgressView()->getVisible())
{
requestQuit();
}