diff options
author | Jacek Antonelli | 2008-12-10 00:06:33 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-12-10 17:50:36 -0600 |
commit | 168a05a39d17e0ebe1df76a16a13b8378133ce73 (patch) | |
tree | a7ae73068d6cc94d7a112c7592a67a96f08b6f5d | |
parent | Start fetching inventory when quick filter changes. (diff) | |
download | meta-impy-168a05a39d17e0ebe1df76a16a13b8378133ce73.zip meta-impy-168a05a39d17e0ebe1df76a16a13b8378133ce73.tar.gz meta-impy-168a05a39d17e0ebe1df76a16a13b8378133ce73.tar.bz2 meta-impy-168a05a39d17e0ebe1df76a16a13b8378133ce73.tar.xz |
Clearing search shouldn't clear filter type.
-rw-r--r-- | ChangeLog.txt | 6 | ||||
-rw-r--r-- | linden/indra/newview/llinventoryview.cpp | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 5664038..52d3929 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,3 +1,9 @@ | |||
1 | 2008-12-10 Jacek Antonelli <jacek.antonelli@gmail.com> | ||
2 | |||
3 | * linden/indra/newview/llinventoryview.cpp: | ||
4 | Clearing search shouldn't clear filter type. | ||
5 | |||
6 | |||
1 | 2008-12-09 Jacek Antonelli <jacek.antonelli@gmail.com> | 7 | 2008-12-09 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 8 | ||
3 | * linden/indra/newview/llinventoryview.cpp: | 9 | * linden/indra/newview/llinventoryview.cpp: |
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp index be07630..7ea06a0 100644 --- a/linden/indra/newview/llinventoryview.cpp +++ b/linden/indra/newview/llinventoryview.cpp | |||
@@ -943,16 +943,9 @@ void LLInventoryView::onClearSearch(void* user_data) | |||
943 | LLInventoryView* self = (LLInventoryView*)user_data; | 943 | LLInventoryView* self = (LLInventoryView*)user_data; |
944 | if(!self) return; | 944 | if(!self) return; |
945 | 945 | ||
946 | LLFloater *finder = self->getFinder(); | ||
947 | if (self->mActivePanel) | 946 | if (self->mActivePanel) |
948 | { | 947 | { |
949 | self->mActivePanel->setFilterSubString(LLStringUtil::null); | 948 | self->mActivePanel->setFilterSubString(LLStringUtil::null); |
950 | self->mActivePanel->setFilterTypes(0xffffffff); | ||
951 | } | ||
952 | |||
953 | if (finder) | ||
954 | { | ||
955 | LLInventoryViewFinder::selectAllTypes(finder); | ||
956 | } | 949 | } |
957 | 950 | ||
958 | // re-open folders that were initially open | 951 | // re-open folders that were initially open |