summaryrefslogtreecommitdiff
path: root/indra/llcrashlogger
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-05-26 20:15:42 -0400
committerNat Goodspeed <nat@lindenlab.com>2015-05-26 20:15:42 -0400
commitdf55db4aa02ef02169d318b1d8b607c2edb3ba5d (patch)
treec8d586ca1ab4b54d0b1a65338a79fae59222fc18 /indra/llcrashlogger
parentf3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff)
parent234ea528505d0363c4c4eb0150e7587e863c8e20 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcrashlogger')
-rwxr-xr-xindra/llcrashlogger/llcrashlogger.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index 7a97c16ea7..0d239c9435 100755
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -45,6 +45,7 @@
#include "llhttpclient.h"
#include "llsdserialize.h"
#include "llproxy.h"
+#include "llcleanup.h"
LLPumpIO* gServicePump = NULL;
BOOL gBreak = false;
@@ -587,5 +588,5 @@ bool LLCrashLogger::init()
void LLCrashLogger::commonCleanup()
{
LLError::logToFile(""); //close crashreport.log
- LLProxy::cleanupClass();
+ SUBSYSTEM_CLEANUP(LLProxy);
}