diff options
| author | Callum Prentice <callum@lindenlab.com> | 2025-10-22 19:16:59 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2025-10-22 19:16:59 -0700 |
| commit | 21e9b38f06e187414d30c12c8c69ebf7b4e4e636 (patch) | |
| tree | d41d6b2db8a878cc18f2215e01fd710fb663a76e /indra/llcommon/llsys.cpp | |
| parent | c64c16a59ae2220b29ba0ed1f3f22da07e694612 (diff) | |
| parent | 0da96a508a5d8d384e017f707babd2193f6ca6a7 (diff) | |
Merge branch 'develop' of https://github.com/secondlife/viewer into callum/voice-moderation-2
Diffstat (limited to 'indra/llcommon/llsys.cpp')
| -rw-r--r-- | indra/llcommon/llsys.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 21b11c5311..270ca40086 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -1348,10 +1348,6 @@ bool gunzip_file(const std::string& srcfile, const std::string& dstfile) } while(gzeof(src) == 0); fclose(dst); dst = NULL; -#if LL_WINDOWS - // Rename in windows needs the dstfile to not exist. - LLFile::remove(dstfile, ENOENT); -#endif if (LLFile::rename(tmpfile, dstfile) == -1) goto err; /* Flawfinder: ignore */ retval = true; err: @@ -1399,10 +1395,6 @@ bool gzip_file(const std::string& srcfile, const std::string& dstfile) gzclose(dst); dst = NULL; -#if LL_WINDOWS - // Rename in windows needs the dstfile to not exist. - LLFile::remove(dstfile); -#endif if (LLFile::rename(tmpfile, dstfile) == -1) goto err; /* Flawfinder: ignore */ retval = true; err: |
