Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix

1 files changed, 4 insertions, 10 deletions

diff --git a/indra/newview/llviewermenufile.h b/indra/newview/llviewermenufile.h
index 1e6d13f1c6..33f8243ac0 100644
--- a/indra/newview/llviewermenufile.h
+++ b/indra/newview/llviewermenufile.h
@@ -34,41 +34,35 @@
 #define LLVIEWERMENUFILE_H
 
 #include "llfoldertype.h"
-#include "llassetstorage.h"
 #include "llinventorytype.h"
 
 class LLTransactionID;
 
-
 void init_menu_file();
 
 void upload_new_resource(const std::string& src_filename, 
 			 std::string name,
 			 std::string desc, 
-			 S32 compression_info,
 			 LLFolderType::EType destination_folder_type,
 			 LLInventoryType::EType inv_type,
 			 U32 next_owner_perms,
 			 U32 group_perms,
 			 U32 everyone_perms,
 			 const std::string& display_name,
-			 LLAssetStorage::LLStoreAssetCallback callback,
-			 S32 expected_upload_cost,
-			 void *userdata);
+			 boost::function<void(const LLUUID& uuid)> callback,
+			 S32 expected_upload_cost);
 
 void upload_new_resource(const LLTransactionID &tid, 
 			 LLAssetType::EType type,
 			 std::string name,
 			 std::string desc, 
-			 S32 compression_info,
 			 LLFolderType::EType destination_folder_type,
 			 LLInventoryType::EType inv_type,
 			 U32 next_owner_perms,
 			 U32 group_perms,
 			 U32 everyone_perms,
 			 const std::string& display_name,
-			 LLAssetStorage::LLStoreAssetCallback callback,
-			 S32 expected_upload_cost,
-			 void *userdata);
+			 boost::function<void(const LLUUID& uuid)> callback,
+			 S32 expected_upload_cost);
 
 #endif