diff options
| author | Richard Linden <none@none> | 2012-02-09 17:14:57 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-09 17:14:57 -0800 |
| commit | ef81320c3198e8f63eddeeecd99799747acfe3f9 (patch) | |
| tree | 816ce0df7ef35c308414953798c92be5e4ee1771 /indra/newview/llinventoryfilter.cpp | |
| parent | b72f1b59e8b673d9834bf18a466ec38e40650511 (diff) | |
| parent | aa345bd8f3844bdc2c5318d14b26343b91e6e573 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
Diffstat (limited to 'indra/newview/llinventoryfilter.cpp')
| -rw-r--r-- | indra/newview/llinventoryfilter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index 177ab28b36..4971ded634 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -884,7 +884,7 @@ const std::string& LLInventoryFilter::getFilterText() filtered_by_all_types = FALSE; } - if (!LLInventoryModelBackgroundFetch::instance().backgroundFetchActive() + if (!LLInventoryModelBackgroundFetch::instance().folderFetchActive() && filtered_by_type && !filtered_by_all_types) { |