Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Giant VMM merge, still need to compile it and fix llfloatermarketplacelistings

Browse Source 
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
This commit is contained in:
Inusaito Sayori
2015-07-30 11:45:19 -04:00
committed by Lirusaito
parent 167d336274
commit f140b4f35c
46 changed files with 3480 additions and 1408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloateroutbox.cpp
View File

@@ -293,7 +293,7 @@ void LLFloaterOutbox::setupOutbox()
// Set the sort order newest to oldest
inventory_panel->setSortOrder(LLInventoryFilter::SO_FOLDERS_BY_NAME);
inventory_panel->getFilter()->markDefault();
inventory_panel->getFilter().markDefault();
// Get the content of the outbox
fetchOutboxContents();