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/llfavoritesbar.cpp | |
| 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/llfavoritesbar.cpp')
| -rw-r--r-- | indra/newview/llfavoritesbar.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index f577ef7fd0..4f2fd47488 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -599,7 +599,11 @@ void LLFavoritesBarCtrl::handleNewFavoriteDragAndDrop(LLInventoryItem *item, con if (tool_dad->getSource() == LLToolDragAndDrop::SOURCE_NOTECARD) { viewer_item->setType(LLAssetType::AT_LANDMARK); - copy_inventory_from_notecard(tool_dad->getObjectID(), tool_dad->getSourceID(), viewer_item.get(), gInventoryCallbacks.registerCB(cb)); + copy_inventory_from_notecard(favorites_id, + tool_dad->getObjectID(), + tool_dad->getSourceID(), + viewer_item.get(), + gInventoryCallbacks.registerCB(cb)); } else { |