From 781ea91481e483c14b0d7a2846983c45484f4446 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Tue, 9 Dec 2008 20:50:25 -0600 Subject: Refactored; added LLInventoryFilter::rebuildFilterText(). --- ChangeLog.txt | 6 ++++++ linden/indra/newview/llfolderview.cpp | 5 +++++ linden/indra/newview/llfolderview.h | 1 + 3 files changed, 12 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 0ed5318..514d3af 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,6 +1,12 @@ 2008-12-09 Jacek Antonelli * linden/indra/newview/llfolderview.cpp: + Refactored; added LLInventoryFilter::rebuildFilterText(). + * linden/indra/newview/llfolderview.h: + Ditto. + + + * linden/indra/newview/llfolderview.cpp: Updated Inventory window filter text generation. It was putting the wrong types in the title when filtering. [#25] diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp index 2c5be34..58d0c42 100644 --- a/linden/indra/newview/llfolderview.cpp +++ b/linden/indra/newview/llfolderview.cpp @@ -4812,6 +4812,11 @@ std::string LLInventoryFilter::getFilterText() return mFilterText; } + return rebuildFilterText(); +} + +std::string LLInventoryFilter::rebuildFilterText() +{ mNeedTextRebuild = FALSE; std::string filtered_types; std::string not_filtered_types; diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h index 9134e0e..af3248d 100644 --- a/linden/indra/newview/llfolderview.h +++ b/linden/indra/newview/llfolderview.h @@ -222,6 +222,7 @@ public: void clearModified() { mModified = FALSE; mFilterBehavior = FILTER_NONE; } const std::string getName() const { return mName; } std::string getFilterText(); + std::string rebuildFilterText(); void setFilterCount(S32 count) { mFilterCount = count; } S32 getFilterCount() { return mFilterCount; } -- cgit v1.1