diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-05-06 15:25:12 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-05-06 15:25:12 -0400 |
| commit | 39ad3f1d880a26dcf8189cad2501002c189a7ac2 (patch) | |
| tree | a843d0c5843ca5e6a5fcbdfc6929bc2b21b960d6 /indra/newview/llappviewer.cpp | |
| parent | 5c7a906b44aa950ec3c8b786fec6516b51f9d66c (diff) | |
| parent | def9f9290e661e6a35b7b255eb71b6e2767fdea0 (diff) | |
merge
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index f99762d768..7e682fc83b 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3531,10 +3531,10 @@ bool LLAppViewer::initCache() LLAppViewer::getTextureCache()->setReadOnly(read_only) ; LLVOCache::getInstance()->setReadOnly(read_only); - BOOL texture_cache_mismatch = FALSE ; + bool texture_cache_mismatch = false; if (gSavedSettings.getS32("LocalCacheVersion") != LLAppViewer::getTextureCacheVersion()) { - texture_cache_mismatch = TRUE ; + texture_cache_mismatch = true; if(!read_only) { gSavedSettings.setS32("LocalCacheVersion", LLAppViewer::getTextureCacheVersion()); @@ -3549,6 +3549,8 @@ bool LLAppViewer::initCache() { gSavedSettings.setBOOL("PurgeCacheOnNextStartup", false); mPurgeCache = true; + // STORM-1141 force purgeAllTextures to get called to prevent a crash here. -brad + texture_cache_mismatch = true; } // We have moved the location of the cache directory over time. |