From e282be5549448bca2bed19e1db4eb7c770e6f6b2 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Fri, 27 Jul 2018 18:20:12 +0300
Subject: MAINT-8924 FIXED Outfit snapshot upload closes inventory

---
 indra/newview/llviewerassetupload.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'indra/newview/llviewerassetupload.h')

diff --git a/indra/newview/llviewerassetupload.h b/indra/newview/llviewerassetupload.h
index 43e23a0d42..ee1806b782 100644
--- a/indra/newview/llviewerassetupload.h
+++ b/indra/newview/llviewerassetupload.h
@@ -53,7 +53,8 @@ public:
         U32 nextOWnerPerms,
         U32 groupPerms,
         U32 everyonePerms,
-        S32 expectedCost);
+        S32 expectedCost,
+        bool showInventory = true);
 
     virtual ~LLResourceUploadInfo()
     { }
@@ -79,7 +80,7 @@ public:
     S32                 getExpectedUploadCost() const { return mExpectedUploadCost; };
 
     virtual bool        showUploadDialog() const { return true; }
-    virtual bool        showInventoryPanel() const { return true; }
+    virtual bool        showInventoryPanel() const { return mShowInventory; }
 
     virtual std::string getDisplayName() const;
 
@@ -97,7 +98,8 @@ protected:
         U32 nextOWnerPerms,
         U32 groupPerms,
         U32 everyonePerms,
-        S32 expectedCost);
+        S32 expectedCost,
+        bool showInventory = true);
 
     LLResourceUploadInfo(
         LLAssetID assetId,
@@ -130,6 +132,7 @@ private:
     LLUUID              mFolderId;
     LLUUID              mItemId;
     LLAssetID           mAssetId;
+    bool                mShowInventory;
 };
 
 //-------------------------------------------------------------------------
@@ -146,7 +149,8 @@ public:
         U32 nextOWnerPerms,
         U32 groupPerms,
         U32 everyonePerms,
-        S32 expectedCost);
+        S32 expectedCost,
+        bool show_inventory = true);
 
     virtual LLSD        prepareUpload();
 
-- 
cgit v1.2.3