diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-07 14:47:25 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-07 14:47:25 -0400 |
| commit | 52293aa4bb7af45d2c3733f20982f4acb030c2d8 (patch) | |
| tree | f963815f91b6259ea403d41807d19b69e759897e /indra/llvfs/lldir.cpp | |
| parent | 516ec63f52245a777725d29efe3c35e4e4e72936 (diff) | |
| parent | 8ac6310020bd2d524c97c729c29a0afe4a529ecf (diff) | |
automated merge
Diffstat (limited to 'indra/llvfs/lldir.cpp')
| -rw-r--r-- | indra/llvfs/lldir.cpp | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index b4ee42ef3a..da4abde451 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -459,6 +459,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd } //llinfos << "*** EXPANDED FILENAME: <" << expanded_filename << ">" << llendl; + return expanded_filename; } @@ -564,23 +565,27 @@ std::string LLDir::getForbiddenFileChars() return "\\/:*?\"<>|"; } -void LLDir::setLindenUserDir(const std::string &username) +void LLDir::setLindenUserDir(const std::string &first, const std::string &last) { - // if the username isn't set, that's bad - if (!username.empty()) + // if both first and last aren't set, that's bad. + if (!first.empty() && !last.empty()) { // some platforms have case-sensitive filesystems, so be // utterly consistent with our firstname/lastname case. - std::string userlower(username); - LLStringUtil::toLower(userlower); - LLStringUtil::replaceChar(userlower, ' ', '_'); + std::string firstlower(first); + LLStringUtil::toLower(firstlower); + std::string lastlower(last); + LLStringUtil::toLower(lastlower); mLindenUserDir = getOSUserAppDir(); mLindenUserDir += mDirDelimiter; - mLindenUserDir += userlower; + mLindenUserDir += firstlower; + mLindenUserDir += "_"; + mLindenUserDir += lastlower; + llinfos << "Got name for LLDir::setLindenUserDir(first='" << first << "', last='" << last << "')" << llendl; } else { - llerrs << "NULL name for LLDir::setLindenUserDir" << llendl; + llerrs << "Invalid name for LLDir::setLindenUserDir(first='" << first << "', last='" << last << "')" << llendl; } dumpCurrentDirectories(); @@ -598,25 +603,27 @@ void LLDir::setChatLogsDir(const std::string &path) } } -void LLDir::setPerAccountChatLogsDir(const std::string &username) +void LLDir::setPerAccountChatLogsDir(const std::string &first, const std::string &last) { // if both first and last aren't set, assume we're grabbing the cached dir - if (!username.empty()) + if (!first.empty() && !last.empty()) { // some platforms have case-sensitive filesystems, so be // utterly consistent with our firstname/lastname case. - std::string userlower(username); - LLStringUtil::toLower(userlower); - LLStringUtil::replaceChar(userlower, ' ', '_'); + std::string firstlower(first); + LLStringUtil::toLower(firstlower); + std::string lastlower(last); + LLStringUtil::toLower(lastlower); mPerAccountChatLogsDir = getChatLogsDir(); mPerAccountChatLogsDir += mDirDelimiter; - mPerAccountChatLogsDir += userlower; + mPerAccountChatLogsDir += firstlower; + mPerAccountChatLogsDir += "_"; + mPerAccountChatLogsDir += lastlower; } else { - llerrs << "NULL name for LLDir::setPerAccountChatLogsDir" << llendl; + llwarns << "Invalid name for LLDir::setPerAccountChatLogsDir" << llendl; } - } void LLDir::setSkinFolder(const std::string &skin_folder) |