diff options
| author | Don Kjer <don@lindenlab.com> | 2011-02-19 00:17:12 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-02-19 00:17:12 +0000 |
| commit | 8330a4d0fd046834a27a988102b439a6ec1f0aa2 (patch) | |
| tree | 7fd2227522bf5c2377a45124cb50aad0afb90597 /indra/newview/llinventorybridge.cpp | |
| parent | 3f5760b5ee4e422e11f3416133b7a4c3a73b1d8c (diff) | |
| parent | 18bf5f09b22a2c36ccf543104b1115a7b0b9db71 (diff) | |
Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/
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 5108f68592..4c2e0fa709 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3230,7 +3230,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(), |