summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-10-23 06:20:10 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-10-23 06:20:10 -0400
commitb99d57fbdeda3f012e090bb610f9d3fb44f4248f (patch)
tree52e674e2757374c6e60675b29c878f400714b813 /indra/newview/llviewerinventory.h
parent920b6de4b1b2234b356258dc7ea1fb108d648cea (diff)
MAINT-4196 WIP, including clearer inventory warnings for attachment errors
Diffstat (limited to 'indra/newview/llviewerinventory.h')
-rwxr-xr-xindra/newview/llviewerinventory.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index d345c49cfb..ca92565600 100755
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -394,11 +394,13 @@ void remove_inventory_items(
void remove_inventory_item(
LLPointer<LLInventoryObject> obj,
- LLPointer<LLInventoryCallback> cb);
+ LLPointer<LLInventoryCallback> cb,
+ bool immediate_delete = false);
void remove_inventory_item(
const LLUUID& item_id,
- LLPointer<LLInventoryCallback> cb);
+ LLPointer<LLInventoryCallback> cb,
+ bool immediate_delete = false);
void remove_inventory_category(
const LLUUID& cat_id,