summaryrefslogtreecommitdiff
path: root/indra/llcrashlogger
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-11-02 14:09:43 -0500
committerNat Goodspeed <nat@lindenlab.com>2015-11-02 14:09:43 -0500
commit11c428759e0b99fc34e219181d81d024b0323b4d (patch)
treee6ee27fa90d7767ac8f959c97474ee34bab00211 /indra/llcrashlogger
parent84150294b912d04e345007b65670c0230a2e4d79 (diff)
parent77da469d6f7901ee0cddf5fb351cd2a756b217f0 (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);
}