4 files changed, 3 insertions, 47 deletions
diff --git a/indra/llcorehttp/httpcommon.h b/indra/llcorehttp/httpcommon.h
index e806201798..e673d7b589 100755
--- a/indra/llcorehttp/httpcommon.h
+++ b/indra/llcorehttp/httpcommon.h
@@ -189,6 +189,7 @@
 
 #include "linden_common.h"		// Modifies curl/curl.h interfaces
 #include "boost/intrusive_ptr.hpp"
+#include "boost/shared_ptr.hpp"
 #include <string>
 
 namespace LLCore
diff --git a/indra/llcorehttp/httprequest.h b/indra/llcorehttp/httprequest.h
index c90e056d62..4cacb3a20b 100755
--- a/indra/llcorehttp/httprequest.h
+++ b/indra/llcorehttp/httprequest.h
@@ -97,7 +97,7 @@ public:
 	typedef unsigned int policy_t;
 	typedef unsigned int priority_t;
 	
-	typedef std::shared_ptr<HttpRequest> ptr_t;
+	typedef boost::shared_ptr<HttpRequest> ptr_t;
 public:
 	/// @name PolicyMethods
 	/// @{
diff --git a/indra/llcorehttp/httpresponse.h b/indra/llcorehttp/httpresponse.h
index c6b470ee3f..39b582ff85 100755
--- a/indra/llcorehttp/httpresponse.h
+++ b/indra/llcorehttp/httpresponse.h
@@ -72,7 +72,7 @@ public:
 	/// Statistics for the HTTP 
 	struct TransferStats
 	{
-		typedef std::shared_ptr<TransferStats> ptr_t;
+		typedef boost::shared_ptr<TransferStats> ptr_t;
 
 		TransferStats() : mSizeDownload(0.0), mTotalTime(0.0), mSpeedDownload(0.0) {}
 		F64 mSizeDownload;
diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index 27c94b1182..b4a76cb808 100755
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -218,51 +218,6 @@ void LLHTTPClient::setCertVerifyCallback(LLURLRequest::SSLCertVerifyCallback cal
 	LLHTTPClient::mCertVerifyCallback = callback;
 }
 
-#if 0
-typedef std::shared_ptr<LLCore::HttpRequest> HttpRequestPtr_t;
-typedef std::unique_ptr<LLCore::HttpOptions> HttpOptionsPtr_t;
-typedef std::unique_ptr<Injector> InjectorPtr_t;
-
-static void request_(
-	const std::string& url,
-	EHTTPMethod method,
-	Injector* body_injector,
-	LLCurl::ResponderPtr responder,
-	const F32 timeout = HTTP_REQUEST_EXPIRY_SECS,
-	const LLSD& headers = LLSD(),
-	bool follow_redirects = true
-	)
-{
-	HttpRequestPtr_t httpReq = HttpRequestPtr_t(new LLCore::HttpRequest());
-
-	HttpOptionsPtr_t httpOpts = HttpOptionsPtr_t(new LLCore::HttpOptions());
-
-	httpOpts->setFollowRedirects(follow_redirects);
-	httpOpts->setRetries(12);
-	httpOpts->setUseRetryAfter(true);
-	// for the moment lets just truncate.  60 seconds vs 60.5 seconds 
-	httpOpts->setTransferTimeout((unsigned int)timeout); 
-
-	switch (method)
-	{
-	case HTTP_GET:
-		httpReq->requestGet(0, 0, url, httpOpts.get(), headers, handler);
-		break;
-	case HTTP_HEAD:
-		httpReq->requestHead(0, 0, url, httpOpts.get(), headers, handler);
-		break;
-	case HTTP_PUT:
-		httpReq->requestPut(0, 0, url, );
-		break;
-	case HTTP_POST:
-		httpReq->requestPost(0, 0, url, null, httpOpts.get(), headers, handler);
-		break;
-	}
-
-
-}
-#endif 
-
 static void request(
 	const std::string& url,
 	EHTTPMethod method,