1 files changed, 8 insertions, 1 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 0464e99..301e67c 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -936,7 +936,14 @@ bool idle_startup()
                         gDirUtilp->setChatLogsDir(gSavedPerAccountSettings.getString("InstantMessageLogPath"));         
                 }
                 
-                gDirUtilp->setPerAccountChatLogsDir(gHippoGridManager->getCurrentGridNick(), firstname, lastname);
+                if (gSavedSettings.getBOOL("UseLegacyChatLogsFolder"))
+                {
+                        gDirUtilp->setPerAccountChatLogsDir(LLStringUtil::null, firstname, lastname);
+                }
+                else
+                {
+                        gDirUtilp->setPerAccountChatLogsDir(gHippoGridManager->getCurrentGridNick(), firstname, lastname);
+                }
 
                 LLFile::mkdir(gDirUtilp->getChatLogsDir());
                 LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir());