diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-11-12 15:47:04 +0000 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-11-12 15:47:04 +0000 |
commit | 6e76e20faaa71caa10fdea8148735bd11141ebe1 (patch) | |
tree | c174e7cc65e82e3efd7d119e5644162187369c04 /indra/newview/llsearchableui.cpp | |
parent | f9a09406b38ad62e1db5914a96e462002c80fce9 (diff) | |
parent | 21e2f3e974cfe8e337a7dae7dc26e68fb3c2c4ba (diff) |
Merged in DV510-merge-6.4.12 (pull request #372)
DRTVWR-510 merge in 6.4.12
Diffstat (limited to 'indra/newview/llsearchableui.cpp')
-rw-r--r-- | indra/newview/llsearchableui.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/llsearchableui.cpp b/indra/newview/llsearchableui.cpp index 93143eb33f..1119e80005 100644 --- a/indra/newview/llsearchableui.cpp +++ b/indra/newview/llsearchableui.cpp @@ -68,7 +68,10 @@ ll::prefs::PanelData::~PanelData() bool ll::prefs::PanelData::hightlightAndHide( LLWString const &aFilter ) { for( tSearchableItemList::iterator itr = mChildren.begin(); itr != mChildren.end(); ++itr ) - (*itr)->setNotHighlighted( ); + (*itr)->setNotHighlighted(); + + for (tPanelDataList::iterator itr = mChildPanel.begin(); itr != mChildPanel.end(); ++itr) + (*itr)->setNotHighlighted(); if (aFilter.empty()) { @@ -85,6 +88,15 @@ bool ll::prefs::PanelData::hightlightAndHide( LLWString const &aFilter ) return bVisible; } +void ll::prefs::PanelData::setNotHighlighted() +{ + for (tSearchableItemList::iterator itr = mChildren.begin(); itr != mChildren.end(); ++itr) + (*itr)->setNotHighlighted(); + + for (tPanelDataList::iterator itr = mChildPanel.begin(); itr != mChildPanel.end(); ++itr) + (*itr)->setNotHighlighted(); +} + bool ll::prefs::TabContainerData::hightlightAndHide( LLWString const &aFilter ) { for( tSearchableItemList::iterator itr = mChildren.begin(); itr != mChildren.end(); ++itr ) |