diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-31 16:49:26 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-03-31 16:49:26 +0300 |
| commit | 349bc84dfd73702fe788f9ac4539d8046b78e9f3 (patch) | |
| tree | 4a0f772749ae4c21712fdb07eaabdb5b8a435a68 /indra/newview/llinventoryfilter.cpp | |
| parent | 0a0f6dec5f6128990f4116c1f90e19691e30c3d2 (diff) | |
| parent | 8ef5fd0e144af53e6044c0dfc15fda9b36bdd85a (diff) | |
merge
--HG--
branch : product-engine
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) { |