summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index e6661e4c9a..91fae709df 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -2879,8 +2879,22 @@ void LLAppViewer::forceQuit()
LLApp::setQuitting();
}
+void LLAppViewer::fastQuit()
+{
+ if (LLStartUp::getStartupState() >= STATE_STARTED)
+ {
+ sendLogoutRequest();
+ }
+ _exit(isError());
+}
+
void LLAppViewer::requestQuit()
{
+ if (gSavedSettings.getBOOL("FastQuit"))
+ {
+ fastQuit();
+ }
+
llinfos << "requestQuit" << llendl;
LLViewerRegion* region = gAgent.getRegion();