summaryrefslogtreecommitdiff
path: root/indra/newview/llappcorehttp.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-10-15 11:42:43 -0700
committerRider Linden <rider@lindenlab.com>2015-10-15 11:42:43 -0700
commit6ff0bff8f0f65a77e66c86077d8d2d6a9f8930c7 (patch)
treeb73edc74e792041ac54551e2ec3ba817008db22a /indra/newview/llappcorehttp.cpp
parentb30e408a42a95d68dd7d32e4391b59d108d086c4 (diff)
Another fix for unit tests. Missed on Windows.
Diffstat (limited to 'indra/newview/llappcorehttp.cpp')
-rwxr-xr-xindra/newview/llappcorehttp.cpp16
1 files changed, 1 insertions, 15 deletions
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();