diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-22 11:52:02 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-22 11:52:02 -0400 |
| commit | b9c7d383707fca68bcf8256285adc0bab4259ce5 (patch) | |
| tree | 60c98bf056c8f85509f362998d15761960ae4aae /indra/newview/llappviewer.cpp | |
| parent | 0656620e2d6b4b9ca1fabf4f045df77256f31a60 (diff) | |
| parent | 06c4819b097c6364c1e3bc7566a4e677a7bde4a2 (diff) | |
merge changes for beta fixes
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 061ef7268e..9de2941c4a 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()); @@ -3548,7 +3548,9 @@ bool LLAppViewer::initCache() gSavedSettings.getBOOL("PurgeCacheOnNextStartup")) { gSavedSettings.setBOOL("PurgeCacheOnNextStartup", false); - mPurgeCache = true; + 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. |