Merge branch 'brad/SL-19968-vocache-objects-missing' into DRTVWR-587-maint-V (#273)
commit
0bc7cee2e1
|
|
@ -1086,6 +1086,8 @@ void LLVOCache::initCache(ELLPath location, U32 size, U32 cache_version)
|
|||
|
||||
readCacheHeader();
|
||||
|
||||
LL_INFOS() << "Viewer Object Cache Versions - expected: " << cache_version << " found: " << mMetaInfo.mVersion << LL_ENDL;
|
||||
|
||||
if( mMetaInfo.mVersion != cache_version
|
||||
|| mMetaInfo.mAddressSize != expected_address)
|
||||
{
|
||||
|
|
@ -1096,7 +1098,8 @@ void LLVOCache::initCache(ELLPath location, U32 size, U32 cache_version)
|
|||
clearCacheInMemory();
|
||||
}
|
||||
else //delete the current cache if the format does not match.
|
||||
{
|
||||
{
|
||||
LL_INFOS() << "Viewer Object Cache Versions unmatched. clearing cache." << LL_ENDL;
|
||||
removeCache();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue