summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryfunctions.h
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-02-16 14:57:30 -0800
committerMerov Linden <merov@lindenlab.com>2012-02-16 14:57:30 -0800
commit155a171180be2df4500e7c6d03df3f99bf4231e7 (patch)
treebc57e35ad1dc2d4a31cc77ac02cb10a23a165756 /indra/newview/llinventoryfunctions.h
parent632c8c138c94fae24729ef75ac29967cd4758eb3 (diff)
EXP-1896 : Prevent recursively copying of folders onto themselves
Diffstat (limited to 'indra/newview/llinventoryfunctions.h')
-rw-r--r--indra/newview/llinventoryfunctions.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 72c48c64f2..b3d9f4b966 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -73,7 +73,7 @@ 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);
+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);