diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-10-27 21:00:18 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2017-10-27 21:00:18 +0300 |
| commit | d7732280a913cf2200d04eb3d0c549c44e78cc44 (patch) | |
| tree | 8ce23bfda37915d658b502893bd0cfc6c1d51165 /indra/llimage | |
| parent | fbb5e8b68c8d1275df2dc670645ad293de65279a (diff) | |
Merged from viewer-lynx
Diffstat (limited to 'indra/llimage')
| -rw-r--r-- | indra/llimage/llimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index ad765b6415..04085eb703 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -1535,7 +1535,7 @@ LLPointer<LLImageRaw> LLImageRaw::scaled(S32 new_width, S32 new_height) if ((old_width == new_width) && (old_height == new_height)) { result = new LLImageRaw(old_width, old_height, components); - if (!result) + if (!result || result->isBufferInvalid()) { LL_WARNS() << "Failed to allocate new image" << LL_ENDL; return result; @@ -1549,7 +1549,7 @@ LLPointer<LLImageRaw> LLImageRaw::scaled(S32 new_width, S32 new_height) if (new_data_size > 0) { result = new LLImageRaw(new_width, new_height, components); - if (!result) + if (!result || result->isBufferInvalid()) { LL_WARNS() << "Failed to allocate new image" << LL_ENDL; return result; |