diff options
author | Merov Linden <merov@lindenlab.com> | 2014-03-10 16:20:09 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-03-10 16:20:09 -0700 |
commit | 5690becdf4743286b196a331c48c8aa0332a8c66 (patch) | |
tree | 7c64dba5dca5ccfc9631f92fa7d662257654137b /indra/llcrashlogger | |
parent | 807fa3ee06cc139fcc41f69ed2caac20a8e8370d (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llcrashlogger')
-rwxr-xr-x | indra/llcrashlogger/llcrashlogger.cpp | 5 |
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. |