diff options
| author | callum_linden <callum@lindenlab.com> | 2017-12-11 10:09:44 -0800 |
|---|---|---|
| committer | callum_linden <callum@lindenlab.com> | 2017-12-11 10:09:44 -0800 |
| commit | 5561673bf1c98c717f69e747a9e8b0d56129ef12 (patch) | |
| tree | f021c5beca7aaad132c60d25881c7920a9944daf /indra/llimage | |
| parent | fe29551d9a6685bdc40e87ae135f236aec1ea475 (diff) | |
| parent | c565c62745ec37484118888f8f45dbde34d42e46 (diff) | |
Automated merge with tip of viewer64 *plus* update to CEF 3.3202.1686 / Dullahan 901
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 bb345e282a..cd7125197c 100644 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -1536,7 +1536,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; @@ -1550,7 +1550,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; |