diff options
author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-06-14 18:30:40 +0300 |
---|---|---|
committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-06-14 18:30:40 +0300 |
commit | 6c231ba8a645b70e98b25e0d9ac6cc835fdd2f19 (patch) | |
tree | a24cd9e59e0823fbb0ada808f2da322d15b3635e /indra/newview/lltexturecache.cpp | |
parent | 5f890af7077157f7a0bf161d5aebf48dceb1a2ac (diff) |
MAINT-8395 Rollback part of SL-711 to fix related crashes
Diffstat (limited to 'indra/newview/lltexturecache.cpp')
-rw-r--r-- | indra/newview/lltexturecache.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index 2a0d961952..dd5dce3279 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -2027,13 +2027,15 @@ bool LLTextureCache::writeToFastCache(S32 id, LLPointer<LLImageRaw> raw, S32 dis if(w * h *c > 0) //valid { //make a duplicate to keep the original raw image untouched. - raw = raw->scaled(w, h); + raw = raw->duplicate(); if (raw->isBufferInvalid()) { LL_WARNS() << "Invalid image duplicate buffer" << LL_ENDL; return false; } + raw->scale(w, h); + discardlevel += i ; } } |