livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "SL-14939 Fixed the log spam" 

This reverts commit b1ab29eeb6.
master
Andrey Lihatskiy 2021-03-09 21:57:41 +02:00
parent 3067f56b1f
commit 43fbd41bfd
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -226,7 +226,6 @@ Ansariel Hiller
SL-13364
SL-13858
SL-13697
SL-14939
Aralara Rajal
Arare Chantilly
CHUIBUG-191

6
indra/llfilesystem/llfilesystem.cpp
View File

@ -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)
{

2
indra/llfilesystem/llfilesystem.h
View File

@ -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);