diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-04-15 16:45:19 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-04-15 16:45:19 -0700 |
| commit | dab937ef5b18547ecdaf0abb7a0e86ba0fa0ad0e (patch) | |
| tree | 78d44ba251ed6ee6f506806f70654b60c152b7b5 /indra/newview | |
| parent | 4895b24e3861021c26a9df3ba9ba04400c63f5c8 (diff) | |
FIX: STORM-1141. Win7: 2.6.3 Beta1 crashes on startup if locale differs from English.
Force LLTextureCache::purgeAllTextures to get called in addition to normal cache purging.
Diffstat (limited to 'indra/newview')
| -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 cfb5853cfd..4985524f00 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3500,10 +3500,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()); @@ -3517,7 +3517,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. |