Second Life viewer sources 1.23.0-RC

1 files changed, 30 insertions, 19 deletions

diff --git a/linden/indra/newview/llviewermenufile.h b/linden/indra/newview/llviewermenufile.h
index 1f1d5a1..bf21292 100644
--- a/linden/indra/newview/llviewermenufile.h
+++ b/linden/indra/newview/llviewermenufile.h
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -40,23 +41,33 @@ class LLTransactionID;
 
 void init_menu_file();
 
-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
-                                                 const std::string& display_name = LLStringUtil::null,
-                                                 LLAssetStorage::LLStoreAssetCallback callback = NULL,
-                                                 void *userdata = NULL);
-
-void upload_new_resource(const LLTransactionID &tid, LLAssetType::EType type,
-                                                 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
-                                                 const std::string& display_name = LLStringUtil::null,
-                                                 LLAssetStorage::LLStoreAssetCallback callback = NULL,
-                                                 void *userdata = NULL);
+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_perms,
+                         U32 group_perms,
+                         U32 everyone_perms,
+                         const std::string& display_name,
+                         LLAssetStorage::LLStoreAssetCallback callback,
+                         S32 expected_upload_cost,
+                         void *userdata);
+
+void upload_new_resource(const LLTransactionID &tid, 
+                         LLAssetType::EType type,
+                         std::string name,
+                         std::string desc, 
+                         S32 compression_info,
+                         LLAssetType::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);
 
 #endif