diff options
-rw-r--r-- | ChangeLog.txt | 6 | ||||
-rw-r--r-- | linden/indra/newview/llfolderview.cpp | 5 | ||||
-rw-r--r-- | linden/indra/newview/llfolderview.h | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 0ed5318..514d3af 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,6 +1,12 @@ | |||
1 | 2008-12-09 Jacek Antonelli <jacek.antonelli@gmail.com> | 1 | 2008-12-09 Jacek Antonelli <jacek.antonelli@gmail.com> |
2 | 2 | ||
3 | * linden/indra/newview/llfolderview.cpp: | 3 | * linden/indra/newview/llfolderview.cpp: |
4 | Refactored; added LLInventoryFilter::rebuildFilterText(). | ||
5 | * linden/indra/newview/llfolderview.h: | ||
6 | Ditto. | ||
7 | |||
8 | |||
9 | * linden/indra/newview/llfolderview.cpp: | ||
4 | Updated Inventory window filter text generation. | 10 | Updated Inventory window filter text generation. |
5 | It was putting the wrong types in the title when | 11 | It was putting the wrong types in the title when |
6 | filtering. [#25] | 12 | 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() | |||
4812 | return mFilterText; | 4812 | return mFilterText; |
4813 | } | 4813 | } |
4814 | 4814 | ||
4815 | return rebuildFilterText(); | ||
4816 | } | ||
4817 | |||
4818 | std::string LLInventoryFilter::rebuildFilterText() | ||
4819 | { | ||
4815 | mNeedTextRebuild = FALSE; | 4820 | mNeedTextRebuild = FALSE; |
4816 | std::string filtered_types; | 4821 | std::string filtered_types; |
4817 | std::string not_filtered_types; | 4822 | 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: | |||
222 | void clearModified() { mModified = FALSE; mFilterBehavior = FILTER_NONE; } | 222 | void clearModified() { mModified = FALSE; mFilterBehavior = FILTER_NONE; } |
223 | const std::string getName() const { return mName; } | 223 | const std::string getName() const { return mName; } |
224 | std::string getFilterText(); | 224 | std::string getFilterText(); |
225 | std::string rebuildFilterText(); | ||
225 | 226 | ||
226 | void setFilterCount(S32 count) { mFilterCount = count; } | 227 | void setFilterCount(S32 count) { mFilterCount = count; } |
227 | S32 getFilterCount() { return mFilterCount; } | 228 | S32 getFilterCount() { return mFilterCount; } |