diff options
| author | rider <rider@lindenlab.com> | 2015-10-01 12:36:52 -0700 |
|---|---|---|
| committer | rider <rider@lindenlab.com> | 2015-10-01 12:36:52 -0700 |
| commit | ca81b19e80d0e0301b08bad9bd32ada937dea10d (patch) | |
| tree | 86e33382a19aa9b9f1555b8987a1a6b511b8cbe5 /indra/newview/llinventoryfunctions.h | |
| parent | 17ff449ae6b2759f212daa4fd3de0a7ea2664866 (diff) | |
| parent | 4334fd27e2215c1bfad3aa7ab7130b8c6b289de5 (diff) | |
Merge for Xcode 7
Diffstat (limited to 'indra/newview/llinventoryfunctions.h')
| -rwxr-xr-x | indra/newview/llinventoryfunctions.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h index 6ae8fd0f13..8aa8370f91 100755 --- a/indra/newview/llinventoryfunctions.h +++ b/indra/newview/llinventoryfunctions.h @@ -75,10 +75,6 @@ void copy_inventory_category(LLInventoryModel* model, LLViewerInventoryCategory* // Generates a string containing the path to the item specified by item_id. void append_path(const LLUUID& id, std::string& path); -void copy_item_to_outbox(LLInventoryItem* inv_item, LLUUID dest_folder, const LLUUID& top_level_folder, S32 operation_id); -void move_item_within_outbox(LLInventoryItem* inv_item, LLUUID dest_folder, S32 operation_id); -void copy_folder_to_outbox(LLInventoryCategory* inv_cat, const LLUUID& dest_folder, const LLUUID& top_level_folder, S32 operation_id); - typedef boost::function<void(std::string& validation_message, S32 depth, LLError::ELevel log_level)> validation_callback_t; bool can_move_item_to_marketplace(const LLInventoryCategory* root_folder, LLInventoryCategory* dest_folder, LLInventoryItem* inv_item, std::string& tooltip_msg, S32 bundle_size = 1, bool from_paste = false); |