summaryrefslogtreecommitdiff
path: root/indra/llcrashlogger/llcrashlogger.cpp
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-03-27 11:59:35 -0700
committerAura Linden <aura@lindenlab.com>2014-03-27 11:59:35 -0700
commitdfd78e83d91832b486a5bba6b1bb1cce621163ab (patch)
tree5d27537583ea1f06c0e7b469f83ed65c93f70d15 /indra/llcrashlogger/llcrashlogger.cpp
parent22ea5ac41ca3a1f7a884b56526791f611834f76b (diff)
parent31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff)
Pulled merge from release
Diffstat (limited to 'indra/llcrashlogger/llcrashlogger.cpp')
-rwxr-xr-xindra/llcrashlogger/llcrashlogger.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index fb2d43e3b0..aa66ceb4ec 100755
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -44,7 +44,7 @@
#include "llsdserialize.h"
#include "llproxy.h"
-LLPumpIO* gServicePump;
+LLPumpIO* gServicePump = NULL;
BOOL gBreak = false;
BOOL gSent = false;
@@ -80,7 +80,8 @@ LLCrashLogger::LLCrashLogger() :
LLCrashLogger::~LLCrashLogger()
{
-
+ delete gServicePump;
+ gServicePump = NULL;
}
// TRIM_SIZE must remain larger than LINE_SEARCH_SIZE.