diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:21:55 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-16 01:21:55 +0200 |
| commit | 0505c6ebbb9060d215f61884d06f22d64d2aaf6d (patch) | |
| tree | 8e236beed1a7b69d97000f58d9b0ec2294488850 /indra/llvfs/lldir.cpp | |
| parent | 725fc6fa85cf17bd3c52e7e8a9ce75b3ee97b647 (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-534
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
Diffstat (limited to 'indra/llvfs/lldir.cpp')
| -rw-r--r-- | indra/llvfs/lldir.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 9e9abbadff..69b23f9cf8 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -337,6 +337,11 @@ const std::string &LLDir::getDumpDir() const return LLDir::sDumpDir; } +bool LLDir::dumpDirExists() const +{ + return !sDumpDir.empty(); +} + const std::string &LLDir::getPerAccountChatLogsDir() const { return mPerAccountChatLogsDir; @@ -888,6 +893,11 @@ std::string LLDir::getScrubbedFileName(const std::string uncleanFileName) return name; } +std::string LLDir::getDumpLogsDirPath(const std::string &file_name) +{ + return gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "dump_logs", file_name); +} + // static std::string LLDir::getForbiddenFileChars() { |