diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-19 12:57:03 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-19 12:57:03 -0800 |
| commit | 705e31f16ad2e9b530bc083db13d29cbc8613f82 (patch) | |
| tree | bbf7a443c649f4561e7f70a787b83e6555afe0d0 /indra/newview/llstartup.cpp | |
| parent | cd5cd11ccbd1ad13afd43c045735f01dbc994a80 (diff) | |
| parent | 85c97cab02b0f2ba89b7af05c14a69ff90ffa25e (diff) | |
PE merge.
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index ad88534a5d..88b4c34e2b 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -101,7 +101,6 @@ #include "llface.h" #include "llfeaturemanager.h" //#include "llfirstuse.h" -#include "llfloaterchat.h" #include "llfloaterhud.h" #include "llfloaterland.h" #include "llfloaterpreference.h" @@ -958,13 +957,6 @@ 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()); |