diff options
author | Oz Linden <oz@lindenlab.com> | 2012-04-20 06:56:33 -0700 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-04-20 06:56:33 -0700 |
commit | d3ec35fc6c2b8b47336650fe0570995201854a78 (patch) | |
tree | f2113a1fa374fab76509f4462b2253b315584f65 /indra/newview/llinventoryfunctions.h | |
parent | 4c3377a45abe3c8b2a0e376c62045a8f1260da08 (diff) | |
parent | 19e0cc93a8af661dbac47552474a704ade600c74 (diff) |
merge changes for latest viewer-development
Diffstat (limited to 'indra/newview/llinventoryfunctions.h')
-rw-r--r-- | indra/newview/llinventoryfunctions.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h index ce2b89b22e..5cf9c528b0 100644 --- a/indra/newview/llinventoryfunctions.h +++ b/indra/newview/llinventoryfunctions.h @@ -57,20 +57,10 @@ void show_task_item_profile(const LLUUID& item_uuid, const LLUUID& object_id); void show_item_original(const LLUUID& item_uuid); -void change_item_parent(LLInventoryModel* model, - LLViewerInventoryItem* item, - const LLUUID& new_parent_id, - BOOL restamp); - -void change_category_parent(LLInventoryModel* model, - LLViewerInventoryCategory* cat, - const LLUUID& new_parent_id, - BOOL restamp); - -void remove_category(LLInventoryModel* model, const LLUUID& cat_id); - void rename_category(LLInventoryModel* model, const LLUUID& cat_id, const std::string& new_name); +void copy_inventory_category(LLInventoryModel* model, LLViewerInventoryCategory* cat, const LLUUID& parent_id, const LLUUID& root_copy_id = LLUUID::null); + // Generates a string containing the path to the item specified by item_id. void append_path(const LLUUID& id, std::string& path); |