diff options
author | Oz Linden <oz@lindenlab.com> | 2014-03-14 16:38:12 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-03-14 16:38:12 -0400 |
commit | d6fdc6e68fc713b21b68e42740d63c3e9005bceb (patch) | |
tree | 8692c2c7ac5e3b0bbb5fa2b5362f2796dcf71e8b /indra/llcrashlogger/llcrashlogger.cpp | |
parent | bc7a579ba285fa64876a2bc116685f0357fe25dc (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
merge changes for 3.7.3-release
Diffstat (limited to 'indra/llcrashlogger/llcrashlogger.cpp')
-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. |