Re-added some missing calls to apr_pool_destroy() that I failed to readd after the thread local storage rollback. Also added a call to LLProxy::cleanupClass() to prevent indra/test from segfaulting on exit.

1 files changed, 4 insertions, 1 deletions

diff --git a/indra/test/llhttpclient_tut.cpp b/indra/test/llhttpclient_tut.cpp
index 16a73c03cb..4b4046632c 100644
--- a/indra/test/llhttpclient_tut.cpp
+++ b/indra/test/llhttpclient_tut.cpp
@@ -36,11 +36,11 @@
 // These are too slow on Windows to actually include in the build. JC
 #if !LL_WINDOWS
 
-#include "llapr.h"
 #include "lltut.h"
 #include "llhttpclient.h"
 #include "llformat.h"
 #include "llpipeutil.h"
+#include "llproxy.h"
 #include "llpumpio.h"
 
 #include "llsdhttpserver.h"
@@ -89,6 +89,7 @@ namespace tut
 			LLCurl::initClass(false);
 			mServerPump = new LLPumpIO(mPool);
 			mClientPump = new LLPumpIO(mPool);
+
 			LLHTTPClient::setPump(*mClientPump);
 		}
 		
@@ -96,6 +97,8 @@ namespace tut
 		{
 			delete mServerPump;
 			delete mClientPump;
+			LLProxy::cleanupClass();
+			apr_pool_destroy(mPool);
 		}
 
 		void setupTheServer()