diff options
| author | Richard Linden <none@none> | 2012-08-01 01:14:27 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-08-01 01:14:27 -0700 |
| commit | a204059d2e69fb33cb1a3c8d2fbed35d3967297c (patch) | |
| tree | 94d73465750ae665f5915588705430172a9ef7da /indra/llui/llfolderviewmodel.cpp | |
| parent | 8f7871911deba87e5ceed8f6f36c1cb2b429efe8 (diff) | |
CHUI-267 FIX Full inventory listing not always shown for test account
changed LLFolderViewModelInterface::getFilter() to return a reference, since it is never NULL
removed sort order from filter, which was causing unneeded filtering
Diffstat (limited to 'indra/llui/llfolderviewmodel.cpp')
| -rw-r--r-- | indra/llui/llfolderviewmodel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llui/llfolderviewmodel.cpp b/indra/llui/llfolderviewmodel.cpp index dc6e4d754b..6aa4a63edc 100644 --- a/indra/llui/llfolderviewmodel.cpp +++ b/indra/llui/llfolderviewmodel.cpp @@ -36,18 +36,18 @@ bool LLFolderViewModelCommon::needsSort(LLFolderViewModelItem* item) std::string LLFolderViewModelCommon::getStatusText() { - if (!contentsReady() || mFolderView->getViewModelItem()->getLastFilterGeneration() < getFilter()->getCurrentGeneration()) + if (!contentsReady() || mFolderView->getViewModelItem()->getLastFilterGeneration() < getFilter().getCurrentGeneration()) { return LLTrans::getString("Searching"); } else { - return getFilter()->getEmptyLookupMessage(); + return getFilter().getEmptyLookupMessage(); } } void LLFolderViewModelCommon::filter() { - getFilter()->setFilterCount(llclamp(LLUI::sSettingGroups["config"]->getS32("FilterItemsPerFrame"), 1, 5000)); - mFolderView->getViewModelItem()->filter(*getFilter()); + getFilter().setFilterCount(llclamp(LLUI::sSettingGroups["config"]->getS32("FilterItemsPerFrame"), 1, 5000)); + mFolderView->getViewModelItem()->filter(getFilter()); } |