diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-26 13:46:45 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-26 13:46:45 -0700 |
| commit | 78866b33a9f3a44db11a18245e8a37c834297a46 (patch) | |
| tree | fd5c39a17334de8602ee2f20df020eaaa6e01e55 /indra/newview/llviewermenufile.h | |
| parent | 2d5fa7a732661f97b028ddcbabdd4fb3ba825a52 (diff) | |
| parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewermenufile.h')
| -rw-r--r-- | indra/newview/llviewermenufile.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermenufile.h b/indra/newview/llviewermenufile.h index 2647b367a0..4e6250d9b4 100644 --- a/indra/newview/llviewermenufile.h +++ b/indra/newview/llviewermenufile.h @@ -55,7 +55,8 @@ LLUUID upload_new_resource( const std::string& display_name, LLAssetStorage::LLStoreAssetCallback callback, S32 expected_upload_cost, - void *userdata); + void *userdata, + bool show_inventory = true); void upload_new_resource( LLResourceUploadInfo::ptr_t &uploadInfo, |