From 3e7f79f569e17c845152a7039d084a7877517f11 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 15 Jan 2009 15:10:30 -0600
Subject: Simplified rebuildFilter() a bit.

---
 ChangeLog.txt                            |  5 +++++
 linden/indra/newview/llinventoryview.cpp | 17 ++---------------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8498188..a34e2da 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,8 +1,13 @@
 2009-01-15  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/newview/llinventoryview.cpp:
+	Simplified rebuildFilter() a bit.
+
+
+	* linden/indra/newview/llinventoryview.cpp:
 	LLInventoryViewFinder::rebuildFilter().
 	Refactored from draw().
+
 	* linden/indra/newview/llinventoryview.h:
 	Ditto.
 
diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp
index 4beb370..4576ff9 100644
--- a/linden/indra/newview/llinventoryview.cpp
+++ b/linden/indra/newview/llinventoryview.cpp
@@ -209,82 +209,69 @@ void LLInventoryViewFinder::draw()
 
 void LLInventoryViewFinder::rebuildFilter()
 {
-	U32 filter = 0xffffffff;
-	BOOL filtered_by_all_types = TRUE;
+	U32 filter = LLInventoryType::NIT_ALL;
 
 	if (!childGetValue("check_animation"))
 	{
 		filter &= ~(LLInventoryType::NIT_ANIMATION);
-		filtered_by_all_types = FALSE;
 	}
 
 	if (!childGetValue("check_bodypart"))
 	{
 		filter &= ~(LLInventoryType::NIT_BODYPART);
-		filtered_by_all_types = FALSE;
 	}
 
 	if (!childGetValue("check_calling_card"))
 	{
 		filter &= ~(LLInventoryType::NIT_CALLCARD);
-		filtered_by_all_types = FALSE;
 	}
 
 	if (!childGetValue("check_clothing"))
 	{
 		filter &= ~(LLInventoryType::NIT_CLOTHING);
-		filtered_by_all_types = FALSE;
 	}
 
 	if (!childGetValue("check_gesture"))
 	{
 		filter &= ~(LLInventoryType::NIT_GESTURE);
-		filtered_by_all_types = FALSE;
 	}
 
 	if (!childGetValue("check_landmark"))
 	{
 		filter &= ~(LLInventoryType::NIT_LANDMARK);
-		filtered_by_all_types = FALSE;
 	}
 
 	if (!childGetValue("check_notecard"))
 	{
 		filter &= ~(LLInventoryType::NIT_NOTECARD);
-		filtered_by_all_types = FALSE;
 	}
 
 	if (!childGetValue("check_object"))
 	{
 		filter &= ~(LLInventoryType::NIT_OBJECT);
-		filtered_by_all_types = FALSE;
 	}
 
 	if (!childGetValue("check_script"))
 	{
 		filter &= ~(LLInventoryType::NIT_SCRIPT_LSL2);
-		filtered_by_all_types = FALSE;
 	}
 
 	if (!childGetValue("check_sound"))
 	{
 		filter &= ~(LLInventoryType::NIT_SOUND);
-		filtered_by_all_types = FALSE;
 	}
 
 	if (!childGetValue("check_texture"))
 	{
 		filter &= ~(LLInventoryType::NIT_TEXTURE);
-		filtered_by_all_types = FALSE;
 	}
 
 	if (!childGetValue("check_snapshot"))
 	{
 		filter &= ~(LLInventoryType::NIT_SNAPSHOT);
-		filtered_by_all_types = FALSE;
 	}
 
-	if (!filtered_by_all_types)
+	if (filter != LLInventoryType::NIT_ALL)
 	{
 		// don't include folders in filter, unless I've selected everything
 		filter &= ~(LLInventoryType::NIT_FOLDER);
-- 
cgit v1.1