Merge from default branch

--HG--
branch : product-engine

1 files changed, 7 insertions, 7 deletions

diff --git a/indra/llui/llviewquery.cpp b/indra/llui/llviewquery.cpp
index 1b44cc528e..bdb3d223a6 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.splice(filtered_children.end(), indiv_children);
-	}
+			iter != views.end();
+			iter++)
+		{
+			viewList_t indiv_children = this->run(*iter);
+			filtered_children.insert(filtered_children.end(), indiv_children.begin(), indiv_children.end());
+		}
 }
 
 filterResult_t LLViewQuery::runFilters(LLView * view, const viewList_t children, const filterList_t filters) const