diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-02-15 09:52:11 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-02-15 09:52:11 -0500 |
| commit | 741821eb6a8717896307da44b1b8e7078a865fff (patch) | |
| tree | c2aecd42a4f93db1eeb550d7e05dac1f0465965d /indra/newview/llappviewer.cpp | |
| parent | 0ccb70b8d75c9a12440b00dcc7c3904e380e39c6 (diff) | |
SH-3867 FIX - on logout, wait for any pending metrics uploads to complete
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9a5010c781..70c5527b23 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -291,6 +291,8 @@ LLTimer gLogoutTimer; static const F32 LOGOUT_REQUEST_TIME = 6.f; // this will be cut short by the LogoutReply msg. F32 gLogoutMaxTime = LOGOUT_REQUEST_TIME; +S32 gPendingMetricsUploads = 0; + BOOL gDisconnected = FALSE; // used to restore texture state after a mode switch @@ -4725,6 +4727,13 @@ void LLAppViewer::idleShutdown() return; } + if (gPendingMetricsUploads > 0 + && gLogoutTimer.getElapsedTimeF32() < SHUTDOWN_UPLOAD_SAVE_TIME + && !logoutRequestSent()) + { + return; + } + // All floaters are closed. Tell server we want to quit. if( !logoutRequestSent() ) { |