aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt6
-rw-r--r--linden/indra/newview/llinventoryview.cpp10
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml3
3 files changed, 19 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index f4a217d..d51522f 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
12008-11-08 Jacek Antonelli <jacek.antonelli@gmail.com> 12008-11-08 Jacek Antonelli <jacek.antonelli@gmail.com>
2 2
3 * linden/indra/newview/llinventoryview.cpp:
4 Added 'Custom' filter option (opens filters window).
5 * linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml:
6 Ditto.
7
8
3 * linden/indra/newview/llinventoryview.cpp: 9 * linden/indra/newview/llinventoryview.cpp:
4 Quick Filter works, but is a bit rough. 10 Quick Filter works, but is a bit rough.
5 It doesn't refresh its display when you change tabs, 11 It doesn't refresh its display when you change tabs,
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index e0061ba..6d5bf4d 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -1060,6 +1060,16 @@ void LLInventoryView::onQuickFilterCommit(LLUICtrl* ctrl, void* user_data)
1060 filter_type = 0x1 << LLInventoryType::IT_SNAPSHOT; 1060 filter_type = 0x1 << LLInventoryType::IT_SNAPSHOT;
1061 } 1061 }
1062 1062
1063 else if ("Custom..." == item_type)
1064 {
1065 // When they select custom, show the floater then return
1066 if( !(view->filtersVisible(view)) )
1067 {
1068 view->toggleFindOptions();
1069 }
1070 return;
1071 }
1072
1063 else 1073 else
1064 { 1074 {
1065 // Show all types 1075 // Show all types
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
index 7d0f086..9cda2a9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml
@@ -50,6 +50,9 @@
50 <combo_item name="type_snapshot"> 50 <combo_item name="type_snapshot">
51 Snapshots 51 Snapshots
52 </combo_item> 52 </combo_item>
53 <combo_item name="type_custom">
54 Custom...
55 </combo_item>
53 </combo_box> 56 </combo_box>
54 57
55 <tab_container name="inventory filter tabs" follows="left|top|right|bottom" 58 <tab_container name="inventory filter tabs" follows="left|top|right|bottom"