diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2011-08-31 11:15:02 -0600 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2011-08-31 11:15:02 -0600 |
commit | 1379188c82a49617782288a61f1c3908d8738a3e (patch) | |
tree | 8a0c020aa8f6ab9ab2b62bfff01cd67e9c34bd32 /indra/llcrashlogger | |
parent | e62a4d4ec151e81f4dc68b29a009596d3d154d57 (diff) | |
parent | e547c36e2562589c120bb23ee88308e21a826cd1 (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llcrashlogger')
-rw-r--r-- | indra/llcrashlogger/llcrashlogger.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp index 331a1692ee..514ef6011f 100644 --- a/indra/llcrashlogger/llcrashlogger.cpp +++ b/indra/llcrashlogger/llcrashlogger.cpp @@ -414,8 +414,7 @@ bool LLCrashLogger::init() return false; } - gServicePump = new LLPumpIO(gAPRPoolp); - gServicePump->prime(gAPRPoolp); + gServicePump = new LLPumpIO; LLHTTPClient::setPump(*gServicePump); //If we've opened the crash logger, assume we can delete the marker file if it exists |