summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturecache.cpp
diff options
context:
space:
mode:
authorRuslan Teliuk <ruslantproductengine@lindenlab.com>2016-10-11 16:21:01 +0300
committerRuslan Teliuk <ruslantproductengine@lindenlab.com>2016-10-11 16:21:01 +0300
commita47896f4b917340fe6e27fd0687275c38dbad401 (patch)
treee0ec1292a8e19206cb42741d1054516ea09cd09f /indra/newview/lltexturecache.cpp
parent6e6f2c8f5bf7bb3326140b17e23471283fff75b1 (diff)
parentf5fcf54cd9e1356e33a629eaaf1602319e5da8df (diff)
Merged lindenlab/viewer-neko into default
Diffstat (limited to 'indra/newview/lltexturecache.cpp')
-rw-r--r--indra/newview/lltexturecache.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index 37cc908e84..36c4f0d516 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -1928,6 +1928,12 @@ bool LLTextureCache::writeToFastCache(S32 id, LLPointer<LLImageRaw> raw, S32 dis
{
//make a duplicate to keep the original raw image untouched.
raw = raw->duplicate();
+ if (raw->isBufferInvalid())
+ {
+ LL_WARNS() << "Invalid image duplicate buffer" << LL_ENDL;
+ return false;
+ }
+
raw->scale(w, h) ;
discardlevel += i ;