livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge viewer-bear

meow-7.2.2
Ansariel 2016-07-07 00:44:59 +02:00
parent e57472e5f6 7718f3a9a3
commit 0f16de2208
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -197,6 +197,7 @@ Ansariel Hiller
MAINT-6432
MAINT-6513
MAINT-6514
MAINT-6552
Aralara Rajal
Arare Chantilly
CHUIBUG-191

2
indra/newview/llviewertexture.cpp
View File

@ -1274,7 +1274,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);