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;