summaryrefslogtreecommitdiff
path: root/indra/newview/llremoteparcelrequest.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-07-10 19:46:51 -0400
committerNat Goodspeed <nat@lindenlab.com>2015-07-10 19:46:51 -0400
commitd215de3b7d672dcb5da41600c2b5d0abe2cb82ce (patch)
treeeb12d68e18684eb5dd6f4cb309c039f5bc52ed11 /indra/newview/llremoteparcelrequest.cpp
parent91f636f23a6db27c4ca4c5df2325a7053ca3044e (diff)
parent68f42e4e102bd578386aeec3485233e332cbdcff (diff)
Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-u
Diffstat (limited to 'indra/newview/llremoteparcelrequest.cpp')
-rwxr-xr-xindra/newview/llremoteparcelrequest.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llremoteparcelrequest.cpp b/indra/newview/llremoteparcelrequest.cpp
index 7e8e9ac18e..06bf90c7cb 100755
--- a/indra/newview/llremoteparcelrequest.cpp
+++ b/indra/newview/llremoteparcelrequest.cpp
@@ -170,7 +170,7 @@ bool LLRemoteParcelInfoProcessor::requestRegionParcelInfo(const std::string &url
if (!url.empty())
{
LLCoros::instance().launch("LLRemoteParcelInfoProcessor::regionParcelInfoCoro",
- boost::bind(&LLRemoteParcelInfoProcessor::regionParcelInfoCoro, this, _1, url,
+ boost::bind(&LLRemoteParcelInfoProcessor::regionParcelInfoCoro, this, url,
regionId, regionPos, globalPos, observerHandle));
return true;
}
@@ -178,7 +178,7 @@ bool LLRemoteParcelInfoProcessor::requestRegionParcelInfo(const std::string &url
return false;
}
-void LLRemoteParcelInfoProcessor::regionParcelInfoCoro(LLCoros::self& self, std::string url,
+void LLRemoteParcelInfoProcessor::regionParcelInfoCoro(std::string url,
LLUUID regionId, LLVector3 posRegion, LLVector3d posGlobal,
LLHandle<LLRemoteParcelInfoObserver> observerHandle)
{
@@ -200,7 +200,7 @@ void LLRemoteParcelInfoProcessor::regionParcelInfoCoro(LLCoros::self& self, std:
bodyData["region_handle"] = ll_sd_from_U64(regionHandle);
}
- LLSD result = httpAdapter->postAndYield(self, httpRequest, url, bodyData);
+ LLSD result = httpAdapter->postAndYield(httpRequest, url, bodyData);
LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);