summaryrefslogtreecommitdiff
path: root/indra/llui/llview.h
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-07-30 10:07:14 -0700
committerRichard Nelson <none@none>2010-07-30 10:07:14 -0700
commit50005b81f7788cd7a372ab3009568bdb9e024a6e (patch)
tree829bd18ebb1ec90234973a980979ca92cebe38ff /indra/llui/llview.h
parent2051ba7248f11af083bbda9cd8b67be99d0d844b (diff)
parent9b526997d93d9290602a86f91a7f096da4395d97 (diff)
merge
Diffstat (limited to 'indra/llui/llview.h')
-rw-r--r--indra/llui/llview.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 8e705ed701..745a1b6e74 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -289,8 +289,6 @@ public:
// children, etc.
virtual void deleteAllChildren();
- virtual void setTentative(BOOL b);
- virtual BOOL getTentative() const;
void setAllChildrenEnabled(BOOL b);
virtual void setVisible(BOOL visible);
@@ -357,6 +355,10 @@ public:
tree_post_iterator_t beginTreeDFSPost();
tree_post_iterator_t endTreeDFSPost();
+ typedef LLTreeBFSIter<LLView, child_list_const_iter_t> bfs_tree_iterator_t;
+ bfs_tree_iterator_t beginTreeBFS();
+ bfs_tree_iterator_t endTreeBFS();
+
typedef LLTreeDownIter<LLView> root_to_view_iterator_t;
root_to_view_iterator_t beginRootToView();