diff options
| author | callum <none@none> | 2010-10-14 15:18:35 -0700 |
|---|---|---|
| committer | callum <none@none> | 2010-10-14 15:18:35 -0700 |
| commit | 562fa040dfce3904271150c8213ef46c90369ac6 (patch) | |
| tree | 105426c653cc311e8f04e1557ca61e28cb28e194 /indra/newview/llappviewer.cpp | |
| parent | eea2b8f9d3fe909befd43ca8db7878855ddd661d (diff) | |
| parent | 8b9b7fed7367eeb7b055f7b2a44a37539634045e (diff) | |
Merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index ba3c6a5916..61599ad435 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2884,6 +2884,7 @@ void LLAppViewer::forceQuit() LLApp::setQuitting(); } +//TODO: remove void LLAppViewer::fastQuit(S32 error_code) { // finish pending transfers @@ -2902,11 +2903,6 @@ void LLAppViewer::fastQuit(S32 error_code) void LLAppViewer::requestQuit() { - if (gSavedSettings.getBOOL("FastQuit")) - { - fastQuit(); - } - llinfos << "requestQuit" << llendl; LLViewerRegion* region = gAgent.getRegion(); |