diff options
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index fed6836588..26c8030dd1 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -187,6 +187,7 @@ #include "llwearable.h" #include "llinventorybridge.h" #include "llappearancemgr.h" +#include "llavatariconctrl.h" #include "lllogin.h" #include "llevents.h" @@ -963,6 +964,13 @@ bool idle_startup() LLFile::mkdir(gDirUtilp->getChatLogsDir()); LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir()); + // chat history must be loaded AFTER chat directories are defined. + if (!gNoRender && gSavedPerAccountSettings.getBOOL("LogShowHistory")) + { + LLFloaterChat::loadHistory(); + } + + //good as place as any to create user windlight directories std::string user_windlight_path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight", "")); LLFile::mkdir(user_windlight_path_name.c_str()); @@ -993,6 +1001,9 @@ bool idle_startup() // Load location history LLLocationHistory::getInstance()->load(); + // Load Avatars icons cache + LLAvatarIconIDCache::getInstance()->load(); + //------------------------------------------------- // Handle startup progress screen //------------------------------------------------- |