diff options
| author | Richard Linden <none@none> | 2010-10-08 17:38:19 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-10-08 17:38:19 -0700 |
| commit | c25216ca3a1bc4bd7a88a2519fe156a00902e85c (patch) | |
| tree | 44dee6f5dbfd63531f66595503490ca2a3c9028e /indra/newview/llappviewer.cpp | |
| parent | f65bd3c1f18675910c9d49db217a1926bd04494e (diff) | |
| parent | 77d1fa974ad6cc9be0b84e574b455693bfa7f702 (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 14 |
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(); |