diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-02-04 11:23:56 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-02-04 11:23:56 -0500 |
| commit | 3f77074f27ed96ee817e00d026145942da9a1ecb (patch) | |
| tree | 3a3d95d21ae523d3d07fefe0cb52382a9a990881 /indra/newview/llinventorybridge.cpp | |
| parent | aa9d9901e843135632b67af6b5641ab019a84d09 (diff) | |
| parent | e82fb8c7b90c0f5038c38a1aaf4882718433bfd6 (diff) | |
Automated merge up from viewer-development into mesh-development
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(), |