diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-09-27 13:04:12 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-09-27 13:04:12 +0300 |
| commit | 892d3a9bf870bd4af802a8cd742130649c627cf2 (patch) | |
| tree | cf13c94a613e0c567fbe0ed7ad0e075b4c3877bd /indra/newview/llviewermenufile.cpp | |
| parent | 3f970601339fa34937454fd83820ffb1c7d6b295 (diff) | |
| parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 5 |
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; |