aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorJacek Antonelli2009-01-15 15:26:56 -0600
committerJacek Antonelli2009-01-15 15:26:56 -0600
commit9101a9b28cca7fb9d44c5510f47de1e772564d38 (patch)
tree0cb3b6274b09d14b96d5b0005b2067fc91e0b0b4 /linden/indra
parentSimplified rebuildFilter() a bit. (diff)
downloadmeta-impy-9101a9b28cca7fb9d44c5510f47de1e772564d38.zip
meta-impy-9101a9b28cca7fb9d44c5510f47de1e772564d38.tar.gz
meta-impy-9101a9b28cca7fb9d44c5510f47de1e772564d38.tar.bz2
meta-impy-9101a9b28cca7fb9d44c5510f47de1e772564d38.tar.xz
Fixed folders expanding when Show Filters is opened.
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llfolderview.cpp4
1 files changed, 2 insertions, 2 deletions
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()