summaryrefslogtreecommitdiff
path: root/indra/llcrashlogger/llcrashlogger.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-09-01 19:52:45 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-09-01 19:52:45 -0400
commita1741be7f6e4d67be55d6a5bc628c38390f9d4b4 (patch)
tree5c02bd701c5e55cfcf9fbe8af34cb2ae4b2c9995 /indra/llcrashlogger/llcrashlogger.cpp
parent9be4e7e448769cb82dc7d82e93bee4f1cd2b3e6c (diff)
parent3a2383dc0dc33ccbcddd63e3c0083cedb39f0dcd (diff)
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/llcrashlogger/llcrashlogger.cpp')
-rw-r--r--indra/llcrashlogger/llcrashlogger.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index dfb344c908..dca49be051 100644
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -45,6 +45,7 @@
#include "llhttpsdhandler.h"
#include "httpcommon.h"
#include "httpresponse.h"
+#include "llcleanup.h"
#include <curl/curl.h>
#include <openssl/crypto.h>
@@ -623,7 +624,7 @@ void LLCrashLogger::commonCleanup()
{
term_curl();
LLError::logToFile(""); //close crashreport.log
- LLProxy::cleanupClass();
+ SUBSYSTEM_CLEANUP(LLProxy);
}
void LLCrashLogger::init_curl()