diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-19 04:33:53 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-19 04:33:53 +0200 |
| commit | caa780fd3a752377f86f7928c8b374951cbe3783 (patch) | |
| tree | 1d3da4ad7cf60d18126fd4519e2ee4d2cd82556b /indra/llvfs/lldir.h | |
| parent | b10f0bbd46e5119521a7b560db4a7bfa339276dc (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/newview/llvoicevivox.cpp
Diffstat (limited to 'indra/llvfs/lldir.h')
| -rw-r--r-- | indra/llvfs/lldir.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llvfs/lldir.h b/indra/llvfs/lldir.h index 4988b9c6e3..b9a046ba33 100644 --- a/indra/llvfs/lldir.h +++ b/indra/llvfs/lldir.h @@ -90,6 +90,7 @@ class LLDir const std::string &getLindenUserDir() const; // Location of the Linden user dir. const std::string &getChatLogsDir() const; // Location of the chat logs dir. const std::string &getDumpDir() const; // Location of the per-run dump dir. + bool dumpDirExists() const; const std::string &getPerAccountChatLogsDir() const; // Location of the per account chat logs dir. const std::string &getTempDir() const; // Common temporary directory const std::string getCacheDir(bool get_default = false) const; // Location of the cache. @@ -174,6 +175,8 @@ class LLDir // random filename in common temporary directory std::string getTempFilename() const; + static std::string getDumpLogsDirPath(const std::string &file_name = ""); + // For producing safe download file names from potentially unsafe ones static std::string getScrubbedFileName(const std::string uncleanFileName); static std::string getForbiddenFileChars(); |