summaryrefslogtreecommitdiff
path: root/indra/newview/llestateinfomodel.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-07-10 19:30:10 -0400
committerNat Goodspeed <nat@lindenlab.com>2015-07-10 19:30:10 -0400
commitefa9a0f99c17b2b937120bcad6e3d45944122ed9 (patch)
tree9686020c06681328d7150ef6a89d975bd2d418ce /indra/newview/llestateinfomodel.cpp
parent247eb0c9c3418c10be8f2a0e3c8116758efa702f (diff)
Backed out changeset bab1000e1b2d: restore 'selfless' changes
Diffstat (limited to 'indra/newview/llestateinfomodel.cpp')
-rwxr-xr-xindra/newview/llestateinfomodel.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llestateinfomodel.cpp b/indra/newview/llestateinfomodel.cpp
index 04d0dda7ac..884d1579e6 100755
--- a/indra/newview/llestateinfomodel.cpp
+++ b/indra/newview/llestateinfomodel.cpp
@@ -123,12 +123,12 @@ bool LLEstateInfoModel::commitEstateInfoCaps()
}
LLCoros::instance().launch("LLEstateInfoModel::commitEstateInfoCapsCoro",
- boost::bind(&LLEstateInfoModel::commitEstateInfoCapsCoro, this, _1, url));
+ boost::bind(&LLEstateInfoModel::commitEstateInfoCapsCoro, this, url));
return true;
}
-void LLEstateInfoModel::commitEstateInfoCapsCoro(LLCoros::self& self, std::string url)
+void LLEstateInfoModel::commitEstateInfoCapsCoro(std::string url)
{
LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
@@ -153,7 +153,7 @@ void LLEstateInfoModel::commitEstateInfoCapsCoro(LLCoros::self& self, std::strin
<< ", sun_hour = " << getSunHour() << LL_ENDL;
LL_DEBUGS() << body << LL_ENDL;
- LLSD result = httpAdapter->postAndYield(self, httpRequest, url, body);
+ LLSD result = httpAdapter->postAndYield(httpRequest, url, body);
LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);