summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Borovkov <iborovkov@productengine.com>2010-01-29 18:03:11 +0200
committerIgor Borovkov <iborovkov@productengine.com>2010-01-29 18:03:11 +0200
commit81451696f1de85e235818517c01b8d255d1bb661 (patch)
tree3c882cc5ec13f972132a4df3daf8ef86320f282d
parent015453dbc7ad1494d984a46973a7d41eb5c6ac2a (diff)
fixed EXT-4187 "X" does not close client after idle timeout / log off when "Confirm before I quit" is enabled
--HG-- branch : product-engine
-rw-r--r--indra/newview/llappviewer.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 9bb0977c1a..2d694eefd3 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2891,7 +2891,14 @@ static LLNotificationFunctorRegistration finish_quit_reg("ConfirmQuit", finish_q
void LLAppViewer::userQuit()
{
- LLNotificationsUtil::add("ConfirmQuit");
+ if (gDisconnected)
+ {
+ requestQuit();
+ }
+ else
+ {
+ LLNotificationsUtil::add("ConfirmQuit");
+ }
}
static bool finish_early_exit(const LLSD& notification, const LLSD& response)