diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-17 16:19:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-17 16:19:57 -0400 |
| commit | 77dc594e79118769087c0e2094c303fc5aaea5d4 (patch) | |
| tree | ed538b0b4e1d0b1de7ecbf22f701bbb1595b967c /indra/llmessage/tests | |
| parent | 94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff) | |
| parent | 1afbdc79c6fb911a5ab2c87067e7b99bec92fbc6 (diff) | |
merge back late changes and tags from release branch
Diffstat (limited to 'indra/llmessage/tests')
| -rw-r--r-- | indra/llmessage/tests/networkio.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llmessage/tests/networkio.h b/indra/llmessage/tests/networkio.h index 23e1c791f4..2aff90ca1e 100644 --- a/indra/llmessage/tests/networkio.h +++ b/indra/llmessage/tests/networkio.h @@ -30,6 +30,7 @@ #define LL_NETWORKIO_H #include "llmemory.h" // LLSingleton +#include "llapr.h" #include "llares.h" #include "llpumpio.h" #include "llhttpclient.h" @@ -47,8 +48,14 @@ public: mServicePump(NULL), mDone(false) { + ll_init_apr(); + if (! gAPRPoolp) + { + throw std::runtime_error("Can't initialize APR"); + } + // Create IO Pump to use for HTTP Requests. - mServicePump = new LLPumpIO; + mServicePump = new LLPumpIO(gAPRPoolp); LLHTTPClient::setPump(*mServicePump); if (ll_init_ares() == NULL || !gAres->isInitialized()) { |