diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-03 16:11:00 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-03 16:11:00 -0800 |
| commit | 051190a95530a04ce539c328d6e49a3f47e1613a (patch) | |
| tree | a642ec073d4cd11d3b133a5affec10e71734cfdc /indra/newview/llviewermenufile.h | |
| parent | 81e719387983990fe0a2a197a6e09059219c119a (diff) | |
| parent | 16202f5e00c6e95f6df56ed8924c2fcb13b4ef17 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermenufile.h')
| -rw-r--r-- | indra/newview/llviewermenufile.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewermenufile.h b/indra/newview/llviewermenufile.h index bf21292082..da78537a29 100644 --- a/indra/newview/llviewermenufile.h +++ b/indra/newview/llviewermenufile.h @@ -33,7 +33,7 @@ #ifndef LLVIEWERMENUFILE_H #define LLVIEWERMENUFILE_H -#include "llassettype.h" +#include "llfoldertype.h" #include "llinventorytype.h" class LLTransactionID; @@ -45,7 +45,7 @@ void upload_new_resource(const std::string& src_filename, std::string name, std::string desc, S32 compression_info, - LLAssetType::EType destination_folder_type, + LLFolderType::EType destination_folder_type, LLInventoryType::EType inv_type, U32 next_owner_perms, U32 group_perms, @@ -60,7 +60,7 @@ void upload_new_resource(const LLTransactionID &tid, std::string name, std::string desc, S32 compression_info, - LLAssetType::EType destination_folder_type, + LLFolderType::EType destination_folder_type, LLInventoryType::EType inv_type, U32 next_owner_perms, U32 group_perms, |