From 4edfec78b1bb1e33fd144f9b50a38003b888c619 Mon Sep 17 00:00:00 2001
From: Cinder <cinder@sdf.org>
Date: Tue, 9 Dec 2014 10:25:01 -0700
Subject: [PATCH] Fix two http responders
---
indra/newview/llavatarrenderinfoaccountant.cpp | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/indra/newview/llavatarrenderinfoaccountant.cpp b/indra/newview/llavatarrenderinfoaccountant.cpp
index 38e153137c..ed97dfefe2 100644
--- a/indra/newview/llavatarrenderinfoaccountant.cpp
+++ b/indra/newview/llavatarrenderinfoaccountant.cpp
@@ -65,8 +65,10 @@ public:
{
}
- virtual void error(U32 statusNum, const std::string& reason)
+ virtual void httpError()
{
+ const std::string& reason = getReason();
+ const S32 statusNum = getStatus();
LLViewerRegion * regionp = LLWorld::getInstance()->getRegionFromHandle(mRegionHandle);
if (regionp)
{
@@ -86,7 +88,7 @@ public:
}
- virtual void result(const LLSD& content)
+ virtual void httpSuccess()
{
LLViewerRegion * regionp = LLWorld::getInstance()->getRegionFromHandle(mRegionHandle);
if (regionp)
@@ -96,6 +98,7 @@ public:
LL_INFOS() << "LRI: Result for avatar weights request for region " << regionp->getName() << ":" << LL_ENDL;
}
+ const LLSD& content = getContent();
if (content.isMap())
{
if (content.has(KEY_AGENTS))
@@ -160,8 +163,10 @@ public:
{
}
- virtual void error(U32 statusNum, const std::string& reason)
+ virtual void httpFailure()
{
+ const std::string& reason = getReason();
+ const S32 statusNum = getStatus();
LLViewerRegion * regionp = LLWorld::getInstance()->getRegionFromHandle(mRegionHandle);
if (regionp)
{
@@ -180,11 +185,12 @@ public:
}
}
- virtual void result(const LLSD& content)
+ virtual void httpSuccess()
{
LLViewerRegion * regionp = LLWorld::getInstance()->getRegionFromHandle(mRegionHandle);
if (regionp)
{
+ const LLSD& content = getContent();
if (LLAvatarRenderInfoAccountant::logRenderInfo())
{
LL_INFOS() << "LRI: Result for avatar weights POST for region " << regionp->getName()
--
GitLab