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/llappviewerwin32.cpp | |
parent | f65bd3c1f18675910c9d49db217a1926bd04494e (diff) | |
parent | 77d1fa974ad6cc9be0b84e574b455693bfa7f702 (diff) |
merge
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
-rw-r--r-- | indra/newview/llappviewerwin32.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index d328567a0e..2c6f014d17 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -175,6 +175,12 @@ int APIENTRY WINMAIN(HINSTANCE hInstance, viewer_app_ptr->mainLoop(); } + if (gSavedSettings.getBOOL("FastQuit")) + { + viewer_app_ptr->fastQuit(); + } + + if (!LLApp::isError()) { // |