From 9101a9b28cca7fb9d44c5510f47de1e772564d38 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 15 Jan 2009 15:26:56 -0600 Subject: Fixed folders expanding when Show Filters is opened. --- ChangeLog.txt | 4 ++++ linden/indra/newview/llfolderview.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index a34e2da..ba3afcd 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,9 @@ 2009-01-15 Jacek Antonelli + * linden/indra/newview/llfolderview.cpp: + Fixed folders expanding when Show Filters is opened. + + * linden/indra/newview/llinventoryview.cpp: Simplified rebuildFilter() a bit. diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp index 58d0c42..ba37fa4 100644 --- a/linden/indra/newview/llfolderview.cpp +++ b/linden/indra/newview/llfolderview.cpp @@ -4479,7 +4479,7 @@ LLInventoryFilter::LLInventoryFilter(const std::string& name) : mModified(FALSE), mNeedTextRebuild(TRUE) { - mFilterOps.mFilterTypes = 0xffffffff; + mFilterOps.mFilterTypes = LLInventoryType::NIT_ALL; mFilterOps.mMinDate = time_min(); mFilterOps.mMaxDate = time_max(); mFilterOps.mHoursAgo = 0; @@ -4552,7 +4552,7 @@ BOOL LLInventoryFilter::isNotDefault() BOOL LLInventoryFilter::isActive() { - return mFilterOps.mFilterTypes != 0xffffffff + return mFilterOps.mFilterTypes != LLInventoryType::NIT_ALL || mFilterSubString.size() || mFilterOps.mPermissions != PERM_NONE || mFilterOps.mMinDate != time_min() -- cgit v1.1