diff options
Diffstat (limited to 'indra/newview/llviewermenufile.h')
| -rw-r--r-- | indra/newview/llviewermenufile.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/indra/newview/llviewermenufile.h b/indra/newview/llviewermenufile.h index f43e5bfc92..36dd1d78b7 100644 --- a/indra/newview/llviewermenufile.h +++ b/indra/newview/llviewermenufile.h @@ -40,21 +40,29 @@ class LLTransactionID; void init_menu_file(); -void upload_new_resource(const std::string& src_filename, std::string name, - std::string desc, S32 compression_info, +void upload_new_resource(const std::string& src_filename, + std::string name, + std::string desc, + S32 compression_info, LLAssetType::EType destination_folder_type, LLInventoryType::EType inv_type, - U32 next_owner_perm = 0x0, // PERM_NONE + U32 next_owner_perms = 0x0, // PERM_NONE + U32 group_perms = 0x0, // PERM_NONE + U32 everyone_perms = 0x0, // PERM_NONE const std::string& display_name = LLStringUtil::null, LLAssetStorage::LLStoreAssetCallback callback = NULL, void *userdata = NULL); -void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType type, +void upload_new_resource(const LLTransactionID &tid, + LLAssetType::EType type, std::string name, - std::string desc, S32 compression_info, + std::string desc, + S32 compression_info, LLAssetType::EType destination_folder_type, LLInventoryType::EType inv_type, - U32 next_owner_perm = 0x0, // PERM_NONE + U32 next_owner_perms = 0x0, // PERM_NONE + U32 group_perms = 0x0, // PERM_NONE + U32 everyone_perms = 0x0, // PERM_NONE const std::string& display_name = LLStringUtil::null, LLAssetStorage::LLStoreAssetCallback callback = NULL, void *userdata = NULL); |