From d7732280a913cf2200d04eb3d0c549c44e78cc44 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 27 Oct 2017 21:00:18 +0300
Subject: [PATCH] Merged from viewer-lynx
---
indra/llimage/llimage.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp
index ad765b64153..04085eb7038 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;
--
GitLab