diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-14 20:28:07 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-14 20:28:07 +0000 |
| commit | 7475ec05fc81e358a6979f3e9d7050ab91511c57 (patch) | |
| tree | 6f8f3f6f02cf41e45827c37fb9a3970780851865 /indra/newview/llstartup.cpp | |
| parent | fd312d1929de708e5765cf1b3815cb61752fc355 (diff) | |
merge -r 2005-2011 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
* Bugs: EXT-1472 EXT-996
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 9cd3acf13e..45763dd8a7 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -189,6 +189,7 @@ #include "llwearable.h" #include "llinventorybridge.h" #include "llappearancemgr.h" +#include "llavatariconctrl.h" #if LL_WINDOWS #include "llwindebug.h" @@ -1021,6 +1022,9 @@ bool idle_startup() // Load location history LLLocationHistory::getInstance()->load(); + // Load Avatars icons cache + LLAvatarIconIDCache::getInstance()->load(); + //------------------------------------------------- // Handle startup progress screen //------------------------------------------------- |