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

CHUI-275 : WIP : Cleaned up comments

meow-7.2.2
Merov Linden 2013-05-02 18:47:56 -07:00
parent 2a7d604e87
commit 6cce8629b9
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llpersonmodelcommon.cpp
View File

@ -96,8 +96,8 @@ void LLPersonModelCommon::showProperties(void)
bool LLPersonModelCommon::filter( LLFolderViewFilter& filter)
{
// See LLFolderViewModelItemInventory::filter()
/*
Hack: for the moment, we always apply the filter if we're called
if (!filter.isModified())
{
llinfos << "Merov : LLPersonModelCommon::filter, exit, no modif" << llendl;
@ -106,19 +106,20 @@ bool LLPersonModelCommon::filter( LLFolderViewFilter& filter)
*/
if (!mChildren.empty())
{
//llinfos << "Merov : LLPersonModelCommon::filter, filtering folder = " << getDisplayName() << llendl;
setPassedFilter(1, -1, filter.getStringMatchOffset(this), filter.getFilterStringSize());
// If the current instance has children, it's a "person folder" and always passes filters (we do not filter out empty folders)
setPassedFilter(1, -1);
// Call filter recursively on all children
for (child_list_t::iterator iter = mChildren.begin(), end_iter = mChildren.end();
iter != end_iter;
++iter)
{
// LLFolderViewModelItem
LLPersonModelCommon* item = dynamic_cast<LLPersonModelCommon*>(*iter);
item->filter(filter);
}
}
else
{
// If there's no children, the current instance is a person and we check and set the passed filter flag on it
const bool passed_filter = filter.check(this);
setPassedFilter(passed_filter, -1, filter.getStringMatchOffset(this), filter.getFilterStringSize());
}

8
indra/newview/llpersonmodelcommon.h
View File

@ -174,14 +174,6 @@ public:
const std::string& getFilterText() { return mName; }
void setModified(EFilterModified behavior = FILTER_RESTART) { mFilterModified = behavior; }
// +-------------------------------------------------------------------+
// + Count
// +-------------------------------------------------------------------+
// Note : we currently filter the whole person list at once, no need to count then.
//void setFilterCount(S32 count) { }
//S32 getFilterCount() const { return 1; }
//void decrementFilterCount() { }
// +-------------------------------------------------------------------+
// + Time
// +-------------------------------------------------------------------+