diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-11-08 19:45:54 -0500 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-11-08 19:45:54 -0500 |
commit | 6bce3d1b9d05dce77db50f3d2c92a70ad6ac8166 (patch) | |
tree | 4e46356e118106d0a7097affb40f954feedd578b /indra/newview/llviewerinventory.h | |
parent | 860777473acef16dcff16cd5587038409967e44c (diff) | |
parent | 5fa125ea0b733b3729208d90777d260db5e331e8 (diff) |
reconciled .hgtags
Diffstat (limited to 'indra/newview/llviewerinventory.h')
-rw-r--r-- | indra/newview/llviewerinventory.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index 41542a4e0f..7822ef4da6 100644 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -363,7 +363,10 @@ void move_inventory_item( const std::string& new_name, LLPointer<LLInventoryCallback> cb); -void copy_inventory_from_notecard(const LLUUID& object_id, +const LLUUID get_folder_by_itemtype(const LLInventoryItem *src); + +void copy_inventory_from_notecard(const LLUUID& destination_id, + const LLUUID& object_id, const LLUUID& notecard_inv_id, const LLInventoryItem *src, U32 callback_id = 0); |