diff options
author | Tofu Buzzard <no-email> | 2011-02-04 21:12:25 -0800 |
---|---|---|
committer | Tofu Buzzard <no-email> | 2011-02-04 21:12:25 -0800 |
commit | 3803d78c51a35a868b23d159710c53f2e8ea1dc3 (patch) | |
tree | 31508cb85ce2a067dfef4fca7648702bb54afe42 /indra/newview/llinventorybridge.cpp | |
parent | 84645f5b5959f231680faf0b4c3672b1f74f8643 (diff) | |
parent | 36feb9d5a467453763c1f4b41b1779ea711c410f (diff) |
merge
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r-- | indra/newview/llinventorybridge.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index c50afb0e9d..21b1cc77ad 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3246,7 +3246,10 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, } else if(LLToolDragAndDrop::SOURCE_NOTECARD == source) { - accept = TRUE; + // Don't allow placing an original item from a notecard to Current Outfit or an outfit folder + // because they must contain only links to wearable items. + accept = !(move_is_into_current_outfit || move_is_into_outfit); + if(drop) { copy_inventory_from_notecard(LLToolDragAndDrop::getInstance()->getObjectID(), |