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

[VMM] Opt: Only do this when rearranging, actually.

Browse Source
This commit is contained in:
Lirusaito
2019-03-11 12:43:36 -04:00
parent c231e555da
commit a3365512b3
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
indra/newview/llfolderviewitem.cpp
View File

@@ -1192,37 +1192,6 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation)
}
bool filtered = !getFilteredFolder(filter_generation);
mHasVisibleChildren = !filtered && hasFilteredDescendants(filter_generation);
if (mHasVisibleChildren)
{
// We have to verify that there's at least one child that's not filtered out
bool found = false;
// Try the items first
for (items_t::iterator iit = mItems.begin(); iit != mItems.end(); ++iit)
{
LLFolderViewItem* itemp = (*iit);
found = itemp->getFiltered(filter_generation);
if (found)
break;
}
if (!found)
{
// If no item found, try the folders
for (folders_t::iterator fit = mFolders.begin(); fit != mFolders.end(); ++fit)
{
LLFolderViewFolder* folderp = (*fit);
found = folderp->getListener()
&& (folderp->getFiltered(filter_generation)
|| (folderp->getFilteredFolder(filter_generation)
&& folderp->hasFilteredDescendants(filter_generation)));
if (found)
break;
}
}
mHasVisibleChildren = found;
}
// calculate height as a single item (without any children), and reshapes rectangle to match
LLFolderViewItem::arrange( width, height, filter_generation );
@@ -1244,6 +1213,37 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height, S32 filter_generation)
// and need to be arranged again
mLastArrangeGeneration = getRoot()->getArrangeGeneration();
mHasVisibleChildren = !filtered && hasFilteredDescendants(filter_generation);
if (mHasVisibleChildren)
{
// We have to verify that there's at least one child that's not filtered out
bool found = false;
// Try the items first
for (items_t::iterator iit = mItems.begin(); iit != mItems.end(); ++iit)
{
LLFolderViewItem* itemp = (*iit);
found = itemp->getFiltered(filter_generation);
if (found)
break;
}
if (!found)
{
// If no item found, try the folders
for (folders_t::iterator fit = mFolders.begin(); fit != mFolders.end(); ++fit)
{
LLFolderViewFolder* folderp = (*fit);
found = folderp->getListener()
&& (folderp->getFiltered(filter_generation)
|| (folderp->getFilteredFolder(filter_generation)
&& folderp->hasFilteredDescendants(filter_generation)));
if (found)
break;
}
}
mHasVisibleChildren = found;
}
// Hide marketplaces top level folders that don't match the filter for this view
if (marketplace_top)
{