summaryrefslogtreecommitdiff
path: root/indra/newview/llassetuploadresponders.h
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2013-03-05 22:05:22 -0800
committerDon Kjer <don@lindenlab.com>2013-03-05 22:05:22 -0800
commit54cdc322b8f2bd35b289cacf3493622e7cc51194 (patch)
tree4f686cdfbaaf8819dfb1b015a1c8388ea1f59eac /indra/newview/llassetuploadresponders.h
parent9a0c52a247ecbd79f5f872ceb97a6be3e0499bea (diff)
Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam.
Diffstat (limited to 'indra/newview/llassetuploadresponders.h')
-rw-r--r--indra/newview/llassetuploadresponders.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llassetuploadresponders.h b/indra/newview/llassetuploadresponders.h
index 381b919c4a..a6d1016136 100644
--- a/indra/newview/llassetuploadresponders.h
+++ b/indra/newview/llassetuploadresponders.h
@@ -42,7 +42,7 @@ public:
LLAssetType::EType asset_type);
~LLAssetUploadResponder();
- virtual void error(U32 statusNum, const std::string& reason);
+ virtual void errorWithContent(U32 statusNum, const std::string& reason, const LLSD& content);
virtual void result(const LLSD& content);
virtual void uploadUpload(const LLSD& content);
virtual void uploadComplete(const LLSD& content);
@@ -67,7 +67,7 @@ public:
const LLSD& post_data,
const std::string& file_name,
LLAssetType::EType asset_type);
- virtual void error(U32 statusNum, const std::string& reason);
+ virtual void errorWithContent(U32 statusNum, const std::string& reason, const LLSD& content);
virtual void uploadComplete(const LLSD& content);
virtual void uploadFailure(const LLSD& content);
};
@@ -122,7 +122,7 @@ public:
~LLSendTexLayerResponder();
virtual void uploadComplete(const LLSD& content);
- virtual void error(U32 statusNum, const std::string& reason);
+ virtual void errorWithContent(U32 statusNum, const std::string& reason, const LLSD& content);
LLBakedUploadData * mBakedUploadData;
};