From 55b5f0c36b5d6448c6144cdd77ddee8273333b76 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 15 Jan 2009 14:49:09 -0600 Subject: LLInventoryViewFinder::rebuildFilter(). Refactored from draw(). --- ChangeLog.txt | 9 +++++++++ linden/indra/newview/llinventoryview.cpp | 10 ++++++---- linden/indra/newview/llinventoryview.h | 1 + 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index c948906..8498188 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,12 @@ +2009-01-15 Jacek Antonelli + + * linden/indra/newview/llinventoryview.cpp: + LLInventoryViewFinder::rebuildFilter(). + Refactored from draw(). + * linden/indra/newview/llinventoryview.h: + Ditto. + + 2009-01-14 Jacek Antonelli * linden/indra/newview/llinventoryview.cpp: diff --git a/linden/indra/newview/llinventoryview.cpp b/linden/indra/newview/llinventoryview.cpp index d72fb95..4beb370 100644 --- a/linden/indra/newview/llinventoryview.cpp +++ b/linden/indra/newview/llinventoryview.cpp @@ -203,6 +203,12 @@ void LLInventoryViewFinder::updateElementsFromFilter() void LLInventoryViewFinder::draw() { + rebuildFilter(); + LLFloater::draw(); +} + +void LLInventoryViewFinder::rebuildFilter() +{ U32 filter = 0xffffffff; BOOL filtered_by_all_types = TRUE; @@ -237,8 +243,6 @@ void LLInventoryViewFinder::draw() } if (!childGetValue("check_landmark")) - - { filter &= ~(LLInventoryType::NIT_LANDMARK); filtered_by_all_types = FALSE; @@ -308,8 +312,6 @@ void LLInventoryViewFinder::draw() mInventoryView->mActivePanel->setHoursAgo(hours); mInventoryView->mActivePanel->setSinceLogoff(getCheckSinceLogoff()); mInventoryView->setFilterTextFromFilter(); - - LLFloater::draw(); } void LLInventoryViewFinder::onClose(bool app_quitting) diff --git a/linden/indra/newview/llinventoryview.h b/linden/indra/newview/llinventoryview.h index 80e5768..26f3003 100644 --- a/linden/indra/newview/llinventoryview.h +++ b/linden/indra/newview/llinventoryview.h @@ -163,6 +163,7 @@ public: const LLRect& rect, LLInventoryView* inventory_view); virtual void draw(); + virtual void rebuildFilter(); virtual void onClose(bool app_quitting); void changeFilter(LLInventoryFilter* filter); void updateElementsFromFilter(); -- cgit v1.1