livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve fix for hidden empty system folders unhiding when using "Find all links": Save filter settings and restore them when changing (clearing) the search box text

meow-7.2.2
Ansariel 2017-12-09 22:42:44 +01:00
parent 5780758ec9
commit e9ca4489c2
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llinventoryfilter.cpp
View File

@ -864,17 +864,10 @@ void LLInventoryFilter::setFilterSubString(const std::string& string)
// Cancel out UUID once the search string is modified
if (mFilterOps.mFilterTypes == FILTERTYPE_UUID)
{
mFilterOps.mFilterTypes &= ~FILTERTYPE_UUID;
mFilterOps.mFilterUUID = LLUUID::null;
// <FS:Ansariel> Find all links unhiding hidden empty system folders
if (gSavedSettings.getBOOL("DebugHideEmptySystemFolders"))
{
setFilterEmptySystemFolders();
}
else
{
removeFilterEmptySystemFolders();
}
//mFilterOps.mFilterTypes &= ~FILTERTYPE_UUID;
//mFilterOps.mFilterUUID = LLUUID::null;
mFilterOps = mBackupFilterOps;
// </FS:Ansariel>
setModified(FILTER_RESTART);
}
@ -1098,7 +1091,7 @@ void LLInventoryFilter::setFindAllLinksMode(const std::string &search_name, cons
{
// Save a copy of settings so that we will be able to restore it later
// but make sure we are not searching for links already
if(mFilterOps.mFilterLinks != FILTERLINK_ONLY_LINKS)
//if(mFilterOps.mFilterLinks != FILTERLINK_ONLY_LINKS) // <FS:Ansariel> Find all links unhiding hidden empty system folders
{
mBackupFilterOps = mFilterOps;
}