1 files changed, 16 insertions, 8 deletions

diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index e4df977..af55593 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -542,19 +542,23 @@ void LLDir::setLindenUserDir(const std::string &grid, const std::string &first,
         {
                 // 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;
+
+                if (!grid.empty())
+                {
+                        std::string gridlower(grid);
+                        LLStringUtil::toLower(gridlower);
+                        mLindenUserDir += "@";
+                        mLindenUserDir += gridlower;
+                }
         }
         else
         {
@@ -583,19 +587,23 @@ void LLDir::setPerAccountChatLogsDir(const std::string &grid, const std::string
         {
                 // 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;
+
+                if (!grid.empty())
+                {
+                        std::string gridlower(grid);
+                        LLStringUtil::toLower(gridlower);
+                        mPerAccountChatLogsDir += "@";
+                        mPerAccountChatLogsDir += gridlower;
+                }
         }
         else
         {