diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-30 15:54:39 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-30 15:54:39 -0800 |
| commit | fd56967dea7e4c53080a1ef89cc550492baf3fc8 (patch) | |
| tree | 2a7a7993a550afbd7e92975cc53d633e41404583 /indra/newview/llinventoryfunctions.h | |
| parent | c4084c71386e34f6c28d4c10199eaf1155a2855b (diff) | |
| parent | 56973912198ba3410d1ab32d1a8a63a1c8c3348e (diff) | |
Merge with latest
Diffstat (limited to 'indra/newview/llinventoryfunctions.h')
| -rw-r--r-- | indra/newview/llinventoryfunctions.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h index 7b452537f8..ce2b89b22e 100644 --- a/indra/newview/llinventoryfunctions.h +++ b/indra/newview/llinventoryfunctions.h @@ -74,9 +74,10 @@ void rename_category(LLInventoryModel* model, const LLUUID& cat_id, const std::s // 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); +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); +void copy_folder_to_outbox(LLInventoryCategory* inv_cat, const LLUUID& dest_folder, const LLUUID& top_level_folder, S32 operation_id); /** Miscellaneous global functions ** ** |