summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2017-07-07 16:51:14 -0700
committerGlenn Glazer <coyot@lindenlab.com>2017-07-07 16:51:14 -0700
commit7aa80424f341ed9a85f0b9bc8f8333c35bf5a056 (patch)
treed5d4763ba80b02af1232642a2a998e24ad1bb027
parentb5d61b571996888d720fcf53e3597430ebf52823 (diff)
parent7eb53d4ccbfcb692a2edc7539e651b14c888742e (diff)
merge
-rw-r--r--indra/newview/llappviewer.cpp4
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;
}