From 22497afacce5c44515bddea006265905739cc190 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 25 Apr 2010 22:47:21 -0700
Subject: Fixed #199: After losing connection, 'Quit' button doesn't quit

---
 linden/indra/newview/llappviewer.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index e55d4ab..bd32d28 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -2686,7 +2686,11 @@ void LLAppViewer::removeMarkerFile(bool leave_logout_marker)
 
 //this gets called after we get a packet back from the
 //server saying we are logged out, or if the packet times
-//out
+//out. 
+// Beware of calling this directly as it'll have odd effects
+// due to the Logout feature. You should really use:
+// LLAppViewer::instance()->requestLogout(true);
+// instead. -- MC
 void LLAppViewer::forceQuit()
 { 
 
@@ -3099,7 +3103,7 @@ bool finish_disconnect(const LLSD& notification, const LLSD& response)
 
 	if (1 == option)
 	{
-        LLAppViewer::instance()->forceQuit();
+        LLAppViewer::instance()->requestLogout(true);
 	}
 	return false;
 }
@@ -3107,7 +3111,7 @@ bool finish_disconnect(const LLSD& notification, const LLSD& response)
 // Callback from an early disconnect dialog, force an exit
 bool finish_forced_disconnect(const LLSD& notification, const LLSD& response)
 {
-	LLAppViewer::instance()->forceQuit();
+	LLAppViewer::instance()->requestLogout(true);
 	return false;
 }
 
-- 
cgit v1.1