diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-08-23 14:40:51 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-08-23 14:40:51 -0700 |
| commit | a0a4a3de9bbd2740b8160882ed96075c3400e555 (patch) | |
| tree | 63d0bffe1143691072a1ed751afbc85d0506b219 /indra/newview/lltooldraganddrop.cpp | |
| parent | 4b2ba7236f4af762faec138d920e90f12d332b06 (diff) | |
EXP-1068 Disallow marketplace listing of items that are currently being worn
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index a06cb838cf..d5a99cefb2 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -2062,6 +2062,12 @@ EAcceptance LLToolDragAndDrop::dad3dWearCategory( return ACCEPT_NO; } + const LLUUID &outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX, false);
+ if(gInventory.isObjectDescendentOf(category->getUUID(), outbox_id))
+ {
+ return ACCEPT_NO;
+ } + if(drop) { BOOL append = ( (mask & MASK_SHIFT) ? TRUE : FALSE ); |