Commit Graph

24 Commits

Author SHA1 Message Date
Lirusaito
90e9bce8de Boost::unordered is better than std::unordered, apparently 2019-03-27 22:28:29 -04:00
Lirusaito
8d1c345580 [InvOpts] Inventory Panel unordered opt pass 2019-03-22 02:08:12 -04:00
Lirusaito
7c3ba8bd9a Sync? I dunno, not important. 2019-03-07 13:37:39 -05:00
Lirusaito
4008cf519c Redo start_folder to be like upstream has it now
start_folder in xmls must now be start_folder.name

This reverts commit 1405a7c103.
2019-03-04 14:57:24 -05:00
Inusaito Sayori
758d45af68 LLInventoryFilterParams and other stuff to merge. 2019-01-25 19:33:19 -05:00
Inusaito Sayori
7c1af50bda Double check vmm merge against alchemy. (sync) 2019-01-25 19:33:18 -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
Inusaito Sayori
167d336274 Up to compile phase
at 20fd3e98b4
2019-01-25 19:32:15 -05:00
Shyotl
1230748ef5 Alchemy llcharacter and llcommon merge pass. 2017-03-31 02:08:03 -05:00
Shyotl
899ba7fded Fixed folder collapse state not being properly restored after clearing search string.
Updated inventory filter classes.
LLInventoryView renamed to LLPanelMainInventory for easier diffing.
2016-05-26 02:22:19 -05:00
Shyotl
9f10d9510d Initial AISv3 merge. New HTTP messages not plugged in yet. 2015-06-25 20:16:30 -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
Inusaito Sayori
b6225d1d9a [MAINT-2287] Handle refactor 2014-02-06 14:51:36 -05:00
Inusaito Sayori
c9482ecac5 Feature request: Add an option to open inventory folders in a new separate window 2013-08-24 21:52:53 -04:00
Shyotl
df404c42d0 Migrated baser LLStat* classes and their LLContainerView dependency to llui library and renamed LLScrollableContainerView to LLScrollContainer 2013-05-17 16:46:40 -05:00
Shyotl
a5dad6be5c UI cleanup.
-Added ui-local transformation matrix.
-Gutted legacy commitcallbacks throughout ui widget ctors.
-Created filter_editor ui widget which issues commit on keypress
   -search_editor commits on focus loss/enter press
   -search_editor and filter_editor now have a built in 'x' button to clear text.
-LLComboBox::setPrearrangeCallback now uses boost::function
-LLComboBox::setTextEntryCallback now uses boost::function
-LLLineEditor::setKeystrokeCallback now uses boost::function
-LLLineEditor::setPrevalidate now uses boost::function
-LLPanel::childSetKeystrokeCallback removed
-LLPanel::childSetPrevalidate removed
-LLPanel::childSetActionTextbox now uses boost::function
-LLTextBox::setClickedCallback now uses boost::function
-LLTextEditor::setKeystrokeCallback added.
-Cleaned up JCFloaterAreaSearch
2013-04-16 00:25:59 -05:00
Shyotl
794dbacea3 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit
Conflicts:
	indra/newview/lldrawpoolavatar.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworldmap.cpp
	indra/newview/pipeline.cpp
2012-11-29 11:54:41 -06:00
Shyotl
fe15371047 Update to LLTombstone/LLHandle/LLRootHandle/LLHandleProvider. 2012-11-13 17:55:52 -06:00
Lirusaito
7a35a43bd4 Merchant Outbox!
Enter: LLFloaterOutbox, floater_merchant_outbox, LLMarketplaceFunctions, LLPanelMarketplaceOutboxInventory, and panel_outbox_inventory

LLView now has childFromPoint() from v-d.
LLInventoryBridge{
Sync includes with v-d.
Let's ENABLE_MERCHANT_SEND_TO_MARKETPLACE_CONTEXT_MENU for ease of access and tweak it to work.
Uncomment related code.
Catch if we're moving objects into the outbox during pasteFromClipboard()
}
LLInventoryPanel: start_folder attribute for inventory_panels, this could be quite useful in the future
Sync LLToolDragAndDrop with Catznip/v-d
Add the outbox to the World menu, since that seems to involve most commerce. Perhaps we should add a menu entry to the outbox itself to open its floater?
Fix the inventory merchant menu entries, thanks Shyotl..
Merchant Outbox Strings!
2012-11-06 20:23:36 -05:00
Shyotl
2bf940e15d Fixed up inventory filter. Basic folders now have an 'open' icon. Tweaked the indent size for inventory (looks a little nicer imo) 2012-02-27 02:53:12 -06:00
Shyotl
b0240320ee Inv menus appear now. Still need to update llmenugl and its variants, since our current version is buggy. Also need to look into why inventory postfixes aren't appearing. 2012-02-18 01:59:02 -06:00
Shyotl
ae7b12f230 Interim commit before diving into reworking the inventory panel. 2012-02-16 19:25:59 -06:00
Shyotl
a90d7bbb46 Innitial commit. Pulled minor changes out of bulk of changes comming for multi-wearables. 2012-02-16 12:00:38 -06:00
Shyotl
a0c549534f Pulled apart LLInventoryPanel and LLInventoryView. TODO: LLInventoryView needs to be chopped apart into a floater (LLFloaterInventory) and a panel (LLPanelMainInventory). 2012-01-29 17:10:04 -06:00