diff options
author | Jacek Antonelli | 2008-11-22 02:18:13 -0600 |
---|---|---|
committer | Jacek Antonelli | 2008-11-22 03:00:42 -0600 |
commit | a00ab3da77a672f2138142db2c78229f95f69687 (patch) | |
tree | 5f8e64a08ea361c61f40492dac48296459af17ee /linden | |
parent | Renamed "Show All Items" filter to "All Types". (diff) | |
download | meta-impy-a00ab3da77a672f2138142db2c78229f95f69687.zip meta-impy-a00ab3da77a672f2138142db2c78229f95f69687.tar.gz meta-impy-a00ab3da77a672f2138142db2c78229f95f69687.tar.bz2 meta-impy-a00ab3da77a672f2138142db2c78229f95f69687.tar.xz |
Renamed "Clothing" filter to "Clothing / Body Parts".
Diffstat (limited to 'linden')
3 files changed, 12 insertions, 8 deletions
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp index e9544af..de8dacb 100644 --- a/linden/indra/newview/llinventoryview.cpp +++ b/linden/indra/newview/llinventoryview.cpp | |||
@@ -1020,7 +1020,7 @@ void LLInventoryView::onQuickFilterCommit(LLUICtrl* ctrl, void* user_data) | |||
1020 | filter_type = 0x1 << LLInventoryType::IT_CALLINGCARD; | 1020 | filter_type = 0x1 << LLInventoryType::IT_CALLINGCARD; |
1021 | } | 1021 | } |
1022 | 1022 | ||
1023 | else if ("Clothing" == item_type) | 1023 | else if ("Clothing / Body Parts" == item_type) |
1024 | { | 1024 | { |
1025 | filter_type = 0x1 << LLInventoryType::IT_WEARABLE; | 1025 | filter_type = 0x1 << LLInventoryType::IT_WEARABLE; |
1026 | } | 1026 | } |
@@ -1164,7 +1164,7 @@ void LLInventoryView::refreshQuickFilter(LLUICtrl* ctrl) | |||
1164 | 1164 | ||
1165 | else if (filter_type == (0x1 << LLInventoryType::IT_WEARABLE)) | 1165 | else if (filter_type == (0x1 << LLInventoryType::IT_WEARABLE)) |
1166 | { | 1166 | { |
1167 | selection = "Clothing"; | 1167 | selection = "Clothing / Body Parts"; |
1168 | } | 1168 | } |
1169 | 1169 | ||
1170 | else if (filter_type == (0x1 << LLInventoryType::IT_GESTURE)) | 1170 | else if (filter_type == (0x1 << LLInventoryType::IT_GESTURE)) |
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 6e9eb86..3cb586f 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 | |||
@@ -12,7 +12,11 @@ | |||
12 | </text> | 12 | </text> |
13 | 13 | ||
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="150" bottom_delta="0"> |
16 | |||
17 | <!-- IF YOU CHANGE ANY OF THESE LABELS, YOU | ||
18 | MUST ALSO UPDATE llinventoryview.cpp! --> | ||
19 | |||
16 | <combo_item name="type_all"> | 20 | <combo_item name="type_all"> |
17 | All Types | 21 | All Types |
18 | </combo_item> | 22 | </combo_item> |
@@ -23,8 +27,8 @@ | |||
23 | <combo_item name="type_calling_card"> | 27 | <combo_item name="type_calling_card"> |
24 | Calling Cards | 28 | Calling Cards |
25 | </combo_item> | 29 | </combo_item> |
26 | <combo_item name="type_clothing"> | 30 | <combo_item name="type_wearable"> |
27 | Clothing | 31 | Clothing / Body Parts |
28 | </combo_item> | 32 | </combo_item> |
29 | <combo_item name="type_gesture"> | 33 | <combo_item name="type_gesture"> |
30 | Gestures | 34 | Gestures |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml index 9a9b8db..728ae1c 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml | |||
@@ -1,8 +1,8 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes" ?> |
2 | <floater bottom="-495" can_close="true" can_drag_on_left="false" can_minimize="false" | 2 | <floater bottom="-495" can_close="true" can_drag_on_left="false" can_minimize="false" |
3 | can_resize="false" can_tear_off="true" enabled="true" height="408" | 3 | can_resize="false" can_tear_off="true" enabled="true" height="408" |
4 | left="457" min_height="408" min_width="160" mouse_opaque="true" | 4 | left="457" min_height="408" min_width="170" mouse_opaque="true" |
5 | name="Inventory Finder" title="inventory_recent_items" width="160"> | 5 | name="Inventory Finder" title="inventory_recent_items" width="170"> |
6 | <icon bottom="-36" color="1 1 1 1" enabled="true" follows="left|top" height="16" | 6 | <icon bottom="-36" color="1 1 1 1" enabled="true" follows="left|top" height="16" |
7 | image_name="inv_item_animation.tga" left="8" mouse_opaque="true" | 7 | image_name="inv_item_animation.tga" left="8" mouse_opaque="true" |
8 | name="icon_animation" width="16" /> | 8 | name="icon_animation" width="16" /> |
@@ -20,7 +20,7 @@ | |||
20 | image_name="inv_item_shirt.tga" left="8" mouse_opaque="true" | 20 | image_name="inv_item_shirt.tga" left="8" mouse_opaque="true" |
21 | name="icon_clothing" width="16" /> | 21 | name="icon_clothing" width="16" /> |
22 | <check_box bottom="-76" enabled="true" follows="left|top" font="SansSerifSmall" | 22 | <check_box bottom="-76" enabled="true" follows="left|top" font="SansSerifSmall" |
23 | height="16" initial_value="false" label="Clothing" left="26" | 23 | height="16" initial_value="false" label="Clothing / Body Parts" left="26" |
24 | mouse_opaque="true" name="check_clothing" radio_style="false" width="126" /> | 24 | mouse_opaque="true" name="check_clothing" radio_style="false" width="126" /> |
25 | <icon bottom="-96" color="1 1 1 1" enabled="true" follows="left|top" height="16" | 25 | <icon bottom="-96" color="1 1 1 1" enabled="true" follows="left|top" height="16" |
26 | image_name="inv_item_gesture.tga" left="8" mouse_opaque="true" | 26 | image_name="inv_item_gesture.tga" left="8" mouse_opaque="true" |