diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-03-04 12:23:57 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2021-03-04 12:23:57 +0200 |
| commit | 87908bab6d7a0283e7195566dd99926a4c8401b1 (patch) | |
| tree | ad43009ab5aec19c2681b1d748a144519c320e9f /indra | |
| parent | 925feaaf95b43f2380a4f375ac9b6419d05732f6 (diff) | |
SL-14939 Fixed the log spam
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llfilesystem/llfilesystem.cpp | 6 | ||||
| -rw-r--r-- | indra/llfilesystem/llfilesystem.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/llfilesystem/llfilesystem.cpp b/indra/llfilesystem/llfilesystem.cpp index 64e0b9f193..053b52014e 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) +bool LLFileSystem::removeFile(const LLUUID& file_id, const LLAssetType::EType file_type, int suppress_error /*= 0*/) { 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()); + LLFile::remove(filename.c_str(), suppress_error); 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); + LLFileSystem::removeFile(new_file_id, new_file_type, ENOENT); if (LLFile::rename(old_filename, new_filename) != 0) { diff --git a/indra/llfilesystem/llfilesystem.h b/indra/llfilesystem/llfilesystem.h index 89bfff5798..d934a408c2 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); + static bool removeFile(const LLUUID& file_id, const LLAssetType::EType file_type, int suppress_error = 0); 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); |