diff options
| author | Richard Linden <none@none> | 2013-09-09 20:19:36 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-09 20:19:36 -0700 |
| commit | ddd9d1396cd378cbcd332d26d8b6b7092716c1bc (patch) | |
| tree | 767a40da9fdd2f3ae0c89b1d6cd5135884c4e8c9 /indra/llui/llfolderviewmodel.cpp | |
| parent | 21ab67416d471a90b343052c986478c9dd65ae79 (diff) | |
| parent | 52da9f5f49e0e300943abc3afa6944e6bee0cdd1 (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()); } |