1 files changed, 2 insertions, 144 deletions
diff --git a/indra/newview/llviewermenufile.h b/indra/newview/llviewermenufile.h
index 7ee5043777..616eaed373 100755
--- a/indra/newview/llviewermenufile.h
+++ b/indra/newview/llviewermenufile.h
@@ -34,155 +34,13 @@
 #include "llthread.h"
 #include <queue>
 
+#include "llviewerassetupload.h"
+
 class LLTransactionID;
 
 
 void init_menu_file();
 
-class NewResourceUploadInfo
-{
-public:
-    typedef boost::shared_ptr<NewResourceUploadInfo> ptr_t;
-
-    NewResourceUploadInfo(
-            LLTransactionID transactId,
-            LLAssetType::EType assetType,
-            std::string name, 
-            std::string description, 
-            S32 compressionInfo,
-            LLFolderType::EType destinationType,
-            LLInventoryType::EType inventoryType,
-            U32 nextOWnerPerms, 
-            U32 groupPerms, 
-            U32 everyonePerms, 
-            S32 expectedCost) :
-        mTransactionId(transactId),
-        mAssetType(assetType),
-        mName(name),
-        mDescription(description),
-        mCompressionInfo(compressionInfo),
-        mDestinationFolderType(destinationType),
-        mInventoryType(inventoryType),
-        mNextOwnerPerms(nextOWnerPerms),
-        mGroupPerms(groupPerms),
-        mEveryonePerms(everyonePerms),
-        mExpectedUploadCost(expectedCost),
-        mFolderId(LLUUID::null),
-        mItemId(LLUUID::null),
-        mAssetId(LLAssetID::null)
-    { }
-
-    virtual ~NewResourceUploadInfo()
-    { }
-
-    virtual LLSD        prepareUpload();
-    virtual LLSD        generatePostBody();
-    virtual void        logPreparedUpload();
-    virtual LLUUID      finishUpload(LLSD &result);
-
-    //void                setAssetType(LLAssetType::EType assetType) { mAssetType = assetType; }
-    //void                setTransactionId(LLTransactionID transactionId) { mTransactionId = transactionId; }
-
-    LLTransactionID     getTransactionId() const { return mTransactionId; }
-    LLAssetType::EType  getAssetType() const { return mAssetType; }
-    std::string         getAssetTypeString() const;
-    std::string         getName() const { return mName; };
-    std::string         getDescription() const { return mDescription; };
-    S32                 getCompressionInfo() const { return mCompressionInfo; };
-    LLFolderType::EType getDestinationFolderType() const { return mDestinationFolderType; };
-    LLInventoryType::EType  getInventoryType() const { return mInventoryType; };
-    std::string         getInventoryTypeString() const;
-    U32                 getNextOwnerPerms() const { return mNextOwnerPerms; };
-    U32                 getGroupPerms() const { return mGroupPerms; };
-    U32                 getEveryonePerms() const { return mEveryonePerms; };
-    S32                 getExpectedUploadCost() const { return mExpectedUploadCost; };
-
-    virtual std::string getDisplayName() const;
-
-    LLUUID              getFolderId() const { return mFolderId; }
-    LLUUID              getItemId() const { return mItemId; }
-    LLAssetID           getAssetId() const { return mAssetId; }
-
-protected:
-    NewResourceUploadInfo(
-            std::string name,
-            std::string description,
-            S32 compressionInfo,
-            LLFolderType::EType destinationType,
-            LLInventoryType::EType inventoryType,
-            U32 nextOWnerPerms,
-            U32 groupPerms,
-            U32 everyonePerms,
-            S32 expectedCost) :
-        mName(name),
-        mDescription(description),
-        mCompressionInfo(compressionInfo),
-        mDestinationFolderType(destinationType),
-        mInventoryType(inventoryType),
-        mNextOwnerPerms(nextOWnerPerms),
-        mGroupPerms(groupPerms),
-        mEveryonePerms(everyonePerms),
-        mExpectedUploadCost(expectedCost),
-        mTransactionId(),
-        mAssetType(LLAssetType::AT_NONE),
-        mFolderId(LLUUID::null),
-        mItemId(LLUUID::null),
-        mAssetId(LLAssetID::null)
-    { }
-
-    void                setTransactionId(LLTransactionID tid) { mTransactionId = tid; }
-    void                setAssetType(LLAssetType::EType assetType) { mAssetType = assetType; }
-
-    LLAssetID           generateNewAssetId();
-    void                incrementUploadStats() const;
-    virtual void        assignDefaults();
-
-private:
-    LLTransactionID     mTransactionId;
-    LLAssetType::EType  mAssetType;
-    std::string         mName;
-    std::string         mDescription;
-    S32                 mCompressionInfo;
-    LLFolderType::EType mDestinationFolderType;
-    LLInventoryType::EType mInventoryType;
-    U32                 mNextOwnerPerms;
-    U32                 mGroupPerms;
-    U32                 mEveryonePerms;
-    S32                 mExpectedUploadCost;
-
-    LLUUID              mFolderId;
-    LLUUID              mItemId;
-    LLAssetID           mAssetId;
-};
-
-class NewFileResourceUploadInfo : public NewResourceUploadInfo
-{
-public:
-    NewFileResourceUploadInfo(
-        std::string fileName,
-        std::string name,
-        std::string description,
-        S32 compressionInfo,
-        LLFolderType::EType destinationType,
-        LLInventoryType::EType inventoryType,
-        U32 nextOWnerPerms,
-        U32 groupPerms,
-        U32 everyonePerms,
-        S32 expectedCost);
-
-    virtual LLSD        prepareUpload();
-
-    std::string         getFileName() const { return mFileName; };
-
-protected:
-
-    virtual LLSD        exportTempFile();
-
-private:
-    std::string         mFileName;
-
-};
-
 
 LLUUID upload_new_resource(
     const std::string& src_filename,