diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2011-01-25 21:10:00 +0200 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2011-01-25 21:10:00 +0200 |
| commit | bcb95ed70736e54d30219d0ada41578303c439d3 (patch) | |
| tree | bca3afdc4789d8eaad0490badceaf31462c7809e | |
| parent | eec332cfbe200f585d8fd382867b90d89d1ab5c0 (diff) | |
STORM-397 FIXED Disabled dropping wearables from a notecard to COF and any outfit folder.
Those folders should contain only links to wearable items.
| -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(), |