diff options
Diffstat (limited to 'linden/indra/newview/llviewermenufile.h')
| -rw-r--r-- | linden/indra/newview/llviewermenufile.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewermenufile.h b/linden/indra/newview/llviewermenufile.h index 94c18c4..3ac6202 100644 --- a/linden/indra/newview/llviewermenufile.h +++ b/linden/indra/newview/llviewermenufile.h | |||
| @@ -40,12 +40,12 @@ class LLTransactionID; | |||
| 40 | 40 | ||
| 41 | void init_menu_file(); | 41 | void init_menu_file(); |
| 42 | 42 | ||
| 43 | void upload_new_resource(const LLString& src_filename, std::string name, | 43 | void upload_new_resource(const std::string& src_filename, std::string name, |
| 44 | std::string desc, S32 compression_info, | 44 | std::string desc, S32 compression_info, |
| 45 | LLAssetType::EType destination_folder_type, | 45 | LLAssetType::EType destination_folder_type, |
| 46 | LLInventoryType::EType inv_type, | 46 | LLInventoryType::EType inv_type, |
| 47 | U32 next_owner_perm = 0x0, // PERM_NONE | 47 | U32 next_owner_perm = 0x0, // PERM_NONE |
| 48 | const LLString& display_name = LLString::null, | 48 | const std::string& display_name = LLStringUtil::null, |
| 49 | LLAssetStorage::LLStoreAssetCallback callback = NULL, | 49 | LLAssetStorage::LLStoreAssetCallback callback = NULL, |
| 50 | void *userdata = NULL); | 50 | void *userdata = NULL); |
| 51 | 51 | ||
| @@ -55,7 +55,7 @@ void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType type, | |||
| 55 | LLAssetType::EType destination_folder_type, | 55 | LLAssetType::EType destination_folder_type, |
| 56 | LLInventoryType::EType inv_type, | 56 | LLInventoryType::EType inv_type, |
| 57 | U32 next_owner_perm = 0x0, // PERM_NONE | 57 | U32 next_owner_perm = 0x0, // PERM_NONE |
| 58 | const LLString& display_name = LLString::null, | 58 | const std::string& display_name = LLStringUtil::null, |
| 59 | LLAssetStorage::LLStoreAssetCallback callback = NULL, | 59 | LLAssetStorage::LLStoreAssetCallback callback = NULL, |
| 60 | void *userdata = NULL); | 60 | void *userdata = NULL); |
| 61 | 61 | ||