summaryrefslogtreecommitdiff
path: root/indra/llui/llfolderviewmodel.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2019-08-12 09:58:08 -0400
committerNat Goodspeed <nat@lindenlab.com>2019-08-12 09:58:08 -0400
commit5a72d34b7676031da35f93c91eda3eab01085aff (patch)
tree4677bc0b7330af7ff142d286eb4feee5126a8d7e /indra/llui/llfolderviewmodel.cpp
parentf0fa4f94a5400fe5d21cf5bf7570129916bf9787 (diff)
parent98be6e141c1232bad28cc115bc7092f175b18809 (diff)
Automated merge with file:///Users/nat/linden/viewer-catch
Diffstat (limited to 'indra/llui/llfolderviewmodel.cpp')
-rw-r--r--indra/llui/llfolderviewmodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llfolderviewmodel.cpp b/indra/llui/llfolderviewmodel.cpp
index 3363dc5316..3b45fb53a2 100644
--- a/indra/llui/llfolderviewmodel.cpp
+++ b/indra/llui/llfolderviewmodel.cpp
@@ -48,7 +48,7 @@ std::string LLFolderViewModelCommon::getStatusText()
void LLFolderViewModelCommon::filter()
{
- getFilter().resetTime(llclamp(LLUI::sSettingGroups["config"]->getS32("FilterItemsMaxTimePerFrameVisible"), 1, 100));
+ getFilter().resetTime(llclamp(LLUI::getInstance()->mSettingGroups["config"]->getS32("FilterItemsMaxTimePerFrameVisible"), 1, 100));
mFolderView->getViewModelItem()->filter(getFilter());
}