diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 14:48:31 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 14:48:31 +0100 |
| commit | f8c91bad6bb86d9c4a288e8796302a232e18be78 (patch) | |
| tree | f1ff8bd437c390b56c4876a1538111481fed72b5 /indra/newview/llassetuploadresponders.h | |
| parent | 472b7a94c006b81b291ebc0575d563d1fad18bbf (diff) | |
| parent | f4b7164752ad8a2ec99b7e30b88661520b74569d (diff) | |
merge backout.
Diffstat (limited to 'indra/newview/llassetuploadresponders.h')
| -rw-r--r-- | indra/newview/llassetuploadresponders.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/indra/newview/llassetuploadresponders.h b/indra/newview/llassetuploadresponders.h index 2358aeb39d..91fb39916d 100644 --- a/indra/newview/llassetuploadresponders.h +++ b/indra/newview/llassetuploadresponders.h @@ -33,7 +33,6 @@ #ifndef LL_LLASSETUPLOADRESPONDER_H #define LL_LLASSETUPLOADRESPONDER_H -#include "llassetstorage.h" #include "llhttpclient.h" // Abstract class for supporting asset upload @@ -67,15 +66,10 @@ class LLNewAgentInventoryResponder : public LLAssetUploadResponder public: LLNewAgentInventoryResponder(const LLSD& post_data, const LLUUID& vfile_id, - LLAssetType::EType asset_type, - boost::function<void(const LLUUID& uuid)> callback = NULL); - LLNewAgentInventoryResponder(const LLSD& post_data, - const std::string& file_name, - LLAssetType::EType asset_type, - boost::function<void(const LLUUID& uuid)> callback = NULL); + LLAssetType::EType asset_type); + LLNewAgentInventoryResponder(const LLSD& post_data, const std::string& file_name, + LLAssetType::EType asset_type); virtual void uploadComplete(const LLSD& content); - - boost::function<void(const LLUUID& uuid)> mCallback; }; struct LLBakedUploadData; |