Skip to content
Snippets Groups Projects
Commit b6bf90c0 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

merge changes for MAINT-1955

parents 4c384aa4 a9ada0cc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.hgtags
+ 1
− 0
View file @ b6bf90c0
...@@ -376,3 +376,4 @@ ab0aa2f6ba22b52fed30a2337197f589156edc75 DRTVWR-253 ...@@ -376,3 +376,4 @@ ab0aa2f6ba22b52fed30a2337197f589156edc75 DRTVWR-253
937ec902bb9a1cbceff17bd89e3923352b0a5fbc DRTVWR-256 937ec902bb9a1cbceff17bd89e3923352b0a5fbc DRTVWR-256
44e764a6ac9e672a4f3bce821a4b6a218590c374 DRTVWR-258 44e764a6ac9e672a4f3bce821a4b6a218590c374 DRTVWR-258
c23d734065ed593b2413385aecd8366d8e0ee96b DRTVWR-257 c23d734065ed593b2413385aecd8366d8e0ee96b DRTVWR-257
452ce96d4046dc05a3ecaecc203e2cc8ddd72e76 DRTVWR-259
indra/newview/lltexturecache.cpp
+ 5
− 1
View file @ b6bf90c0
...@@ -1937,7 +1937,11 @@ bool LLTextureCache::writeToFastCache(S32 id, LLPointer<LLImageRaw> raw, S32 dis ...@@ -1937,7 +1937,11 @@ bool LLTextureCache::writeToFastCache(S32 id, LLPointer<LLImageRaw> raw, S32 dis
openFastCache(); openFastCache();
mFastCachep->seek(APR_SET, offset); 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); closeFastCache(true);
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment