Skip to content
Snippets Groups Projects
Commit 43fbd41b authored by Andrey Lihatskiy's avatar Andrey Lihatskiy
Browse files

Revert "SL-14939 Fixed the log spam"

This reverts commit b1ab29ee.
parent 3067f56b
No related branches found
No related tags found
No related merge requests found
...@@ -226,7 +226,6 @@ Ansariel Hiller ...@@ -226,7 +226,6 @@ Ansariel Hiller
SL-13364 SL-13364
SL-13858 SL-13858
SL-13697 SL-13697
SL-14939
Aralara Rajal Aralara Rajal
Arare Chantilly Arare Chantilly
CHUIBUG-191 CHUIBUG-191
......
...@@ -72,14 +72,14 @@ bool LLFileSystem::getExists(const LLUUID& file_id, const LLAssetType::EType fil ...@@ -72,14 +72,14 @@ bool LLFileSystem::getExists(const LLUUID& file_id, const LLAssetType::EType fil
} }
// static // 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; std::string id_str;
file_id.toString(id_str); file_id.toString(id_str);
const std::string extra_info = ""; const std::string extra_info = "";
const std::string filename = LLDiskCache::getInstance()->metaDataToFilepath(id_str, file_type, 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; return true;
} }
...@@ -98,7 +98,7 @@ bool LLFileSystem::renameFile(const LLUUID& old_file_id, const LLAssetType::ETyp ...@@ -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); const std::string new_filename = LLDiskCache::getInstance()->metaDataToFilepath(new_id_str, new_file_type, extra_info);
// Rename needs the new file to not exist. // 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) if (LLFile::rename(old_filename, new_filename) != 0)
{ {
......
...@@ -54,7 +54,7 @@ class LLFileSystem ...@@ -54,7 +54,7 @@ class LLFileSystem
BOOL remove(); BOOL remove();
static bool getExists(const LLUUID& file_id, const LLAssetType::EType file_type); 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, 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); const LLUUID& new_file_id, const LLAssetType::EType new_file_type);
static S32 getFileSize(const LLUUID& file_id, const LLAssetType::EType file_type); static S32 getFileSize(const LLUUID& file_id, const LLAssetType::EType file_type);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment