summaryrefslogtreecommitdiff
path: root/indra/llcrashlogger
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-03-10 15:47:27 -0400
committerOz Linden <oz@lindenlab.com>2014-03-10 15:47:27 -0400
commit0f3ba54a7ececa4d6f7c247a3ffa3a2f9572268e (patch)
treec7d3d7cc7a6d1a22ad7b69f45ade31ef4780f9e6 /indra/llcrashlogger
parent2b4d3fff706d098076bb6c0a7dce2ca35b83300f (diff)
parentcb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff)
merge changes for 3.7.3-release
Diffstat (limited to 'indra/llcrashlogger')
-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.