Another fix for unit tests. Missed on Windows.

3 files changed, 3 insertions, 17 deletions

diff --git a/indra/llcorehttp/tests/llcorehttp_test.cpp b/indra/llcorehttp/tests/llcorehttp_test.cpp
index e863ddd13f..bef762f5ce 100755
--- a/indra/llcorehttp/tests/llcorehttp_test.cpp
+++ b/indra/llcorehttp/tests/llcorehttp_test.cpp
@@ -160,7 +160,7 @@ void stop_thread(LLCore::HttpRequest * req)
 {
 	if (req)
 	{
-		req->requestStopThread(NULL);
+		req->requestStopThread(LLCore::HttpHandler::ptr_t());
 	
 		int count = 0;
 		int limit = 10;
diff --git a/indra/llcorehttp/tests/test_httprequest.hpp b/indra/llcorehttp/tests/test_httprequest.hpp
index 965a94bc38..463e55dd7e 100755
--- a/indra/llcorehttp/tests/test_httprequest.hpp
+++ b/indra/llcorehttp/tests/test_httprequest.hpp
@@ -247,7 +247,7 @@ void HttpRequestTestObjectType::test<2>()
 		ensure("Memory being used", mMemTotal < GetMemTotal());
 
 		// Issue a NoOp
-		HttpHandle handle = req->requestNoOp(NULL);
+		HttpHandle handle = req->requestNoOp(LLCore::HttpHandler::ptr_t());
 		ensure("Request issued", handle != LLCORE_HTTP_HANDLE_INVALID);
 		
 		// release the request object
diff --git a/indra/newview/llappcorehttp.cpp b/indra/newview/llappcorehttp.cpp
index 8c276c0fe9..5aed9ff25f 100755
--- a/indra/newview/llappcorehttp.cpp
+++ b/indra/newview/llappcorehttp.cpp
@@ -278,25 +278,11 @@ void setting_changed()
 	LLAppViewer::instance()->getAppCoreHttp().refreshSettings(false);
 }
 
-namespace
-{
-    // The NoOpDeletor is used when wrapping LLAppCoreHttp in a smart pointer below for
-    // passage into the LLCore::Http libararies.  When the smart pointer is destroyed, 
-    // no action will be taken since we do not in this case want the entire LLAppCoreHttp object
-    // to be destroyed at the end of the call.
-    // 
-    // *NOTE$: Yes! It is "Deletor" 
-    // http://english.stackexchange.com/questions/4733/what-s-the-rule-for-adding-er-vs-or-when-nouning-a-verb
-    // "delete" derives from Latin "deletus"
-    void NoOpDeletor(LLCore::HttpHandler *)
-    { /*NoOp*/ }
-}
-
 void LLAppCoreHttp::requestStop()
 {
 	llassert_always(mRequest);
 
-	mStopHandle = mRequest->requestStopThread(LLCore::HttpHandler::ptr_t(this, NoOpDeletor));
+	mStopHandle = mRequest->requestStopThread(*this);
 	if (LLCORE_HTTP_HANDLE_INVALID != mStopHandle)
 	{
 		mStopRequested = LLTimer::getTotalSeconds();