diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-15 13:24:47 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-15 13:24:47 -0800 |
| commit | 6f996302ef5f8277dbfab9a75a536b554d7fa4e9 (patch) | |
| tree | 96a7342353ab23b160ad3dd7798477f42b7a453b | |
| parent | d785a43ea2c941f963c413ecfba927877163f5b9 (diff) | |
don't ask before quitting when login or download progress is being shown.
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index a6953a47f0..5cf7087c71 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -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(); } |