diff options
| author | McCabe Maxsted | 2010-08-16 12:38:47 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-16 12:38:47 -0700 |
| commit | a3b2453cb054fe041f9b44893540f178c5a82d5b (patch) | |
| tree | 7477060aead638bbbca864e771853833c8a8714a | |
| parent | Applied patch from #405: show avatar age in profile, Ansariel Hiller ported t... (diff) | |
| download | meta-impy-a3b2453cb054fe041f9b44893540f178c5a82d5b.zip meta-impy-a3b2453cb054fe041f9b44893540f178c5a82d5b.tar.gz meta-impy-a3b2453cb054fe041f9b44893540f178c5a82d5b.tar.bz2 meta-impy-a3b2453cb054fe041f9b44893540f178c5a82d5b.tar.xz | |
Incremented LLTextureCache::sHeaderCacheVersion to 1.3 and cache_version to 7 to fix SNOW-799
| -rw-r--r-- | linden/indra/newview/llappviewer.cpp | 2 | ||||
| -rw-r--r-- | linden/indra/newview/lltexturecache.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 7879b36..f1cd447 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp | |||
| @@ -2919,7 +2919,7 @@ bool LLAppViewer::initCache() | |||
| 2919 | // Purge cache if it belongs to an old version | 2919 | // Purge cache if it belongs to an old version |
| 2920 | else | 2920 | else |
| 2921 | { | 2921 | { |
| 2922 | static const S32 cache_version = 6; | 2922 | static const S32 cache_version = 7; |
| 2923 | if (gSavedSettings.getS32("LocalCacheVersion") != cache_version) | 2923 | if (gSavedSettings.getS32("LocalCacheVersion") != cache_version) |
| 2924 | { | 2924 | { |
| 2925 | mPurgeCache = true; | 2925 | mPurgeCache = true; |
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp index c5c14b5..2ed3bf5 100644 --- a/linden/indra/newview/lltexturecache.cpp +++ b/linden/indra/newview/lltexturecache.cpp | |||
| @@ -869,7 +869,7 @@ bool LLTextureCache::updateTextureEntryList(const LLUUID& id, S32 bodysize) | |||
| 869 | 869 | ||
| 870 | //static | 870 | //static |
| 871 | const S32 MAX_REASONABLE_FILE_SIZE = 512*1024*1024; // 512 MB | 871 | const S32 MAX_REASONABLE_FILE_SIZE = 512*1024*1024; // 512 MB |
| 872 | F32 LLTextureCache::sHeaderCacheVersion = 1.2f; | 872 | F32 LLTextureCache::sHeaderCacheVersion = 1.3f; |
| 873 | U32 LLTextureCache::sCacheMaxEntries = MAX_REASONABLE_FILE_SIZE / TEXTURE_CACHE_ENTRY_SIZE; | 873 | U32 LLTextureCache::sCacheMaxEntries = MAX_REASONABLE_FILE_SIZE / TEXTURE_CACHE_ENTRY_SIZE; |
| 874 | S64 LLTextureCache::sCacheMaxTexturesSize = 0; // no limit | 874 | S64 LLTextureCache::sCacheMaxTexturesSize = 0; // no limit |
| 875 | const char* entries_filename = "texture.entries"; | 875 | const char* entries_filename = "texture.entries"; |