diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-08-26 14:31:53 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-08-26 14:31:53 -0700 |
| commit | 6e410c31c4f84247586312fa7763a2eb3a8db9da (patch) | |
| tree | 9540cc49b0c7aabd56869feaa9fbf48b34f12f2e /indra/llui/llfolderviewmodel.cpp | |
| parent | 8675ed0491efee860ac1b2d1d5fe88d150768217 (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) | |
Merge the CHUIstorm 3.6.5
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()); } |