aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt4
-rw-r--r--linden/indra/newview/llinventoryview.cpp8
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index d348aa0..d561976 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,10 @@
12008-11-22 Jacek Antonelli <jacek.antonelli@gmail.com> 12008-11-22 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/newview/llinventoryview.cpp: 3 * linden/indra/newview/llinventoryview.cpp:
4 Bogus quick filter strings should be ignored.
5
6
7 * linden/indra/newview/llinventoryview.cpp:
4 Disabled testing output when changing quick filter. 8 Disabled testing output when changing quick filter.
5 9
6 10
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index 5470e30..743c068 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -1075,12 +1075,18 @@ void LLInventoryView::onQuickFilterCommit(LLUICtrl* ctrl, void* user_data)
1075 return; 1075 return;
1076 } 1076 }
1077 1077
1078 else 1078 else if ("Show All Items" == item_type)
1079 { 1079 {
1080 // Show all types 1080 // Show all types
1081 filter_type = 0xffffffff; 1081 filter_type = 0xffffffff;
1082 } 1082 }
1083 1083
1084 else
1085 {
1086 llwarns << "Ignoring unknown filter: " << item_type << llendl;
1087 return;
1088 }
1089
1084 view->mActivePanel->setFilterTypes( filter_type ); 1090 view->mActivePanel->setFilterTypes( filter_type );
1085 1091
1086 1092