diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-03-31 16:11:21 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-03-31 16:11:21 -0400 |
| commit | e504f895135eec69d9ec5ee31cdefc2ced145631 (patch) | |
| tree | 63c3c5391cd0d16bd23938e3a486442e051e8976 /indra/newview/llinventoryfilter.cpp | |
| parent | 2208e6da2ca9b9e94f5aa903d98a0167baf15577 (diff) | |
| parent | fc8c4ea485f34ef52b2c3e037124795e5df9c064 (diff) | |
merge
Diffstat (limited to 'indra/newview/llinventoryfilter.cpp')
| -rw-r--r-- | indra/newview/llinventoryfilter.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp index cd20d64ca8..1a488175ac 100644 --- a/indra/newview/llinventoryfilter.cpp +++ b/indra/newview/llinventoryfilter.cpp @@ -37,7 +37,8 @@ // viewer includes #include "llfoldervieweventlistener.h" #include "llfolderviewitem.h" -#include "llinventorymodel.h" // gInventory.backgroundFetchActive() +#include "llinventorymodel.h" +#include "llinventorymodelbackgroundfetch.h" #include "llviewercontrol.h" #include "llfolderview.h" @@ -713,7 +714,7 @@ const std::string& LLInventoryFilter::getFilterText() filtered_by_all_types = FALSE; } - if (!gInventory.backgroundFetchActive() + if (!LLInventoryModelBackgroundFetch::instance().backgroundFetchActive() && filtered_by_type && !filtered_by_all_types) { |