Merge

1 files changed, 83 insertions, 26 deletions

diff --git a/indra/newview/llviewermenufile.h b/indra/newview/llviewermenufile.h
index 9bc4d5b041..7ee5043777 100755
--- a/indra/newview/llviewermenufile.h
+++ b/indra/newview/llviewermenufile.h
@@ -45,31 +45,31 @@ 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)
+            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()
@@ -97,13 +97,42 @@ public:
     U32                 getEveryonePerms() const { return mEveryonePerms; };
     S32                 getExpectedUploadCost() const { return mExpectedUploadCost; };
 
-    std::string         getDisplayName() const;
+    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();
@@ -126,6 +155,34 @@ private:
     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,