diff options
| author | Richard Linden <none@none> | 2010-07-09 14:26:56 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-09 14:26:56 -0700 |
| commit | 1f79bee86ee65a2eb3800db6be1853dd79d7a49d (patch) | |
| tree | da6b0df3f35ede4037a3e0bf36cf4c6d07dd4a28 /indra/llui/llviewquery.cpp | |
| parent | 419bfb16fdd9b79d32736fd80652685a07f9e39f (diff) | |
EXT-8237 FIX Opening up Edit Outfit- Add More->Shirt causes FPS to drop from 60fps to 18fps for a really long time
EXT-8235 FIX HUGE long delay when reopening and/or closing edit outfit sidepanel if "Add More..." is active
EXT-7695 FIX UI lockup after add wearable, right click av -> Change Outfit
reviewed by Vir
Diffstat (limited to 'indra/llui/llviewquery.cpp')
| -rw-r--r-- | indra/llui/llviewquery.cpp | 14 |
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 |