diff options
| author | Richard Linden <none@none> | 2012-02-15 10:24:45 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-15 10:24:45 -0800 |
| commit | a45ee6607b0b092cba26815417c734180fca3265 (patch) | |
| tree | 4303e7b3ade97a080c6a0cd8d825d601db72ac5c /indra/newview/llinventoryfilter.cpp | |
| parent | 54900461f98a57c602e624aec86338a07b825462 (diff) | |
| parent | 51a8134f62ff0705ede2534945e808ccbd9d6b7e (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) { |