diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-09-04 13:41:51 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-09-04 13:41:51 -0400 |
| commit | 144eb1912def502dfd5d9f7d224949309300e14b (patch) | |
| tree | 630ca7e454c97bd9bae42da3db02f5e3ff1f0bf5 /indra/llui/llfolderviewmodel.cpp | |
| parent | cda8a75dd69789d0d9f77c76ab0c461e8791fd60 (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) | |
merge
Diffstat (limited to 'indra/llui/llfolderviewmodel.cpp')
| -rwxr-xr-x | indra/llui/llfolderviewmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfolderviewmodel.cpp b/indra/llui/llfolderviewmodel.cpp index 3593804554..3363dc5316 100755 --- a/indra/llui/llfolderviewmodel.cpp +++ b/indra/llui/llfolderviewmodel.cpp @@ -48,7 +48,7 @@ std::string LLFolderViewModelCommon::getStatusText() void LLFolderViewModelCommon::filter() { - getFilter().setFilterCount(llclamp(LLUI::sSettingGroups["config"]->getS32("FilterItemsPerFrame"), 1, 5000)); + getFilter().resetTime(llclamp(LLUI::sSettingGroups["config"]->getS32("FilterItemsMaxTimePerFrameVisible"), 1, 100)); mFolderView->getViewModelItem()->filter(getFilter()); } |