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

Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer

master
Ansariel 2021-03-10 20:28:57 +01:00
parent e6c34f01d2 ad2edc1d83
commit b237c26fbf
6 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/contributions.txt
View File

@ -228,6 +228,9 @@ Ansariel Hiller
SL-13364
SL-13858
SL-13697
SL-14939
SL-14940
SL-14941
Aralara Rajal
Arare Chantilly
CHUIBUG-191

11
indra/llfilesystem/llfilesystem.cpp
View File

@ -71,21 +71,14 @@ bool LLFileSystem::getExists(const LLUUID& file_id, const LLAssetType::EType fil
return false;
}
// static
// <FS:Ansariel> Fix log spam
//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*/)
// </FS:Ansariel>
{
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);
// <FS:Ansariel> Fix log spam
//LLFile::remove(filename.c_str());
LLFile::remove(filename.c_str(), suppress_error);
// </FS:Ansariel>
return true;
}
@ -103,11 +96,7 @@ bool LLFileSystem::renameFile(const LLUUID& old_file_id, const LLAssetType::ETyp
new_file_id.toString(new_id_str);
const std::string new_filename = LLDiskCache::getInstance()->metaDataToFilepath(new_id_str, new_file_type, extra_info);
// Rename needs the new file to not exist.
// <FS:Ansariel> Fix log spam
//LLFileSystem::removeFile(new_file_id, new_file_type);
LLFileSystem::removeFile(new_file_id, new_file_type, ENOENT);
// </FS:Ansariel>
if (LLFile::rename(old_filename, new_filename) != 0)
{

3
indra/llfilesystem/llfilesystem.h
View File

@ -54,10 +54,7 @@ class LLFileSystem
BOOL remove();
static bool getExists(const LLUUID& file_id, const LLAssetType::EType file_type);
// <FS:Ansariel> Fix log spam
//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);
// </FS:Ansariel>
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);

6
indra/newview/llappviewer.cpp
View File

@ -4941,10 +4941,6 @@ bool LLAppViewer::initCache()
const unsigned int disk_cache_mb = cache_total_size_mb * disk_cache_percent / 100;
const unsigned int disk_cache_bytes = disk_cache_mb * 1024 * 1024;
const bool enable_cache_debug_info = gSavedSettings.getBOOL("EnableDiskCacheDebugInfo");
// <FS:Ansariel> Don't ignore cache path for asset cache; Moved further down until cache path has been set correctly
//const std::string cache_dir = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, cache_dir_name);
//LLDiskCache::initParamSingleton(cache_dir, disk_cache_bytes, enable_cache_debug_info);
// </FS:Ansariel>
bool texture_cache_mismatch = false;
if (gSavedSettings.getS32("LocalCacheVersion") != LLAppViewer::getTextureCacheVersion())
@ -5015,10 +5011,8 @@ bool LLAppViewer::initCache()
}
// </FS:Ansariel>
// <FS:Ansariel> Don't ignore cache path for asset cache
const std::string cache_dir = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, cache_dir_name);
LLDiskCache::initParamSingleton(cache_dir, disk_cache_bytes, enable_cache_debug_info);
// </FS:Ansariel>
if (!read_only)
{

3
indra/newview/llviewerassetstorage.cpp
View File

@ -293,10 +293,7 @@ void LLViewerAssetStorage::storeAssetData(
legacy->mUpCallback = callback;
legacy->mUserData = user_data;
// <FS:Ansariel> Fix broken asset upload
//LLFileSystem file(asset_id, asset_type, LLFileSystem::WRITE);
LLFileSystem file(asset_id, asset_type, LLFileSystem::APPEND);
// </FS:Ansariel>
const S32 buf_size = 65536;
U8 copy_buf[buf_size];

3
indra/newview/llviewerassetupload.cpp
View File

@ -498,10 +498,7 @@ LLSD LLNewFileResourceUploadInfo::exportTempFile()
infile.open(filename, LL_APR_RB, NULL, &file_size);
if (infile.getFileHandle())
{
// <FS:Ansariel> Fix broken asset upload
//LLFileSystem file(getAssetId(), assetType, LLFileSystem::WRITE);
LLFileSystem file(getAssetId(), assetType, LLFileSystem::APPEND);
// </FS:Ansariel>
const S32 buf_size = 65536;
U8 copy_buf[buf_size];