diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-11-04 11:26:50 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-11-04 11:26:50 -0700 |
| commit | 94678c2f7fbab0676ebf5c664e2d4cb8643b535f (patch) | |
| tree | 5d832cf28fcb4fb5ee4bb23e6e4845644da8b0c4 /indra/newview/llviewerinventory.h | |
| parent | 5d2d22322527bf303d24c15fde15025c045b7654 (diff) | |
EXP-1541 update -- Route inventory items sent in a Notecard to correct locations rather than auto-sorting by asset type
* New code specifies explicit destination for "copy from notecard" or null, indicating the sim should determine the placement.
Reviewed by Stone.
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); |