diff options
| author | simon <none@none> | 2013-08-26 14:43:23 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-08-26 14:43:23 -0700 |
| commit | 27d637d0f14fdfff496256222dc1343d2d7ee9ae (patch) | |
| tree | 32b0f244e480cfddaa67fa89df40ad7c824adfc9 /indra/llui/llfolderviewmodel.cpp | |
| parent | 3f5e6280dbee3414d464a96a8d9d037c30adb123 (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) | |
Merge downstream code from CHUIStorm release
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()); } |