diff options
| author | Tofu Buzzard <no-email> | 2011-02-04 21:11:33 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-04 21:11:33 -0800 |
| commit | 36feb9d5a467453763c1f4b41b1779ea711c410f (patch) | |
| tree | 5f82bb0c0ef1b8acd761ceb83f722f58c4668b20 /indra/newview/llinventorybridge.cpp | |
| parent | 3c8e91c71673e02bc56b0322bb0ea8026a51d332 (diff) | |
| parent | 3f77074f27ed96ee817e00d026145942da9a1ecb (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(), |