summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-07-25 18:20:54 -0700
committerRichard Linden <none@none>2012-07-25 18:20:54 -0700
commitf6dfd6bf0f3ea0e9b5f56a939867353c393539d6 (patch)
treef984a81438ce719beca9318fdc8e7a2fafe7cb48 /indra/llui
parentc4f59fd5882d8b019830292e9e5ed1d2480f73ef (diff)
CHUI-222 FIX Selecting None in inventory filters does not update until inventory selected
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llfolderview.cpp2
-rw-r--r--indra/llui/llfolderviewitem.cpp11
-rw-r--r--indra/llui/llfolderviewmodel.h4
3 files changed, 10 insertions, 7 deletions
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index 10729a3eae..147af04f30 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -266,8 +266,6 @@ LLFolderView::~LLFolderView( void )
mItems.clear();
mFolders.clear();
- //product engine bugfix, prevent deletion of non-heap data
- //delete mViewModel;
mViewModel = NULL;
}
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 741fc9c324..a356d587f9 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -1543,11 +1543,14 @@ BOOL LLFolderViewFolder::addFolder(LLFolderViewFolder* folder)
void LLFolderViewFolder::requestArrange()
{
- mLastArrangeGeneration = -1;
- // flag all items up to root
- if (mParentFolder)
+ //if ( mLastArrangeGeneration != -1)
{
- mParentFolder->requestArrange();
+ mLastArrangeGeneration = -1;
+ // flag all items up to root
+ if (mParentFolder)
+ {
+ mParentFolder->requestArrange();
+ }
}
}
diff --git a/indra/llui/llfolderviewmodel.h b/indra/llui/llfolderviewmodel.h
index 268ae8eea8..acdec53602 100644
--- a/indra/llui/llfolderviewmodel.h
+++ b/indra/llui/llfolderviewmodel.h
@@ -152,7 +152,7 @@ public:
virtual bool potentiallyVisible() = 0; // is the item definitely visible or we haven't made up our minds yet?
- virtual bool filter( LLFolderViewFilter& filter) = 0;
+ virtual void filter( LLFolderViewFilter& filter) = 0;
virtual bool passedFilter(S32 filter_generation = -1) = 0;
virtual bool descendantsPassedFilter(S32 filter_generation = -1) = 0;
virtual void setPassedFilter(bool passed, bool passed_folder, S32 filter_generation) = 0;
@@ -192,6 +192,7 @@ public:
: mSortVersion(-1),
mPassedFilter(true),
mPassedFolderFilter(true),
+ mPrevPassedAllFilters(false),
mFolderViewItem(NULL),
mLastFilterGeneration(-1),
mMostFilteredDescendantGeneration(-1),
@@ -232,6 +233,7 @@ protected:
S32 mSortVersion;
bool mPassedFilter;
bool mPassedFolderFilter;
+ bool mPrevPassedAllFilters;
S32 mLastFilterGeneration;
S32 mMostFilteredDescendantGeneration;