diff options
author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 15:14:54 -0800 |
---|---|---|
committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 15:14:54 -0800 |
commit | fa3b57bd9f0afcf2d38dae27d4b9765624baf758 (patch) | |
tree | ff083f4e4eec5d6d4e9191f34cae6450e0a318ac /indra/newview/llviewermenufile.h | |
parent | 0e63920569302a4f6afcbc0feb28ff379e4a4bac (diff) | |
parent | b806edf4ac47d18e1a43fb8dbb5fbcad8d13192f (diff) |
Merge the work lost in 49c9461937df back into the tree
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, |