summaryrefslogtreecommitdiff
path: root/indra/llcrashlogger/llcrashlogger.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2017-02-02 15:49:16 -0500
committerOz Linden <oz@lindenlab.com>2017-02-02 15:49:16 -0500
commit1925fd2b8b9216e5d9388e6a0c077c99aa782cad (patch)
tree2507c9889eb825302f7c3f1650b85e6208b04e4e /indra/llcrashlogger/llcrashlogger.cpp
parent7f544db197fcaa8a697ee9d9694d11b297a20266 (diff)
parent080744d8990e6b18a80858803a20a5ec87020d82 (diff)
merge changes for 5.0.1-release
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()