aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt4
-rw-r--r--linden/indra/newview/llfolderview.cpp4
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 @@
12009-01-15 Jacek Antonelli <jacek.antonelli@gmail.com> 12009-01-15 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/newview/llfolderview.cpp:
4 Fixed folders expanding when Show Filters is opened.
5
6
3 * linden/indra/newview/llinventoryview.cpp: 7 * linden/indra/newview/llinventoryview.cpp:
4 Simplified rebuildFilter() a bit. 8 Simplified rebuildFilter() a bit.
5 9
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) :
4479 mModified(FALSE), 4479 mModified(FALSE),
4480 mNeedTextRebuild(TRUE) 4480 mNeedTextRebuild(TRUE)
4481{ 4481{
4482 mFilterOps.mFilterTypes = 0xffffffff; 4482 mFilterOps.mFilterTypes = LLInventoryType::NIT_ALL;
4483 mFilterOps.mMinDate = time_min(); 4483 mFilterOps.mMinDate = time_min();
4484 mFilterOps.mMaxDate = time_max(); 4484 mFilterOps.mMaxDate = time_max();
4485 mFilterOps.mHoursAgo = 0; 4485 mFilterOps.mHoursAgo = 0;
@@ -4552,7 +4552,7 @@ BOOL LLInventoryFilter::isNotDefault()
4552 4552
4553BOOL LLInventoryFilter::isActive() 4553BOOL LLInventoryFilter::isActive()
4554{ 4554{
4555 return mFilterOps.mFilterTypes != 0xffffffff 4555 return mFilterOps.mFilterTypes != LLInventoryType::NIT_ALL
4556 || mFilterSubString.size() 4556 || mFilterSubString.size()
4557 || mFilterOps.mPermissions != PERM_NONE 4557 || mFilterOps.mPermissions != PERM_NONE
4558 || mFilterOps.mMinDate != time_min() 4558 || mFilterOps.mMinDate != time_min()