summaryrefslogtreecommitdiff
path: root/indra/llui/llviewquery.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-07-27 14:22:14 -0700
committerRichard Linden <none@none>2010-07-27 14:22:14 -0700
commit15247f086989a43881d79c1ee5416bb00721eb68 (patch)
treee77d629f6d03ed7ca471e77ccefcd9437be82c49 /indra/llui/llviewquery.cpp
parent5d85dad85f07ea23b3a2892276d8ac591a966864 (diff)
Backed out changeset: 58571b4e704b
Diffstat (limited to 'indra/llui/llviewquery.cpp')
-rw-r--r--indra/llui/llviewquery.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/llui/llviewquery.cpp b/indra/llui/llviewquery.cpp
index bdb3d223a6..1b44cc528e 100644
--- a/indra/llui/llviewquery.cpp
+++ b/indra/llui/llviewquery.cpp
@@ -95,8 +95,8 @@ viewList_t LLViewQuery::run(LLView* view) const
if (pre.first)
{
post = runFilters(view, filtered_children, mPostFilters);
+ }
}
- }
if(pre.first && post.first)
{
@@ -119,12 +119,12 @@ void LLViewQuery::filterChildren(LLView * view, viewList_t & filtered_children)
(*mSorterp)(view, views); // sort the children per the sorter
}
for(LLView::child_list_iter_t iter = views.begin();
- iter != views.end();
- iter++)
- {
- viewList_t indiv_children = this->run(*iter);
- filtered_children.insert(filtered_children.end(), indiv_children.begin(), indiv_children.end());
- }
+ iter != views.end();
+ iter++)
+ {
+ viewList_t indiv_children = this->run(*iter);
+ filtered_children.splice(filtered_children.end(), indiv_children);
+ }
}
filterResult_t LLViewQuery::runFilters(LLView * view, const viewList_t children, const filterList_t filters) const