From 623a484ae36f6f37801a95f676c82e20d838ca51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Mon, 13 Jan 2020 12:05:00 -0500 Subject: [PATCH] Woops, gotta do a char array for that, also set errno to 0 --- indra/llcommon/llfile.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/llcommon/llfile.cpp b/indra/llcommon/llfile.cpp index b0e7c963a..035c41d6d 100644 --- a/indra/llcommon/llfile.cpp +++ b/indra/llcommon/llfile.cpp @@ -283,7 +283,8 @@ int LLFile::rename_nowarn(const std::string& filename, const std::string& newnam int rc = ::rename(filename.c_str(),newname.c_str()); if (rc == -1 && errno == EXDEV) { - rc = std::system("mv '" + filename + "' '" + newname + '\''); + rc = std::system(("mv '" + filename + "' '" + newname + '\'').data()); + errno = 0; } #endif return rc;