1 files changed, 10 insertions, 2 deletions

diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index 045139c..e7c39e2 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -190,8 +190,16 @@ void LLPrefsIMImpl::apply()
 
                 gDirUtilp->setChatLogsDir(gSavedPerAccountSettings.getString("InstantMessageLogPath"));
 
-                gDirUtilp->setPerAccountChatLogsDir(gHippoGridManager->getCurrentGridNick(), gSavedSettings.getString("FirstName"), 
-                                                                                        gSavedSettings.getString("LastName") );
+                if (gSavedSettings.getBOOL("UseLegacyChatLogsFolder"))
+                {
+                        gDirUtilp->setPerAccountChatLogsDir(LLStringUtil::null, 
+                                gSavedSettings.getString("FirstName"), gSavedSettings.getString("LastName") );
+                }
+                else
+                {
+                        gDirUtilp->setPerAccountChatLogsDir(gHippoGridManager->getCurrentGridNick(), 
+                                gSavedSettings.getString("FirstName"), gSavedSettings.getString("LastName") );
+                }
                 LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir());
                 
                 bool new_im_via_email = childGetValue("send_im_to_email").asBoolean();