diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 12:24:16 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 12:24:16 -0400 |
| commit | 9463f10b3332d34655006f4ba5127b114ca6e0c3 (patch) | |
| tree | 2e5e3226fbae28cba66e473edc09ccc9f8bd50cf /indra/llui/llfolderviewmodel.cpp | |
| parent | 7137647e90d8c11197513f542f04fb39b483d663 (diff) | |
| parent | b1098308428873e927cbf3c956ed0a7f17dc439b (diff) | |
Merge branch 'release/luau-scripting' into lua-timers after Maint X
Diffstat (limited to 'indra/llui/llfolderviewmodel.cpp')
| -rw-r--r-- | indra/llui/llfolderviewmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llfolderviewmodel.cpp b/indra/llui/llfolderviewmodel.cpp index c7ed65bdfa..d9e6567cd6 100644 --- a/indra/llui/llfolderviewmodel.cpp +++ b/indra/llui/llfolderviewmodel.cpp @@ -48,8 +48,8 @@ std::string LLFolderViewModelCommon::getStatusText(bool is_empty_folder) void LLFolderViewModelCommon::filter() { - static LLCachedControl<S32> max_time(*LLUI::getInstance()->mSettingGroups["config"], "FilterItemsMaxTimePerFrameVisible", 10); - getFilter().resetTime(llclamp(max_time(), 1, 100)); + const S32 MAX_FILTER_TIME = 10; + getFilter().resetTime(MAX_FILTER_TIME); mFolderView->getViewModelItem()->filter(getFilter()); } |