Merge commit 'b3c39a47e76f595fd953d9ccffc58b0dfb8359db' into armin-1.2.0-next

1 files changed, 3 insertions, 1 deletions

diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index 5cb14fc..3d71202 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -46,6 +46,8 @@
 
 #include "lldirpicker.h"
 
+#include "hippoGridManager.h"
+
 class LLPrefsIMImpl : public LLPanel
 {
 public:
@@ -181,7 +183,7 @@ void LLPrefsIMImpl::apply()
 
                 gDirUtilp->setChatLogsDir(gSavedPerAccountSettings.getString("InstantMessageLogPath"));
 
-                gDirUtilp->setPerAccountChatLogsDir(gSavedSettings.getString("FirstName"), 
+                gDirUtilp->setPerAccountChatLogsDir(gHippoGridManager->getCurrentGridNick(), gSavedSettings.getString("FirstName"), 
                                                                                         gSavedSettings.getString("LastName") );
                 LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir());