summaryrefslogtreecommitdiff
path: root/indra/llcrashlogger
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-09-01 18:29:17 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-09-01 18:29:17 -0400
commit3a2383dc0dc33ccbcddd63e3c0083cedb39f0dcd (patch)
tree7cd7cef085a002885a362337fc8b67060bfcc395 /indra/llcrashlogger
parent31d3d654f156351e3cf29f97fd97cbda046ae650 (diff)
parent959edebeca3c1d9f0730292c2f3bc0e8bb5bf94a (diff)
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/llcrashlogger')
-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()