diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-03-31 10:08:50 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-03-31 10:08:50 +0300 |
| commit | bba457e889e45a43d1aba2541ee1dab1e07dd979 (patch) | |
| tree | 19c5e5c364c1fa1764d615e89683244aecf6373b /indra/newview/llinventoryfilter.cpp | |
| parent | 1751e6add7e9957106f628816f0808c92a67cc6c (diff) | |
| parent | d99a7d2f1d5d839131919d17173f5197c04083a6 (diff) | |
Merge from default branch
--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) { |