diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-09-24 16:16:24 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-09-24 16:16:24 -0700 |
| commit | bb8afb10d5f49e565bbd8af7777359553c54919a (patch) | |
| tree | b1092b747600e6acd4e446a2230f7a5f0839849c /indra/newview/lltooldraganddrop.cpp | |
| parent | b9cfd6631fe08de916ee2b43e08117bc8a2416a2 (diff) | |
MAINT-5282: I've removed most of the depricated Merchant Outbox code and the links to it in the menus. Also removed the Outbox Floater and made the folder always hidden if empty in inventory.
(There may still be some outstanding Outbox code that was not obvious that I have missed.)
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rwxr-xr-x | indra/newview/lltooldraganddrop.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 81fbc471b3..8f482c5dca 100755 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -821,21 +821,6 @@ void LLToolDragAndDrop::dragOrDrop( S32 x, S32 y, MASK mask, BOOL drop, if (!handled) { - // *TODO: Suppress the "outbox" case once "marketplace" is used everywhere for everyone - // Disallow drag and drop to 3D from the outbox - const LLUUID outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX, false); - if (outbox_id.notNull()) - { - for (S32 item_index = 0; item_index < (S32)mCargoIDs.size(); item_index++) - { - if (gInventory.isObjectDescendentOf(mCargoIDs[item_index], outbox_id)) - { - *acceptance = ACCEPT_NO; - mToolTipMsg = LLTrans::getString("TooltipOutboxDragToWorld"); - return; - } - } - } // Disallow drag and drop to 3D from the marketplace const LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false); if (marketplacelistings_id.notNull()) |