1 files changed, 0 insertions, 29 deletions

diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h
index ac2a57a..c223a3a 100644
--- a/linden/indra/newview/llviewermenu.h
+++ b/linden/indra/newview/llviewermenu.h
@@ -29,8 +29,6 @@
 #ifndef LL_LLVIEWERMENU_H
 #define LL_LLVIEWERMENU_H
 
-#include "llassetstorage.h"
-#include "llinventory.h"
 #include "llmenugl.h"
 
 //newview includes
@@ -41,14 +39,6 @@ class LLView;
 class LLParcelSelection;
 class LLObjectSelection;
 
-struct LLResourceData
-{
-        LLAssetInfo mAssetInfo;
-        LLAssetType::EType mPreferredLocation;
-        LLInventoryType::EType mInventoryType;
-        U32 mNextOwnerPerm;
-        void *mUserData;
-};
 
 void pre_init_menus();
 void init_menus();
@@ -114,25 +104,6 @@ bool handle_give_money_dialog();
 bool handle_object_open();
 bool handle_go_to();
 
-void upload_new_resource(const LLString& src_filename, std::string name,
-                                                 std::string desc, S32 compression_info,
-                                                 LLAssetType::EType destination_folder_type,
-                                                 LLInventoryType::EType inv_type,
-                                                 U32 next_owner_perm = PERM_NONE,
-                                                 const LLString& display_name = LLString::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 = PERM_NONE,
-                                                 const LLString& display_name = LLString::null,
-                                                 LLAssetStorage::LLStoreAssetCallback callback = NULL,
-                                                 void *userdata = NULL);
-
 // Export to XML or Collada
 void handle_export_selected( void * );