diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:09:20 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-12-19 09:09:20 -0500 |
| commit | 1333e9332a074e25178cd28b351bb40998617e10 (patch) | |
| tree | c229dd9782a27e3c72d7d99c4a6e15367fb8dbd9 /indra/newview/llviewerinventory.h | |
| parent | 6a3cb427071641585d9beb44c3e46a148f90a791 (diff) | |
| parent | 4ec9bce3c2a715f53938e4568c95b7a2bdfc9e16 (diff) | |
merge changes for 3.7.23
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, |