3 files changed, 29 insertions, 3 deletions

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 29d2f07..b042fb2 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -882,6 +882,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>UseLegacyChatLogsFolder</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable legacy chat log format (firstname_lastname instead of firstname_lastname@grid). Requires restart</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>UseUTCTime</key>
   <map>
     <key>Comment</key>
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();
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());