summaryrefslogtreecommitdiff
path: root/indra/newview/llremoteparcelrequest.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-07-02 09:22:05 -0700
committerRider Linden <rider@lindenlab.com>2015-07-02 09:22:05 -0700
commitd785ec312bb7f4e77517eb44f46f276ba0129677 (patch)
tree9686020c06681328d7150ef6a89d975bd2d418ce /indra/newview/llremoteparcelrequest.cpp
parentf8a7eda55bdd34eeb2fafed21d23d26cd25f924d (diff)
parent2a29dbc48295ad24a8a7137a10b9d891debea978 (diff)
Merge
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);