diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-22 15:02:25 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-12-22 15:02:25 -0500 |
| commit | 655c2bd33757ce7ad5da2772f2cae8785898cbdb (patch) | |
| tree | 319ef56eab5b71af7ce5e94ab6f16b739d83edb8 /indra/newview/llviewerinventory.h | |
| parent | 87a033d3bf1af2b3cba1047b720e7d93f535dc46 (diff) | |
| parent | 79a89f5d921f99ba7a990a1dbf7428d1d3758bc6 (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, |