diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-08-11 09:02:16 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-08-11 09:02:16 -0400 |
| commit | f6735af9315ed91a0d28804252c1351c9d4b379f (patch) | |
| tree | 1b1fc36446fd12164f28a0d9b62bd2e89fd1601c /indra/llimage/llimagedxt.cpp | |
| parent | 00839eb6350627c6272dea242b85ea24544cea33 (diff) | |
| parent | 470e4b5afc7f0fd516eca9d61b95ff770adf3978 (diff) | |
Automated merge with ssh://bitbucket.org/nat_linden/viewer-no-popup
Diffstat (limited to 'indra/llimage/llimagedxt.cpp')
| -rw-r--r-- | indra/llimage/llimagedxt.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llimage/llimagedxt.cpp b/indra/llimage/llimagedxt.cpp index 3a7319d765..36317a5ba8 100644 --- a/indra/llimage/llimagedxt.cpp +++ b/indra/llimage/llimagedxt.cpp @@ -289,7 +289,11 @@ bool LLImageDXT::decode(LLImageRaw* raw_image, F32 time) return false; } - raw_image->resize(width, height, ncomponents); + if (!raw_image->resize(width, height, ncomponents)) + { + setLastError("llImageDXT failed to resize image!"); + return false; + } memcpy(raw_image->getData(), data, image_size); /* Flawfinder: ignore */ return true; |