diff options
| author | Dave Hiller <daveh@lindenlab.com> | 2008-07-31 12:15:15 +0000 |
|---|---|---|
| committer | Dave Hiller <daveh@lindenlab.com> | 2008-07-31 12:15:15 +0000 |
| commit | 9a7d68cfce5f71cf9d89536431d72941dc369749 (patch) | |
| tree | f7e0ce093abef0fcc7737cac63bc2a8dbf11b729 /indra/newview/llassetuploadresponders.h | |
| parent | f0f2a416911ba8de9ac1e08cd90720c0d789bb2e (diff) | |
svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llassetuploadresponders.h')
| -rw-r--r-- | indra/newview/llassetuploadresponders.h | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/indra/newview/llassetuploadresponders.h b/indra/newview/llassetuploadresponders.h index 25f3f4c3b1..dc4f6e7bf0 100644 --- a/indra/newview/llassetuploadresponders.h +++ b/indra/newview/llassetuploadresponders.h @@ -42,7 +42,9 @@ public: LLAssetUploadResponder(const LLSD& post_data, const LLUUID& vfile_id, LLAssetType::EType asset_type); - LLAssetUploadResponder(const LLSD& post_data, const std::string& file_name); + LLAssetUploadResponder(const LLSD& post_data, + const std::string& file_name, + LLAssetType::EType asset_type); ~LLAssetUploadResponder(); virtual void error(U32 statusNum, const std::string& reason); virtual void result(const LLSD& content); @@ -52,8 +54,8 @@ public: protected: LLSD mPostData; - LLUUID mVFileID; LLAssetType::EType mAssetType; + LLUUID mVFileID; std::string mFileName; }; @@ -63,7 +65,8 @@ public: LLNewAgentInventoryResponder(const LLSD& post_data, const LLUUID& vfile_id, LLAssetType::EType asset_type); - LLNewAgentInventoryResponder(const LLSD& post_data, const std::string& file_name); + LLNewAgentInventoryResponder(const LLSD& post_data, const std::string& file_name, + LLAssetType::EType asset_type); virtual void uploadComplete(const LLSD& content); }; @@ -74,7 +77,8 @@ public: const LLUUID& vfile_id, LLAssetType::EType asset_type); LLUpdateAgentInventoryResponder(const LLSD& post_data, - const std::string& file_name); + const std::string& file_name, + LLAssetType::EType asset_type); virtual void uploadComplete(const LLSD& content); }; @@ -85,8 +89,17 @@ public: const LLUUID& vfile_id, LLAssetType::EType asset_type); LLUpdateTaskInventoryResponder(const LLSD& post_data, - const std::string& file_name); + const std::string& file_name, + LLAssetType::EType asset_type); + LLUpdateTaskInventoryResponder(const LLSD& post_data, + const std::string& file_name, + const LLUUID& queue_id, + LLAssetType::EType asset_type); + virtual void uploadComplete(const LLSD& content); + +private: + LLUUID mQueueId; }; #endif // LL_LLASSETUPLOADRESPONDER_H |