1 files changed, 55 insertions, 35 deletions

diff --git a/linden/indra/newview/llassetuploadresponders.h b/linden/indra/newview/llassetuploadresponders.h
index 13d535e..ef8cd38 100644
--- a/linden/indra/newview/llassetuploadresponders.h
+++ b/linden/indra/newview/llassetuploadresponders.h
@@ -1,45 +1,65 @@
-/** 
- * @file llmapresponders.h
- * @brief Processes responses received for asset upload requests.
- *
- * Copyright (c) 2006-2007, Linden Research, Inc.
- * 
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- */
-
-#ifndef LL_LLNEWAGENTINVENTORYRESPONDER_H
-#define LL_LLNEWAGENTINVENTORYRESPONDER_H
+// llassetuploadresponders.h
+// Copyright 2006, Linden Research, Inc.
+// Processes responses received for asset upload requests.
+
+#ifndef LL_LLASSETUPLOADRESPONDER_H
+#define LL_LLASSETUPLOADRESPONDER_H
 
 #include "llhttpclient.h"
 
-class LLNewAgentInventoryResponder : public LLHTTPClient::Responder
+// Abstract class for supporting asset upload
+// via capabilities
+class LLAssetUploadResponder : public LLHTTPClient::Responder
 {
 public:
-        LLNewAgentInventoryResponder(const LLUUID& uuid, const LLSD& post_data);
-    void error(U32 statusNum, const std::string& reason);
+        LLAssetUploadResponder(const LLSD& post_data,
+                                                        const LLUUID& vfile_id,
+                                                        LLAssetType::EType asset_type);
+        LLAssetUploadResponder(const LLSD& post_data, const std::string& file_name);
+        ~LLAssetUploadResponder();
+    virtual void error(U32 statusNum, const std::string& reason);
         virtual void result(const LLSD& content);
+        virtual void uploadUpload(const LLSD& content);
+        virtual void uploadComplete(const LLSD& content);
+        virtual void uploadFailure(const LLSD& content);
 
-private:
-        LLUUID mUUID;
+protected:
         LLSD mPostData;
+        LLUUID mVFileID;
+        LLAssetType::EType mAssetType;
+        std::string mFileName;
+};
+
+class LLNewAgentInventoryResponder : public LLAssetUploadResponder
+{
+public:
+        LLNewAgentInventoryResponder(const LLSD& post_data,
+                                                                const LLUUID& vfile_id,
+                                                                LLAssetType::EType asset_type);
+        LLNewAgentInventoryResponder(const LLSD& post_data, const std::string& file_name);
+        virtual void uploadComplete(const LLSD& content);
+};
+
+class LLUpdateAgentInventoryResponder : public LLAssetUploadResponder
+{
+public:
+        LLUpdateAgentInventoryResponder(const LLSD& post_data,
+                                                                const LLUUID& vfile_id,
+                                                                LLAssetType::EType asset_type);
+        LLUpdateAgentInventoryResponder(const LLSD& post_data,
+                                                                const std::string& file_name);
+        virtual void uploadComplete(const LLSD& content);
+};
+
+class LLUpdateTaskInventoryResponder : public LLAssetUploadResponder
+{
+public:
+        LLUpdateTaskInventoryResponder(const LLSD& post_data,
+                                                                const LLUUID& vfile_id,
+                                                                LLAssetType::EType asset_type);
+        LLUpdateTaskInventoryResponder(const LLSD& post_data,
+                                                                const std::string& file_name);
+        virtual void uploadComplete(const LLSD& content);
 };
 
-#endif // LL_LLNEWAGENTINVENTORYRESPONDER_H
+#endif // LL_LLASSETUPLOADRESPONDER_H