diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-24 22:27:08 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-24 22:27:08 -0500 |
| commit | ed73c8bf6357ca1e1a8009ead6b3b664e25c29c9 (patch) | |
| tree | 36a9cb02c09caed35696d35686948190b697cb7a /indra/newview/llinventorybridge.cpp | |
| parent | 2e7461277801dc0daa1e9ea509e079c980045f42 (diff) | |
| parent | 4c343c4506604b8dd0ac2d99a2b9661a1d382fc7 (diff) | |
pull latest changes from viewer-vs2010
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(), |