diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-12 12:10:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-12 12:10:24 -0400 |
| commit | edf5b6a8b71d9c4c01ce9c975864d4525cd7350c (patch) | |
| tree | 68310a6824451c8c6f3af8ef73f2f9ec17c3a467 /indra/newview/llassetuploadresponders.h | |
| parent | 01fb17cbc5a1d6a3526c4115787dbae74f7bdb07 (diff) | |
| parent | 460c81070e5fa1c51ce7e186a9ecb8c5f1c995e1 (diff) | |
pull changes for Sunshine beta
Diffstat (limited to 'indra/newview/llassetuploadresponders.h')
| -rw-r--r-- | indra/newview/llassetuploadresponders.h | 6 |
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; }; |