diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-06-29 12:06:30 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-06-29 12:06:30 -0400 |
commit | 7eb53d4ccbfcb692a2edc7539e651b14c888742e (patch) | |
tree | 1dcafa70b4ed3c1c0d419e423bb9545eb39c9cbf /indra | |
parent | b66032554691c382d3bb25403e8a18e7942cbe23 (diff) | |
parent | 621db1ddd1b0ecd7174cbe8f09cf868f41ffce66 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64-vmp-integration
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 686cad9255..5a0cdd4f1a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -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; } |