diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2012-04-11 11:06:06 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2012-04-11 11:06:06 -0400 |
commit | 4743a2dac6af23a602c7ce8c5b5b0d351ae340e7 (patch) | |
tree | 8290203934beeb1ea5e37945a4749cf0e7eaca27 /indra/test/llhttpclient_tut.cpp | |
parent | 4574a9a008690c64158abd6d792d6d485bf0e235 (diff) | |
parent | 46a7cdd2866c4219bb690974d9d6266e6994b431 (diff) |
Automated merge with file:///home/nat/linden/viewer-leap-temp
Diffstat (limited to 'indra/test/llhttpclient_tut.cpp')
-rw-r--r-- | indra/test/llhttpclient_tut.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/test/llhttpclient_tut.cpp b/indra/test/llhttpclient_tut.cpp index 03759001ae..4b4046632c 100644 --- a/indra/test/llhttpclient_tut.cpp +++ b/indra/test/llhttpclient_tut.cpp @@ -40,6 +40,7 @@ #include "llhttpclient.h" #include "llformat.h" #include "llpipeutil.h" +#include "llproxy.h" #include "llpumpio.h" #include "llsdhttpserver.h" @@ -85,9 +86,10 @@ namespace tut HTTPClientTestData() { apr_pool_create(&mPool, NULL); + LLCurl::initClass(false); mServerPump = new LLPumpIO(mPool); mClientPump = new LLPumpIO(mPool); - + LLHTTPClient::setPump(*mClientPump); } @@ -95,6 +97,7 @@ namespace tut { delete mServerPump; delete mClientPump; + LLProxy::cleanupClass(); apr_pool_destroy(mPool); } |