summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterperms.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-07-07 19:41:27 +0100
committerRider Linden <rider@lindenlab.com>2015-07-07 19:41:27 +0100
commit247eb0c9c3418c10be8f2a0e3c8116758efa702f (patch)
treed3a448c69f1ad241dc72662970d702c2aa618382 /indra/newview/llfloaterperms.cpp
parentd785ec312bb7f4e77517eb44f46f276ba0129677 (diff)
Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5
Diffstat (limited to 'indra/newview/llfloaterperms.cpp')
-rwxr-xr-xindra/newview/llfloaterperms.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp
index 16bb449fdb..06af2725c3 100755
--- a/indra/newview/llfloaterperms.cpp
+++ b/indra/newview/llfloaterperms.cpp
@@ -182,7 +182,7 @@ void LLFloaterPermsDefault::updateCap()
if(!object_url.empty())
{
LLCoros::instance().launch("LLFloaterPermsDefault::updateCapCoro",
- boost::bind(&LLFloaterPermsDefault::updateCapCoro, object_url));
+ boost::bind(&LLFloaterPermsDefault::updateCapCoro, _1, object_url));
}
else
{
@@ -191,7 +191,7 @@ void LLFloaterPermsDefault::updateCap()
}
/*static*/
-void LLFloaterPermsDefault::updateCapCoro(std::string url)
+void LLFloaterPermsDefault::updateCapCoro(LLCoros::self& self, std::string url)
{
static std::string previousReason;
LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
@@ -215,7 +215,7 @@ void LLFloaterPermsDefault::updateCapCoro(std::string url)
LL_CONT << sent_perms_log.str() << LL_ENDL;
}
- LLSD result = httpAdapter->postAndYield(httpRequest, url, postData);
+ LLSD result = httpAdapter->postAndYield(self, httpRequest, url, postData);
LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);