diff options
| author | RolfKal <rolf.kalbermatter@kalbermatter.nl> | 2025-10-15 20:00:27 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-10-21 00:50:27 +0300 |
| commit | 49a850ccc14de253f9645427594f25c74931e4c5 (patch) | |
| tree | c214fa26bcca008569f4405cd9ec6a3d70766c65 | |
| parent | e12958161c6f4edec1300db2045bba97aff26048 (diff) | |
Remove a trailing space and a missed LLFile::remove() call right before the LLFile::rename()
| -rw-r--r-- | indra/llcommon/llfile.h | 2 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/llfile.h b/indra/llcommon/llfile.h index 0bd6be7f94..9d9c3cd08b 100644 --- a/indra/llcommon/llfile.h +++ b/indra/llcommon/llfile.h @@ -107,7 +107,7 @@ public: /// if you don't want a warning in the log when the directory does not exist /// @returns 0 on success and -1 on failure. - /// rename a file, + /// rename a file static int rename(const std::string& filename, const std::string& newname, int supress_error = 0); ///< it will silently overwrite newname if it exists without returning an error /// @returns 0 on success and -1 on failure. diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index eadc5e7e63..bfd8b1dcc7 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2398,7 +2398,6 @@ void LLAppViewer::initLoggingAndGetLastDuration() if (gDirUtilp->fileExists(user_data_path_cef_log)) { std::string user_data_path_cef_old = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "cef.old"); - LLFile::remove(user_data_path_cef_old, ENOENT); LLFile::rename(user_data_path_cef_log, user_data_path_cef_old); } } |