From 81a1a686fcf31613b36bce7e3d3d9008b32bbdcd Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 11 Jan 2015 03:28:15 +0100 Subject: [PATCH] Fix FSAssetResponder and use new cURL API --- indra/newview/fsfloaterimport.cpp | 4 ++-- indra/newview/fsfloaterimport.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/fsfloaterimport.cpp b/indra/newview/fsfloaterimport.cpp index 79375ff344..24c186e4e2 100644 --- a/indra/newview/fsfloaterimport.cpp +++ b/indra/newview/fsfloaterimport.cpp @@ -1993,9 +1993,9 @@ void FSAssetResponder::uploadComplete(const LLSD& content) delete data; } -void FSAssetResponder::error(U32 statusNum, const std::string& reason) +void FSAssetResponder::httpFailure() { - LL_WARNS("import") << "Error " << statusNum << " reason: " << reason << LL_ENDL; + LL_WARNS("import") << "Error " << getStatus() << " reason: " << getReason() << LL_ENDL; LLResourceData* data = (LLResourceData*)mData; FSResourceData* fs_data = (FSResourceData*)data->mUserData; FSFloaterImport* self = (FSFloaterImport*)fs_data->user_data; diff --git a/indra/newview/fsfloaterimport.h b/indra/newview/fsfloaterimport.h index 55bdb6a477..4c0ded09dd 100644 --- a/indra/newview/fsfloaterimport.h +++ b/indra/newview/fsfloaterimport.h @@ -142,7 +142,7 @@ public: ~FSAssetResponder(); virtual void uploadComplete(const LLSD& content); - virtual void error(U32 statusNum, const std::string& reason); + virtual void httpFailure(); LLResourceData* mData; };