diff options
author | Jacek Antonelli | 2008-12-08 15:29:02 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-12-08 15:29:02 -0600 |
commit | 28bb7ba42fb8d9ea17810079749f37b5653b5626 (patch) | |
tree | d1e080a79f7968c7f8f9e3d785fabff0666a28d5 | |
parent | LLInvFVBridge and derived classes have NTypes. (diff) | |
download | meta-impy-28bb7ba42fb8d9ea17810079749f37b5653b5626.zip meta-impy-28bb7ba42fb8d9ea17810079749f37b5653b5626.tar.gz meta-impy-28bb7ba42fb8d9ea17810079749f37b5653b5626.tar.bz2 meta-impy-28bb7ba42fb8d9ea17810079749f37b5653b5626.tar.xz |
Inventory filtering is now done by NType.
-rw-r--r-- | ChangeLog.txt | 4 | ||||
-rw-r--r-- | linden/indra/newview/llfolderview.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 51e7d3e..5cca4da 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,9 @@ | |||
1 | 2008-12-08 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2008-12-08 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/indra/newview/llfolderview.cpp: | ||
4 | Inventory filtering is now done by NType. | ||
5 | |||
6 | |||
3 | * linden/indra/newview/llinventorybridge.cpp: | 7 | * linden/indra/newview/llinventorybridge.cpp: |
4 | LLInvFVBridge and derived classes have NTypes. | 8 | LLInvFVBridge and derived classes have NTypes. |
5 | * linden/indra/newview/llinventorybridge.h: | 9 | * linden/indra/newview/llinventorybridge.h: |
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp index 8cefd5b..3f36222 100644 --- a/linden/indra/newview/llfolderview.cpp +++ b/linden/indra/newview/llfolderview.cpp | |||
@@ -4522,7 +4522,7 @@ BOOL LLInventoryFilter::check(LLFolderViewItem* item) | |||
4522 | } | 4522 | } |
4523 | LLFolderViewEventListener* listener = item->getListener(); | 4523 | LLFolderViewEventListener* listener = item->getListener(); |
4524 | mSubStringMatchOffset = mFilterSubString.size() ? item->getSearchableLabel().find(mFilterSubString) : std::string::npos; | 4524 | mSubStringMatchOffset = mFilterSubString.size() ? item->getSearchableLabel().find(mFilterSubString) : std::string::npos; |
4525 | BOOL passed = (0x1 << listener->getInventoryType() & mFilterOps.mFilterTypes || listener->getInventoryType() == LLInventoryType::IT_NONE) | 4525 | BOOL passed = (listener->getNInventoryType() & mFilterOps.mFilterTypes || listener->getNInventoryType() == LLInventoryType::NIT_NONE) |
4526 | && (mFilterSubString.size() == 0 || mSubStringMatchOffset != std::string::npos) | 4526 | && (mFilterSubString.size() == 0 || mSubStringMatchOffset != std::string::npos) |
4527 | && ((listener->getPermissionMask() & mFilterOps.mPermissions) == mFilterOps.mPermissions) | 4527 | && ((listener->getPermissionMask() & mFilterOps.mPermissions) == mFilterOps.mPermissions) |
4528 | && (listener->getCreationDate() >= earliest && listener->getCreationDate() <= mFilterOps.mMaxDate); | 4528 | && (listener->getCreationDate() >= earliest && listener->getCreationDate() <= mFilterOps.mMaxDate); |