diff options
author | Jacek Antonelli | 2008-11-22 01:59:58 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-11-22 03:00:25 -0600 |
commit | fd776f1de80fd8b1dc19be5587ee165af2c18162 (patch) | |
tree | f348e550f59008d4d36b862438f0d4b9cbb5371b | |
parent | Bogus quick filter strings should be ignored. (diff) | |
download | meta-impy-fd776f1de80fd8b1dc19be5587ee165af2c18162.zip meta-impy-fd776f1de80fd8b1dc19be5587ee165af2c18162.tar.gz meta-impy-fd776f1de80fd8b1dc19be5587ee165af2c18162.tar.bz2 meta-impy-fd776f1de80fd8b1dc19be5587ee165af2c18162.tar.xz |
Renamed "Show All Items" filter to "All Types".
-rw-r--r-- | ChangeLog.txt | 6 | ||||
-rw-r--r-- | linden/indra/newview/llinventoryview.cpp | 4 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index d561976..e3bc420 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,6 +1,12 @@ | |||
1 | 2008-11-22 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2008-11-22 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/indra/newview/llinventoryview.cpp: | 3 | * linden/indra/newview/llinventoryview.cpp: |
4 | Renamed "Show All Items" filter to "All Types". | ||
5 | * linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml: | ||
6 | Ditto. | ||
7 | |||
8 | |||
9 | * linden/indra/newview/llinventoryview.cpp: | ||
4 | Bogus quick filter strings should be ignored. | 10 | Bogus quick filter strings should be ignored. |
5 | 11 | ||
6 | 12 | ||
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp index 743c068..e9544af 100644 --- a/linden/indra/newview/llinventoryview.cpp +++ b/linden/indra/newview/llinventoryview.cpp | |||
@@ -1075,7 +1075,7 @@ void LLInventoryView::onQuickFilterCommit(LLUICtrl* ctrl, void* user_data) | |||
1075 | return; | 1075 | return; |
1076 | } | 1076 | } |
1077 | 1077 | ||
1078 | else if ("Show All Items" == item_type) | 1078 | else if ("All Types" == item_type) |
1079 | { | 1079 | { |
1080 | // Show all types | 1080 | // Show all types |
1081 | filter_type = 0xffffffff; | 1081 | filter_type = 0xffffffff; |
@@ -1149,7 +1149,7 @@ void LLInventoryView::refreshQuickFilter(LLUICtrl* ctrl) | |||
1149 | 1149 | ||
1150 | if (filter_type == filter_mask) | 1150 | if (filter_type == filter_mask) |
1151 | { | 1151 | { |
1152 | selection = "Show All Items"; | 1152 | selection = "All Types"; |
1153 | } | 1153 | } |
1154 | 1154 | ||
1155 | else if (filter_type == (0x1 << LLInventoryType::IT_ANIMATION)) | 1155 | else if (filter_type == (0x1 << LLInventoryType::IT_ANIMATION)) |
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 9cda2a9..6e9eb86 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 | |||
@@ -14,7 +14,7 @@ | |||
14 | <combo_box name="Quick Filter" label="Quick Filter" follows="left|top" | 14 | <combo_box name="Quick Filter" label="Quick Filter" follows="left|top" |
15 | height="20" left="80" width="120" bottom_delta="0"> | 15 | height="20" left="80" width="120" bottom_delta="0"> |
16 | <combo_item name="type_all"> | 16 | <combo_item name="type_all"> |
17 | Show All Items | 17 | All Types |
18 | </combo_item> | 18 | </combo_item> |
19 | <!-- combo list separator would go here, if such a thing existed --> | 19 | <!-- combo list separator would go here, if such a thing existed --> |
20 | <combo_item name="type_animation"> | 20 | <combo_item name="type_animation"> |