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

LLInventoryFilterParams and other stuff to merge.

Browse Source
This commit is contained in:
Inusaito Sayori
2015-08-02 12:59:40 -04:00
committed by Lirusaito
parent 50d21405cf
commit 758d45af68
12 changed files with 287 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/lltexturectrl.cpp
View File

@@ -695,11 +695,10 @@ void LLFloaterTexturePicker::draw()
LLFolderView* folder_view = mInventoryPanel->getRootFolder();
if (!folder_view) return;
LLInventoryFilter* filter = folder_view->getFilter();
if (!filter) return;
LLInventoryFilter& filter = folder_view->getFilter();
bool is_filter_active = folder_view->getCompletedFilterGeneration() < filter->getCurrentGeneration() &&
filter->isNotDefault();
bool is_filter_active = folder_view->getCompletedFilterGeneration() < filter.getCurrentGeneration() &&
filter.isNotDefault();
// After inventory panel filter is applied we have to update
// constraint rect for the selected item because of folder view