summaryrefslogtreecommitdiff
path: root/indra/llmessage/tests
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-10-27 15:17:20 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-10-27 15:17:20 -0400
commitfa220db72a2d0b7cef665cdab53c07cdf4eac4cf (patch)
tree3007ca2d839d04ef16692ddbaa59cdd6bf6877af /indra/llmessage/tests
parentfae5abfd0903f09f1485f1f10ebea410ae4f9845 (diff)
parentd2af1ae8b09d76ee50a9a67a0f42fbfd6657d816 (diff)
merge up from viewer-pre-beta
Diffstat (limited to 'indra/llmessage/tests')
-rw-r--r--indra/llmessage/tests/networkio.h9
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())
{