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/llstartup.cpp | |
| parent | 1751e6add7e9957106f628816f0808c92a67cc6c (diff) | |
| parent | d99a7d2f1d5d839131919d17173f5197c04083a6 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index d75a1424d2..1a1dffe85c 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -62,6 +62,7 @@ #include "llimfloater.h" #include "lllocationhistory.h" #include "llimageworker.h" + #include "llloginflags.h" #include "llmd5.h" #include "llmemorystream.h" @@ -116,6 +117,7 @@ #include "llimagebmp.h" #include "llinventorybridge.h" #include "llinventorymodel.h" +#include "llinventorymodelbackgroundfetch.h" #include "llfriendcard.h" #include "llkeyboard.h" #include "llloginhandler.h" // gLoginHandler, SLURL support @@ -1846,7 +1848,7 @@ bool idle_startup() } //DEV-17797. get null folder. Any items found here moved to Lost and Found - LLInventoryModel::findLostItems(); + LLInventoryModelBackgroundFetch::instance().findLostItems(); LLStartUp::setStartupState( STATE_PRECACHE ); timeout.reset(); |