summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenufile.cpp
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2018-07-27 18:20:12 +0300
committermaxim_productengine <mnikolenko@productengine.com>2018-07-27 18:20:12 +0300
commite282be5549448bca2bed19e1db4eb7c770e6f6b2 (patch)
tree86ac9ba8c9ae4efd43177ee30f22b8db431a442c /indra/newview/llviewermenufile.cpp
parente24d4c9f4d2f37ee80685c6ab276633b94b366b8 (diff)
MAINT-8924 FIXED Outfit snapshot upload closes inventory
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
-rw-r--r--indra/newview/llviewermenufile.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index cf1c442ce9..d2a5578568 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -689,7 +689,8 @@ LLUUID upload_new_resource(
const std::string& display_name,
LLAssetStorage::LLStoreAssetCallback callback,
S32 expected_upload_cost,
- void *userdata)
+ void *userdata,
+ bool show_inventory)
{
LLResourceUploadInfo::ptr_t uploadInfo(new LLNewFileResourceUploadInfo(
@@ -697,7 +698,7 @@ LLUUID upload_new_resource(
name, desc, compression_info,
destination_folder_type, inv_type,
next_owner_perms, group_perms, everyone_perms,
- expected_upload_cost));
+ expected_upload_cost, show_inventory));
upload_new_resource(uploadInfo, callback, userdata);
return LLUUID::null;