diff options
author | Logan Dethrow <log@lindenlab.com> | 2011-09-07 16:40:40 -0400 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2011-09-07 16:40:40 -0400 |
commit | b8fddce34d1737acf32d83dac423dbb7a948cc4a (patch) | |
tree | adf4c05ab3a42b2d3fed8fbda23c2de97840bab7 /indra/llcrashlogger | |
parent | f73b795bb709b3060e06b4238ae4dac702f21301 (diff) | |
parent | 82b1b1bc6ee91e1778a16634fb9e2988da23fd71 (diff) |
Merge. Fixed issue with LLProxy code related to changes to the LLSocket interface.
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 |