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/llviewerinventory.cpp | |
| parent | 1751e6add7e9957106f628816f0808c92a67cc6c (diff) | |
| parent | d99a7d2f1d5d839131919d17173f5197c04083a6 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 75ec02f8ea..b42d25c1d8 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -44,7 +44,9 @@ #include "llfolderview.h" #include "llviewercontrol.h" #include "llconsole.h" +#include "llinventoryfunctions.h" #include "llinventorymodel.h" +#include "llinventorymodelbackgroundfetch.h" #include "llgesturemgr.h" #include "llsidetray.h" @@ -538,7 +540,7 @@ bool LLViewerInventoryCategory::fetchDescendents() std::string url = gAgent.getRegion()->getCapability("WebFetchInventoryDescendents"); if (!url.empty()) //Capability found. Build up LLSD and use it. { - gInventory.startBackgroundFetch(mUUID); + LLInventoryModelBackgroundFetch::instance().start(mUUID); } else { //Deprecated, but if we don't have a capability, use the old system. |