7 Commits

Author	SHA1	Message	Date
Lirusaito	fb39f2d511	Merge branch 'master' into ManagedMarketplace ... # Conflicts: # indra/newview/llinventorybridge.cpp # indra/newview/lltooldraganddrop.h	2019-02-28 23:58:08 -05:00
Lirusaito	136cffbab9	What a drag	2019-02-09 16:51:53 -05:00
Inusaito Sayori	f140b4f35c	Giant VMM merge, still need to compile it and fix llfloatermarketplacelistings ... Merge VMM up to change 187902d9c4afd2990acddeb964c928179a52d189 mAllowWear=>mAllowOpen (should probably just remove this altogether though inventory_panels now accept the "show_root_folder", "allow_drop_on_root", "allow_open", and "use_marketplace_folders" attributes. Other stuff in this commit: LLPanelInjector~ Sync lltooldraganddrop to alchemy Sync notifications up with alchemy Reorganize notifications some, to better merge with upstream Remove duplicate InventorySortOrder in settings map There's a bit of a weird folderview merge mixed into here, I wouldn't trust it, but this thing is so god damn tangled I can't go back now~ Wouldn't have been possible without help from Shyotl and music by Amanda Palmer	2019-01-25 19:33:15 -05:00
Shyotl	09f4528bfb	Removed LLDynamicArray, LLDynamicArrayIndexed, LLDynamicArrayPtr, LLDLinked, LLDynamicQueuePtr, LLEnum, and LLIndexedQueue. Added new LLPointer variants.	2015-06-19 18:27:21 -05:00
Shyotl	f584cb3b3b	Updated drag and drop impl. Uses LLDictionary, and also IDs DnD operations.	2012-04-16 23:20:27 -05:00
Shyotl	670b85a86f	Migrated code out of drag and drop, and into LLGiveInventory.	2012-01-13 22:41:15 -06:00
Hazim Gazov	7a86d01598	Imported existing code	2010-04-02 02:48:44 -03:00