diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-01 18:33:29 -0400 | 
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-01 18:33:29 -0400 | 
| commit | b262ded7e0cf21314524bf702b0e4fe28a3c3060 (patch) | |
| tree | 29956f8ff76bce557936c408c683838b015cc50e /indra/viewer_components/updater | |
| parent | 41dff76327feffed798c8b24673885bc9ad61005 (diff) | |
MAINT-5351: Remove 'self' parameter from coroutine functions.
lleventcoro_test.cpp runs clean (as modified for new API), and all the rest
builds clean, but the resulting viewer is as yet untested.
Diffstat (limited to 'indra/viewer_components/updater')
| -rwxr-xr-x | indra/viewer_components/updater/llupdatechecker.cpp | 6 | ||||
| -rwxr-xr-x | indra/viewer_components/updater/llupdatechecker.h | 2 | 
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/viewer_components/updater/llupdatechecker.cpp b/indra/viewer_components/updater/llupdatechecker.cpp index 29cb238892..e889f83aa9 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, _1, checkUrl)); +            boost::bind(&Implementation::checkVersionCoro, this, checkUrl));  	}  	else @@ -126,7 +126,7 @@ void LLUpdateChecker::Implementation::checkVersion(std::string const & urlBase,  	}  } -void LLUpdateChecker::Implementation::checkVersionCoro(LLCoros::self& self, std::string url) +void LLUpdateChecker::Implementation::checkVersionCoro(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(LLCoros::self& self, std:      LL_INFOS("checkVersionCoro") << "Getting update information from " << url << LL_ENDL; -    LLSD result = httpAdapter->getAndYield(self, httpRequest, url); +    LLSD result = httpAdapter->getAndYield(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 e5050bb952..d10ea4cf42 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(LLCoros::self& self, std::string url); +        void checkVersionCoro(std::string url);          LOG_CLASS(LLUpdateChecker::Implementation);      };  | 
