summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturecache.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-11-18 10:43:30 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2009-11-18 10:43:30 +0000
commit22aa5eed910bbd1b366789cb96247899c744df75 (patch)
tree40bf09c7239e6983b3eb279695b9f662ce4d4d0e /indra/newview/lltexturecache.cpp
parent939e48d38cf9f15e1f7220cc3860810badd8a778 (diff)
parent125b779fb63cafe4e5df4d601542def1b4bc05f3 (diff)
merge.
Diffstat (limited to 'indra/newview/lltexturecache.cpp')
-rw-r--r--indra/newview/lltexturecache.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index c33c652935..845e71378a 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -917,7 +917,7 @@ BOOL LLTextureCache::isInLocal(const LLUUID& id)
//static
const S32 MAX_REASONABLE_FILE_SIZE = 512*1024*1024; // 512 MB
-F32 LLTextureCache::sHeaderCacheVersion = 1.3f;
+F32 LLTextureCache::sHeaderCacheVersion = 1.4f;
U32 LLTextureCache::sCacheMaxEntries = MAX_REASONABLE_FILE_SIZE / TEXTURE_CACHE_ENTRY_SIZE;
S64 LLTextureCache::sCacheMaxTexturesSize = 0; // no limit
const char* entries_filename = "texture.entries";