diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2014-03-10 20:34:43 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2014-03-10 20:34:43 -0400 |
commit | 9c29000ba2f8192985ad0bf20889739ad12dd569 (patch) | |
tree | 3670a18100453ef589a04d40da5aa314b99f5d11 /indra/llcrashlogger | |
parent | 71e237a3f79cd90b432205460fe6e5c6b536d9db (diff) | |
parent | cb91708332b8b8ddfe27808602ec5f43f11c24c2 (diff) |
Merge. Refresh from viewer-release after 3.7.3 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. |