summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.h
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2013-06-05 17:36:31 -0400
committerprep <prep@lindenlab.com>2013-06-05 17:36:31 -0400
commitd22c315f575bf5b50909f7abab7b343868b4452e (patch)
tree147d36049391bbbd4816fadb429a05ccfd52b432 /indra/newview/llviewerinventory.h
parenta07cee746cfb83c64618600ab288c09cd5297c94 (diff)
parenta5e41af80978babb5e8046d390d6730f57423294 (diff)
merge
Diffstat (limited to 'indra/newview/llviewerinventory.h')
-rwxr-xr-xindra/newview/llviewerinventory.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index c52b0c2d9d..9af71dfc9c 100755
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -407,4 +407,11 @@ void menu_create_inventory_item(LLInventoryPanel* root,
const LLSD& userdata,
const LLUUID& default_parent_uuid = LLUUID::null);
+void slam_inventory_folder(const LLUUID& folder_id,
+ const LLSD& contents,
+ LLPointer<LLInventoryCallback> cb);
+
+void remove_folder_contents(const LLUUID& folder_id, bool keep_outfit_links,
+ LLPointer<LLInventoryCallback> cb);
+
#endif // LL_LLVIEWERINVENTORY_H