Automated merge with ssh://bitbucket.org/lindenlab/viewer64-vmp-integration

meow-7.2.2
Nat Goodspeed 2017-06-29 12:06:30 -04:00
commit 7eb53d4ccb
1 changed files with 2 additions and 2 deletions

View File

@ -4079,7 +4079,7 @@ void dumpVFSCaches()
U32 LLAppViewer::getTextureCacheVersion()
{
//viewer texture cache version, change if the texture cache format changes.
const U32 TEXTURE_CACHE_VERSION = 7;
const U32 TEXTURE_CACHE_VERSION = 8;
return TEXTURE_CACHE_VERSION ;
}
@ -4089,7 +4089,7 @@ U32 LLAppViewer::getObjectCacheVersion()
{
// Viewer object cache version, change if object update
// format changes. JC
const U32 INDRA_OBJECT_CACHE_VERSION = 14;
const U32 INDRA_OBJECT_CACHE_VERSION = 15;
return INDRA_OBJECT_CACHE_VERSION;
}