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

Silly git, that's not how merges work!

Browse Source 
Fix automatic merge errors
Also fix some other compile errors
This commit is contained in:
Lirusaito
2019-01-21 04:55:27 -05:00
parent fcf4cf88ea
commit d340b74bb9
9 changed files with 115 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llpanelmaininventory.cpp
View File

@@ -1094,7 +1094,7 @@ void LLFloaterInventoryFinder::draw()
filtered_by_all_types = FALSE;
}
if (!filtered_by_all_types || (mInventoryView->getPanel()->getFilter().getFilterTypes() & LLInventoryFilter::FILTERTYPE_DATE))
if (!filtered_by_all_types || (mPanelMainInventory->getPanel()->getFilter().getFilterTypes() & LLInventoryFilter::FILTERTYPE_DATE))
{
// don't include folders in filter, unless I've selected everything or filtering by date
filter &= ~(0x1 << LLInventoryType::IT_CATEGORY);