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

Sat, 09 Dec 2017 22:42:44 +0100

author
Ansariel
date
Sat, 09 Dec 2017 22:42:44 +0100
changeset 53562
81b78f65f168
parent 53561
c9cc26715dfb
child 53563
6b8b1b9d5e2b

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

indra/newview/llinventoryfilter.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llinventoryfilter.cpp	Sat Dec 09 22:08:19 2017 +0100
     1.2 +++ b/indra/newview/llinventoryfilter.cpp	Sat Dec 09 22:42:44 2017 +0100
     1.3 @@ -864,17 +864,10 @@
     1.4  		// Cancel out UUID once the search string is modified
     1.5  		if (mFilterOps.mFilterTypes == FILTERTYPE_UUID)
     1.6  		{
     1.7 -			mFilterOps.mFilterTypes &= ~FILTERTYPE_UUID;
     1.8 -			mFilterOps.mFilterUUID = LLUUID::null;
     1.9  			// <FS:Ansariel> Find all links unhiding hidden empty system folders
    1.10 -			if (gSavedSettings.getBOOL("DebugHideEmptySystemFolders"))
    1.11 -			{
    1.12 -				setFilterEmptySystemFolders();
    1.13 -			}
    1.14 -			else
    1.15 -			{
    1.16 -				removeFilterEmptySystemFolders();
    1.17 -			}
    1.18 +			//mFilterOps.mFilterTypes &= ~FILTERTYPE_UUID;
    1.19 +			//mFilterOps.mFilterUUID = LLUUID::null;
    1.20 +			mFilterOps = mBackupFilterOps;
    1.21  			// </FS:Ansariel>
    1.22  			setModified(FILTER_RESTART);
    1.23  		}
    1.24 @@ -1098,7 +1091,7 @@
    1.25  {
    1.26  	// Save a copy of settings so that we will be able to restore it later
    1.27  	// but make sure we are not searching for links already
    1.28 -	if(mFilterOps.mFilterLinks != FILTERLINK_ONLY_LINKS)
    1.29 +	//if(mFilterOps.mFilterLinks != FILTERLINK_ONLY_LINKS) // <FS:Ansariel> Find all links unhiding hidden empty system folders
    1.30  	{
    1.31  		mBackupFilterOps = mFilterOps;
    1.32  	}

mercurial