diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-02-03 14:06:51 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-02-03 14:06:51 -0800 |
| commit | 3feb97487a6330080f6278f01e5d26dad0196d77 (patch) | |
| tree | 0b0738e1976c481c89f0dc3d6abffe7058d14ee6 /indra/newview | |
| parent | e9630662f4882107bc56c3d13de2963054bb0366 (diff) | |
| parent | bcb95ed70736e54d30219d0ada41578303c439d3 (diff) | |
STORM-397 : pull into viewer-development
Diffstat (limited to 'indra/newview')
| -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(), |