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/llstartup.cpp | |
| parent | 0a0f6dec5f6128990f4116c1f90e19691e30c3d2 (diff) | |
| parent | 8ef5fd0e144af53e6044c0dfc15fda9b36bdd85a (diff) | |
merge
--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(); |