diff options
author | Northspring <pantera.polnocy@phoenixviewer.com> | 2014-12-19 23:30:06 +0100 |
---|---|---|
committer | Northspring <pantera.polnocy@phoenixviewer.com> | 2014-12-19 23:30:06 +0100 |
commit | 35a39d5ea1cea63a3356a6cd310a3c3a90644b1c (patch) | |
tree | 9f097a8abfe45fb44c2d8f8746a609bdda8acd7f /indra/newview/llviewerinventory.h | |
parent | 09e94a2b5d0bf6feb8b2a4f8ad86346f0201714d (diff) | |
parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) |
Merge
Diffstat (limited to 'indra/newview/llviewerinventory.h')
-rwxr-xr-x | indra/newview/llviewerinventory.h | 6 |
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, |