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/llinventorybridge.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/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 0e27bd81be..9188603b7a 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3544,10 +3544,12 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, // because they must contain only links to wearable items. accept = !(move_is_into_current_outfit || move_is_into_outfit); - if(drop) + if(accept && drop) { - copy_inventory_from_notecard(LLToolDragAndDrop::getInstance()->getObjectID(), - LLToolDragAndDrop::getInstance()->getSourceID(), inv_item); + copy_inventory_from_notecard(mUUID, // Drop to the chosen destination folder + LLToolDragAndDrop::getInstance()->getObjectID(), + LLToolDragAndDrop::getInstance()->getSourceID(), + inv_item); } } else if(LLToolDragAndDrop::SOURCE_LIBRARY == source) |