From fd776f1de80fd8b1dc19be5587ee165af2c18162 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 22 Nov 2008 01:59:58 -0600
Subject: Renamed "Show All Items" filter to "All Types".

---
 ChangeLog.txt                                                      | 6 ++++++
 linden/indra/newview/llinventoryview.cpp                           | 4 ++--
 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 @@
 2008-11-22  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* 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:
 	Bogus quick filter strings should be ignored.
 
 
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)
 		return;
 	}
 
-	else if ("Show All Items" == item_type)
+	else if ("All Types" == item_type)
 	{
 		// Show all types
 		filter_type = 0xffffffff;
@@ -1149,7 +1149,7 @@ void LLInventoryView::refreshQuickFilter(LLUICtrl* ctrl)
 
 	if (filter_type == filter_mask)
 	{
-		selection = "Show All Items";
+		selection = "All Types";
 	}
 
 	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 @@
 	<combo_box name="Quick Filter" label="Quick Filter" follows="left|top"
 						 height="20" left="80" width="120" bottom_delta="0">
 		<combo_item name="type_all">
-			Show All Items
+			All Types
 		</combo_item>
 		<!-- combo list separator would go here, if such a thing existed -->
 		<combo_item name="type_animation">
-- 
cgit v1.1