summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-03-17 14:43:17 -0600
committerXiaohong Bao <bao@lindenlab.com>2010-03-17 14:43:17 -0600
commit8e1f7ecaf3b1eebc1ca60ecb6e04412f39083d82 (patch)
tree488e222c9b548b631c0c22e8cd905c1a9a6e54e2 /indra/newview
parentf8dc23fc84e624845181315bbadcbdc1f804c628 (diff)
more for lltexturecache.cpp: fix the crash due to deleting the entries header file after clearing the texture cache.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/lltexturecache.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index 48207dfd4d..54ac3850fd 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -1020,6 +1020,12 @@ void LLTextureCache::readEntriesHeader()
LLAPRFile::readEx(mHeaderEntriesFileName, (U8*)&mHeaderEntriesInfo, 0, sizeof(EntriesInfo),
getLocalAPRFilePool());
}
+ else //create an empty entries header.
+ {
+ mHeaderEntriesInfo.mVersion = sHeaderCacheVersion ;
+ mHeaderEntriesInfo.mEntries = 0 ;
+ writeEntriesHeader() ;
+ }
}
void LLTextureCache::writeEntriesHeader()
@@ -1438,6 +1444,7 @@ void LLTextureCache::purgeAllTextures(bool purge_directories)
}
if (purge_directories)
{
+ gDirUtilp->deleteFilesInDir(mTexturesDirName,mask);
LLFile::rmdir(mTexturesDirName);
}
}