summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth ProductEngine <slitovchuk@productengine.com>2012-07-30 19:38:27 +0300
committerSeth ProductEngine <slitovchuk@productengine.com>2012-07-30 19:38:27 +0300
commit209fd15176647a4b8defbb6e66daea6eb12d4b42 (patch)
tree077ca766062bf336f1161656e5a7bf0252c3ad9d
parent0b5abcfa8e2adbeb9c9f12644f36ee2c4daee560 (diff)
CHUI-244 FIX for propagating the dirty filter flag to the folder view item's parent.
The filter dirty flag is set after a new child item is added to ensure that this item already has a parent and the dirty flag can be bubbled up.
-rw-r--r--indra/llui/llfolderviewitem.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 777e778bc0..b9b6ea7444 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -1492,8 +1492,6 @@ BOOL LLFolderViewFolder::addItem(LLFolderViewItem* item)
item->setVisible(FALSE);
addChild(item);
-
- item->getViewModelItem()->dirtyFilter();
// TODO RN - port creation date management to new code location
#if 0
@@ -1531,6 +1529,8 @@ BOOL LLFolderViewFolder::addItem(LLFolderViewItem* item)
// parentp = parentp->getParentFolder();
//}
+ item->getViewModelItem()->dirtyFilter();
+
return TRUE;
}
@@ -1547,13 +1547,14 @@ BOOL LLFolderViewFolder::addFolder(LLFolderViewFolder* folder)
folder->reshape(getRect().getWidth(), 0);
folder->setVisible(FALSE);
addChild( folder );
- folder->getViewModelItem()->dirtyFilter();
// rearrange all descendants too, as our indentation level might have changed
folder->requestArrange();
requestSort();
getViewModelItem()->addChild(folder->getViewModelItem());
+ folder->getViewModelItem()->dirtyFilter();
+
return TRUE;
}