summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatarself.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/llvoavatarself.cpp
parentf8a7eda55bdd34eeb2fafed21d23d26cd25f924d (diff)
parent2a29dbc48295ad24a8a7137a10b9d891debea978 (diff)
Merge
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
-rwxr-xr-xindra/newview/llvoavatarself.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index ba4fd59feb..7c460ce097 100755
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -2190,7 +2190,7 @@ const std::string LLVOAvatarSelf::debugDumpAllLocalTextureDataInfo() const
return text;
}
-void LLVOAvatarSelf::appearanceChangeMetricsCoro(LLCoros::self& self, std::string url)
+void LLVOAvatarSelf::appearanceChangeMetricsCoro(std::string url)
{
LLCore::HttpRequest::policy_t httpPolicy(LLCore::HttpRequest::DEFAULT_POLICY_ID);
LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t
@@ -2242,7 +2242,7 @@ void LLVOAvatarSelf::appearanceChangeMetricsCoro(LLCoros::self& self, std::strin
gPendingMetricsUploads++;
- LLSD result = httpAdapter->postAndYield(self, httpRequest, url, msg);
+ LLSD result = httpAdapter->postAndYield(httpRequest, url, msg);
LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
@@ -2347,7 +2347,7 @@ void LLVOAvatarSelf::sendViewerAppearanceChangeMetrics()
{
LLCoros::instance().launch("LLVOAvatarSelf::appearanceChangeMetricsCoro",
- boost::bind(&LLVOAvatarSelf::appearanceChangeMetricsCoro, this, _1, caps_url));
+ boost::bind(&LLVOAvatarSelf::appearanceChangeMetricsCoro, this, caps_url));
mTimeSinceLastRezMessage.reset();
}
}