Skip to content
Snippets Groups Projects
Commit e9c6800e authored by Aleric Inglewood's avatar Aleric Inglewood
Browse files

VWR-24317: remove warnings for deleting non-existant texture file on startup

parent 466413cd
No related branches found
No related tags found
No related merge requests found
...@@ -1858,8 +1858,22 @@ void LLTextureCache::removeCachedTexture(const LLUUID& id) ...@@ -1858,8 +1858,22 @@ void LLTextureCache::removeCachedTexture(const LLUUID& id)
//called after mHeaderMutex is locked. //called after mHeaderMutex is locked.
void LLTextureCache::removeEntry(S32 idx, Entry& entry, std::string& filename) void LLTextureCache::removeEntry(S32 idx, Entry& entry, std::string& filename)
{ {
bool file_maybe_exists = true; // Always attempt to remove when idx is invalid.
if(idx >= 0) //valid entry if(idx >= 0) //valid entry
{ {
if (entry.mBodySize == 0) // Always attempt to remove when mBodySize > 0.
{
if (LLAPRFile::isExist(filename, getLocalAPRFilePool())) // Sanity check. Shouldn't exist when body size is 0.
{
LL_WARNS("TextureCache") << "Entry has body size of zero but file " << filename << " exists. Deleting this file, too." << LL_ENDL;
}
else
{
file_maybe_exists = false;
}
}
entry.mImageSize = -1; entry.mImageSize = -1;
entry.mBodySize = 0; entry.mBodySize = 0;
mHeaderIDMap.erase(entry.mID); mHeaderIDMap.erase(entry.mID);
...@@ -1869,7 +1883,10 @@ void LLTextureCache::removeEntry(S32 idx, Entry& entry, std::string& filename) ...@@ -1869,7 +1883,10 @@ void LLTextureCache::removeEntry(S32 idx, Entry& entry, std::string& filename)
mFreeList.insert(idx); mFreeList.insert(idx);
} }
LLAPRFile::remove(filename, getLocalAPRFilePool()); if (file_maybe_exists)
{
LLAPRFile::remove(filename, getLocalAPRFilePool());
}
} }
bool LLTextureCache::removeFromCache(const LLUUID& id) bool LLTextureCache::removeFromCache(const LLUUID& id)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment