From 69de29d74e2171a032472f54581b4eceff1ad099 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Wed, 6 Jul 2016 10:22:50 +0300
Subject: [PATCH] MAINT-6552 Contribution: Viewer sometimes crashes when
opening oversized textures
---
doc/contributions.txt | 1 +
indra/newview/llviewertexture.cpp | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index b118439f260..f1111a2210c 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -195,6 +195,7 @@ Ansariel Hiller
MAINT-6432
MAINT-6513
MAINT-6514
+ MAINT-6552
Aralara Rajal
Arare Chantilly
CHUIBUG-191
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index ed719ae4182..ac997d7525d 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -1200,7 +1200,7 @@ void LLViewerFetchedTexture::loadFromFastCache()
{
S32 expected_width = mKnownDrawWidth > 0 ? mKnownDrawWidth : DEFAULT_ICON_DIMENTIONS;
S32 expected_height = mKnownDrawHeight > 0 ? mKnownDrawHeight : DEFAULT_ICON_DIMENTIONS;
- if (mRawImage->getWidth() > expected_width || mRawImage->getHeight() > expected_height)
+ if (mRawImage && (mRawImage->getWidth() > expected_width || mRawImage->getHeight() > expected_height))
{
// scale oversized icon, no need to give more work to gl
mRawImage->scale(expected_width, expected_height);
--
GitLab