diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-12-05 22:15:08 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-12-05 22:15:08 -0500 |
| commit | b6bf90c042cd84544e0bcb36841c5e438e64669b (patch) | |
| tree | 66dd00423d3762c79a860f965d70e80bb9073875 | |
| parent | 4c384aa4aba560ca86c1e8c520836386f2fd5599 (diff) | |
| parent | a9ada0cc6a1418da0908f995b1369912a270b22d (diff) | |
merge changes for MAINT-1955
| -rwxr-xr-x | .hgtags | 1 | ||||
| -rw-r--r-- | indra/newview/lltexturecache.cpp | 6 |
2 files changed, 6 insertions, 1 deletions
@@ -376,3 +376,4 @@ ab0aa2f6ba22b52fed30a2337197f589156edc75 DRTVWR-253 937ec902bb9a1cbceff17bd89e3923352b0a5fbc DRTVWR-256 44e764a6ac9e672a4f3bce821a4b6a218590c374 DRTVWR-258 c23d734065ed593b2413385aecd8366d8e0ee96b DRTVWR-257 +452ce96d4046dc05a3ecaecc203e2cc8ddd72e76 DRTVWR-259 diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index 2d463f0afa..305f6fca0f 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -1937,7 +1937,11 @@ bool LLTextureCache::writeToFastCache(S32 id, LLPointer<LLImageRaw> raw, S32 dis openFastCache(); mFastCachep->seek(APR_SET, offset); - llassert_always(mFastCachep->write(mFastCachePadBuffer, TEXTURE_FAST_CACHE_ENTRY_SIZE) == TEXTURE_FAST_CACHE_ENTRY_SIZE); + + //no need to do this assertion check. When it fails, let it fail quietly. + //this failure could happen because other viewer removes the fast cache file when clearing cache. + //--> llassert_always(mFastCachep->write(mFastCachePadBuffer, TEXTURE_FAST_CACHE_ENTRY_SIZE) == TEXTURE_FAST_CACHE_ENTRY_SIZE); + mFastCachep->write(mFastCachePadBuffer, TEXTURE_FAST_CACHE_ENTRY_SIZE); closeFastCache(true); } |