livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix FSAssetResponder and use new cURL API

Ansariel 2015-01-11 03:28:15 +01:00
parent 504921d80f
commit 81a1a686fc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/fsfloaterimport.cpp
View File

@ -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;

2
indra/newview/fsfloaterimport.h
View File

@ -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;
};