diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-07-19 22:24:33 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-07-19 22:24:33 +0000 |
| commit | 1b15b8cda7853e55a91fd0140311ed69f3cca677 (patch) | |
| tree | 33edfb0495161594a50dcfbed3a3f42e7fde9143 /indra/llui/llfolderviewmodel.cpp | |
| parent | dc14dbf54d332a6cdc43002bb71ed71e9a473647 (diff) | |
| parent | 4c849ba91363f82da05cce1221b04075a6ca72af (diff) | |
Merged in DV528-merge-6.4.22 (pull request #630)
DRTVWR-528 merge up to v 6.4.22
Diffstat (limited to 'indra/llui/llfolderviewmodel.cpp')
| -rw-r--r-- | indra/llui/llfolderviewmodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llfolderviewmodel.cpp b/indra/llui/llfolderviewmodel.cpp index ea106b5fae..93122503d1 100644 --- a/indra/llui/llfolderviewmodel.cpp +++ b/indra/llui/llfolderviewmodel.cpp @@ -48,9 +48,9 @@ std::string LLFolderViewModelCommon::getStatusText() void LLFolderViewModelCommon::filter() { - static LLCachedControl<S32> filter_visible(*LLUI::getInstance()->mSettingGroups["config"], "FilterItemsMaxTimePerFrameVisible", 10); - getFilter().resetTime(llclamp(filter_visible(), 1, 100)); - mFolderView->getViewModelItem()->filter(getFilter()); + static LLCachedControl<S32> max_time(*LLUI::getInstance()->mSettingGroups["config"], "FilterItemsMaxTimePerFrameVisible", 10); + getFilter().resetTime(llclamp(max_time(), 1, 100)); + mFolderView->getViewModelItem()->filter(getFilter()); } bool LLFolderViewModelItemCommon::hasFilterStringMatch() |