Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 10 insertions, 2 deletions

diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index f695c4c..29a3771 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -535,19 +535,23 @@ std::string LLDir::getForbiddenFileChars()
         return "\\/:*?\"<>|";
 }
 
-void LLDir::setLindenUserDir(const std::string &first, const std::string &last)
+void LLDir::setLindenUserDir(const std::string &grid, const std::string &first, const std::string &last)
 {
         // if both first and last aren't set, assume we're grabbing the cached dir
         if (!first.empty() && !last.empty())
         {
                 // some platforms have case-sensitive filesystems, so be
                 // utterly consistent with our firstname/lastname case.
+                // std::string gridlower(grid);
+                // LLStringUtil::toLower(gridlower);
                 std::string firstlower(first);
                 LLStringUtil::toLower(firstlower);
                 std::string lastlower(last);
                 LLStringUtil::toLower(lastlower);
                 mLindenUserDir = getOSUserAppDir();
                 mLindenUserDir += mDirDelimiter;
+                // mLindenUserDir += gridlower;
+                // mLindenUserDir += "-";
                 mLindenUserDir += firstlower;
                 mLindenUserDir += "_";
                 mLindenUserDir += lastlower;
@@ -572,19 +576,23 @@ void LLDir::setChatLogsDir(const std::string &path)
         }
 }
 
-void LLDir::setPerAccountChatLogsDir(const std::string &first, const std::string &last)
+void LLDir::setPerAccountChatLogsDir(const std::string &grid, const std::string &first, const std::string &last)
 {
         // if both first and last aren't set, assume we're grabbing the cached dir
         if (!first.empty() && !last.empty())
         {
                 // some platforms have case-sensitive filesystems, so be
                 // utterly consistent with our firstname/lastname case.
+                // std::string gridlower(grid);
+                // LLStringUtil::toLower(gridlower);
                 std::string firstlower(first);
                 LLStringUtil::toLower(firstlower);
                 std::string lastlower(last);
                 LLStringUtil::toLower(lastlower);
                 mPerAccountChatLogsDir = getChatLogsDir();
                 mPerAccountChatLogsDir += mDirDelimiter;
+                // mPerAccountChatLogsDir += gridlower;
+                // mPerAccountChatLogsDir += "-";
                 mPerAccountChatLogsDir += firstlower;
                 mPerAccountChatLogsDir += "_";
                 mPerAccountChatLogsDir += lastlower;