diff options
Diffstat (limited to 'linden/indra/newview/llassetuploadresponders.h')
-rw-r--r-- | linden/indra/newview/llassetuploadresponders.h | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/linden/indra/newview/llassetuploadresponders.h b/linden/indra/newview/llassetuploadresponders.h index 6f026a1..dd74c13 100644 --- a/linden/indra/newview/llassetuploadresponders.h +++ b/linden/indra/newview/llassetuploadresponders.h | |||
@@ -42,7 +42,9 @@ public: | |||
42 | LLAssetUploadResponder(const LLSD& post_data, | 42 | LLAssetUploadResponder(const LLSD& post_data, |
43 | const LLUUID& vfile_id, | 43 | const LLUUID& vfile_id, |
44 | LLAssetType::EType asset_type); | 44 | LLAssetType::EType asset_type); |
45 | LLAssetUploadResponder(const LLSD& post_data, const std::string& file_name); | 45 | LLAssetUploadResponder(const LLSD& post_data, |
46 | const std::string& file_name, | ||
47 | LLAssetType::EType asset_type); | ||
46 | ~LLAssetUploadResponder(); | 48 | ~LLAssetUploadResponder(); |
47 | virtual void error(U32 statusNum, const std::string& reason); | 49 | virtual void error(U32 statusNum, const std::string& reason); |
48 | virtual void result(const LLSD& content); | 50 | virtual void result(const LLSD& content); |
@@ -52,8 +54,8 @@ public: | |||
52 | 54 | ||
53 | protected: | 55 | protected: |
54 | LLSD mPostData; | 56 | LLSD mPostData; |
55 | LLUUID mVFileID; | ||
56 | LLAssetType::EType mAssetType; | 57 | LLAssetType::EType mAssetType; |
58 | LLUUID mVFileID; | ||
57 | std::string mFileName; | 59 | std::string mFileName; |
58 | }; | 60 | }; |
59 | 61 | ||
@@ -63,7 +65,8 @@ public: | |||
63 | LLNewAgentInventoryResponder(const LLSD& post_data, | 65 | LLNewAgentInventoryResponder(const LLSD& post_data, |
64 | const LLUUID& vfile_id, | 66 | const LLUUID& vfile_id, |
65 | LLAssetType::EType asset_type); | 67 | LLAssetType::EType asset_type); |
66 | LLNewAgentInventoryResponder(const LLSD& post_data, const std::string& file_name); | 68 | LLNewAgentInventoryResponder(const LLSD& post_data, const std::string& file_name, |
69 | LLAssetType::EType asset_type); | ||
67 | virtual void uploadComplete(const LLSD& content); | 70 | virtual void uploadComplete(const LLSD& content); |
68 | }; | 71 | }; |
69 | 72 | ||
@@ -74,7 +77,8 @@ public: | |||
74 | const LLUUID& vfile_id, | 77 | const LLUUID& vfile_id, |
75 | LLAssetType::EType asset_type); | 78 | LLAssetType::EType asset_type); |
76 | LLUpdateAgentInventoryResponder(const LLSD& post_data, | 79 | LLUpdateAgentInventoryResponder(const LLSD& post_data, |
77 | const std::string& file_name); | 80 | const std::string& file_name, |
81 | LLAssetType::EType asset_type); | ||
78 | virtual void uploadComplete(const LLSD& content); | 82 | virtual void uploadComplete(const LLSD& content); |
79 | }; | 83 | }; |
80 | 84 | ||
@@ -85,8 +89,17 @@ public: | |||
85 | const LLUUID& vfile_id, | 89 | const LLUUID& vfile_id, |
86 | LLAssetType::EType asset_type); | 90 | LLAssetType::EType asset_type); |
87 | LLUpdateTaskInventoryResponder(const LLSD& post_data, | 91 | LLUpdateTaskInventoryResponder(const LLSD& post_data, |
88 | const std::string& file_name); | 92 | const std::string& file_name, |
93 | LLAssetType::EType asset_type); | ||
94 | LLUpdateTaskInventoryResponder(const LLSD& post_data, | ||
95 | const std::string& file_name, | ||
96 | const LLUUID& queue_id, | ||
97 | LLAssetType::EType asset_type); | ||
98 | |||
89 | virtual void uploadComplete(const LLSD& content); | 99 | virtual void uploadComplete(const LLSD& content); |
100 | |||
101 | private: | ||
102 | LLUUID mQueueId; | ||
90 | }; | 103 | }; |
91 | 104 | ||
92 | #endif // LL_LLASSETUPLOADRESPONDER_H | 105 | #endif // LL_LLASSETUPLOADRESPONDER_H |