From a00ab3da77a672f2138142db2c78229f95f69687 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 22 Nov 2008 02:18:13 -0600 Subject: Renamed "Clothing" filter to "Clothing / Body Parts". --- ChangeLog.txt | 14 ++++++++++++++ linden/indra/newview/llinventoryview.cpp | 4 ++-- .../newview/skins/default/xui/en-us/floater_inventory.xml | 10 +++++++--- .../default/xui/en-us/floater_inventory_view_finder.xml | 6 +++--- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index e3bc420..c2cd0ba 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,12 +1,26 @@ 2008-11-22 Jacek Antonelli * linden/indra/newview/llinventoryview.cpp: + Renamed "Clothing" filter to "Clothing / Body Parts". + * linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml: + Ditto. + * linden/indra/newview/skins/default/xui/en-us/floater_inventory_view_finder.xml: + Ditto. + + + * linden/indra/newview/llinventoryview.cpp: Renamed "Show All Items" filter to "All Types". * linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml: Ditto. * linden/indra/newview/llinventoryview.cpp: + Renamed "Show All Items" to "All Types". + * linden/indra/newview/skins/default/xui/en-us/floater_inventory.xml: + Ditto. + + + * linden/indra/newview/llinventoryview.cpp: Bogus quick filter strings should be ignored. 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) filter_type = 0x1 << LLInventoryType::IT_CALLINGCARD; } - else if ("Clothing" == item_type) + else if ("Clothing / Body Parts" == item_type) { filter_type = 0x1 << LLInventoryType::IT_WEARABLE; } @@ -1164,7 +1164,7 @@ void LLInventoryView::refreshQuickFilter(LLUICtrl* ctrl) else if (filter_type == (0x1 << LLInventoryType::IT_WEARABLE)) { - selection = "Clothing"; + selection = "Clothing / Body Parts"; } 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 @@ + height="20" left="80" width="150" bottom_delta="0"> + + + All Types @@ -23,8 +27,8 @@ Calling Cards - - Clothing + + Clothing / Body Parts 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 @@ + left="457" min_height="408" min_width="170" mouse_opaque="true" + name="Inventory Finder" title="inventory_recent_items" width="170"> @@ -20,7 +20,7 @@ image_name="inv_item_shirt.tga" left="8" mouse_opaque="true" name="icon_clothing" width="16" />