Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5

2 files changed, 4 insertions, 4 deletions

diff --git a/indra/viewer_components/updater/llupdatechecker.cpp b/indra/viewer_components/updater/llupdatechecker.cpp
index e889f83aa9..29cb238892 100755
--- a/indra/viewer_components/updater/llupdatechecker.cpp
+++ b/indra/viewer_components/updater/llupdatechecker.cpp
@@ -117,7 +117,7 @@ void LLUpdateChecker::Implementation::checkVersion(std::string const & urlBase,
 		LL_INFOS("UpdaterService") << "checking for updates at " << checkUrl << LL_ENDL;
 
         LLCoros::instance().launch("LLUpdateChecker::Implementation::checkVersionCoro",
-            boost::bind(&Implementation::checkVersionCoro, this, checkUrl));
+            boost::bind(&Implementation::checkVersionCoro, this, _1, checkUrl));
 
 	}
 	else
@@ -126,7 +126,7 @@ void LLUpdateChecker::Implementation::checkVersion(std::string const & urlBase,
 	}
 }
 
-void LLUpdateChecker::Implementation::checkVersionCoro(std::string url)
+void LLUpdateChecker::Implementation::checkVersionCoro(LLCoros::self& self, std::string url)
 {
     LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
     LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
@@ -135,7 +135,7 @@ void LLUpdateChecker::Implementation::checkVersionCoro(std::string url)
 
     LL_INFOS("checkVersionCoro") << "Getting update information from " << url << LL_ENDL;
 
-    LLSD result = httpAdapter->getAndYield(httpRequest, url);
+    LLSD result = httpAdapter->getAndYield(self, httpRequest, url);
 
     LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
     LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
diff --git a/indra/viewer_components/updater/llupdatechecker.h b/indra/viewer_components/updater/llupdatechecker.h
index d10ea4cf42..e5050bb952 100755
--- a/indra/viewer_components/updater/llupdatechecker.h
+++ b/indra/viewer_components/updater/llupdatechecker.h
@@ -106,7 +106,7 @@ private:
             unsigned char       uniqueid[MD5HEX_STR_SIZE],
             bool                willing_to_test);
 
-        void checkVersionCoro(std::string url);
+        void checkVersionCoro(LLCoros::self& self, std::string url);
 
         LOG_CLASS(LLUpdateChecker::Implementation);
     };