summaryrefslogtreecommitdiff
path: root/indra/newview/llaccountingcostmanager.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-06-16 11:42:37 -0400
committerOz Linden <oz@lindenlab.com>2014-06-16 11:42:37 -0400
commite15002a11cf5081e0697065cb017ba0af6c4b32d (patch)
treed60ac6d3a85d114b7860e42be5d9ff3338a6a169 /indra/newview/llaccountingcostmanager.cpp
parent78be5c3aa5f7263698bec5bcbccb24c150f78d09 (diff)
parent977476171ddcc057d7c28b6c14ae988b8189ed75 (diff)
merge changes for 3.7.9-release
Diffstat (limited to 'indra/newview/llaccountingcostmanager.cpp')
-rwxr-xr-xindra/newview/llaccountingcostmanager.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/indra/newview/llaccountingcostmanager.cpp b/indra/newview/llaccountingcostmanager.cpp
index 150b97baa5..a42286a9e4 100755
--- a/indra/newview/llaccountingcostmanager.cpp
+++ b/indra/newview/llaccountingcostmanager.cpp
@@ -36,6 +36,7 @@ LLAccountingCostManager::LLAccountingCostManager()
//===============================================================================
class LLAccountingCostResponder : public LLCurl::Responder
{
+ LOG_CLASS(LLAccountingCostResponder);
public:
LLAccountingCostResponder( const LLSD& objectIDs, const LLHandle<LLAccountingCostObserver>& observer_handle )
: mObjectIDs( objectIDs ),
@@ -56,24 +57,27 @@ public:
}
}
- void errorWithContent( U32 statusNum, const std::string& reason, const LLSD& content )
+protected:
+ void httpFailure()
{
- LL_WARNS() << "Transport error [status:" << statusNum << "]: " << content <<LL_ENDL;
+ LL_WARNS() << dumpResponse() << LL_ENDL;
clearPendingRequests();
LLAccountingCostObserver* observer = mObserverHandle.get();
if (observer && observer->getTransactionID() == mTransactionID)
{
- observer->setErrorStatus(statusNum, reason);
+ observer->setErrorStatus(getStatus(), getReason());
}
}
- void result( const LLSD& content )
+ void httpSuccess()
{
+ const LLSD& content = getContent();
//Check for error
if ( !content.isMap() || content.has("error") )
{
- LL_WARNS() << "Error on fetched data"<< LL_ENDL;
+ failureResult(HTTP_INTERNAL_ERROR, "Error on fetched data", content);
+ return;
}
else if (content.has("selected"))
{