diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 21:57:41 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-03-09 21:57:41 +0200 |
| commit | 43fbd41bfdb756877cedcc7a87638f5c0479930b (patch) | |
| tree | 6c57b815236083c386fdc84c5963a3ae8c7e4ded | |
| parent | 3067f56b1f1be6506b0bddd2889854ad7fdf4d8a (diff) | |
Revert "SL-14939 Fixed the log spam"
This reverts commit b1ab29eeb6a2475395f92d26a3f07fdb304561f7.
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/llfilesystem/llfilesystem.cpp | 6 | ||||
| -rw-r--r-- | indra/llfilesystem/llfilesystem.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index de783330c6..bbdfaf655d 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -226,7 +226,6 @@ Ansariel Hiller SL-13364 SL-13858 SL-13697 - SL-14939 Aralara Rajal Arare Chantilly CHUIBUG-191 diff --git a/indra/llfilesystem/llfilesystem.cpp b/indra/llfilesystem/llfilesystem.cpp index 053b52014e..64e0b9f193 100644 --- a/indra/llfilesystem/llfilesystem.cpp +++ b/indra/llfilesystem/llfilesystem.cpp @@ -72,14 +72,14 @@ bool LLFileSystem::getExists(const LLUUID& file_id, const LLAssetType::EType fil } // static -bool LLFileSystem::removeFile(const LLUUID& file_id, const LLAssetType::EType file_type, int suppress_error /*= 0*/) +bool LLFileSystem::removeFile(const LLUUID& file_id, const LLAssetType::EType file_type) { std::string id_str; file_id.toString(id_str); const std::string extra_info = ""; const std::string filename = LLDiskCache::getInstance()->metaDataToFilepath(id_str, file_type, extra_info); - LLFile::remove(filename.c_str(), suppress_error); + LLFile::remove(filename.c_str()); return true; } @@ -98,7 +98,7 @@ bool LLFileSystem::renameFile(const LLUUID& old_file_id, const LLAssetType::ETyp const std::string new_filename = LLDiskCache::getInstance()->metaDataToFilepath(new_id_str, new_file_type, extra_info); // Rename needs the new file to not exist. - LLFileSystem::removeFile(new_file_id, new_file_type, ENOENT); + LLFileSystem::removeFile(new_file_id, new_file_type); if (LLFile::rename(old_filename, new_filename) != 0) { diff --git a/indra/llfilesystem/llfilesystem.h b/indra/llfilesystem/llfilesystem.h index d934a408c2..89bfff5798 100644 --- a/indra/llfilesystem/llfilesystem.h +++ b/indra/llfilesystem/llfilesystem.h @@ -54,7 +54,7 @@ class LLFileSystem BOOL remove(); static bool getExists(const LLUUID& file_id, const LLAssetType::EType file_type); - static bool removeFile(const LLUUID& file_id, const LLAssetType::EType file_type, int suppress_error = 0); + static bool removeFile(const LLUUID& file_id, const LLAssetType::EType file_type); static bool renameFile(const LLUUID& old_file_id, const LLAssetType::EType old_file_type, const LLUUID& new_file_id, const LLAssetType::EType new_file_type); static S32 getFileSize(const LLUUID& file_id, const LLAssetType::EType file_type); |