diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-04-25 14:10:08 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-04-25 14:10:08 -0400 |
| commit | 4df3e38e294e4ba506fdc2a3920361c1f832f9fb (patch) | |
| tree | 1eba000c0247cc5bb4a698186e1d645b68317c8d /indra/newview/llviewerinventory.h | |
| parent | d58b9ee54e84b709e063cdbbc349de25feafa59b (diff) | |
| parent | e60cb90b632d175690f48b783ece272deff524cd (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerinventory.h')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llviewerinventory.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index 61b1b8d846..6b0e8ed4ef 100644..100755 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -274,7 +274,7 @@ class LLBoostFuncInventoryCallback: public LLInventoryCallback { public: - LLBoostFuncInventoryCallback(inventory_func_type fire_func, + LLBoostFuncInventoryCallback(inventory_func_type fire_func = no_op_inventory_func, nullary_func_type destroy_func = no_op): mFireFunc(fire_func), mDestroyFunc(destroy_func) @@ -365,6 +365,10 @@ void move_inventory_item( const std::string& new_name, LLPointer<LLInventoryCallback> cb); +void remove_inventory_item( + const LLUUID& item_id, + LLPointer<LLInventoryCallback> cb); + const LLUUID get_folder_by_itemtype(const LLInventoryItem *src); void copy_inventory_from_notecard(const LLUUID& destination_id, |