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

Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix

Xiaohong Bao 2010-04-08 22:39:52 -06:00
parent 3b9e4f43ed d34588b7a7
commit 4a8b13e4fd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llviewertexture.cpp
View File

@ -1426,15 +1426,15 @@ BOOL LLViewerFetchedTexture::createTexture(S32 usename/*= 0*/)
//virtual
void LLViewerFetchedTexture::setKnownDrawSize(S32 width, S32 height)
{
if(mKnownDrawWidth != width || mKnownDrawHeight != height)
if(mKnownDrawWidth < width || mKnownDrawHeight < height)
{
mKnownDrawWidth = width;
mKnownDrawHeight = height;
mKnownDrawWidth = llmax(mKnownDrawWidth, width) ;
mKnownDrawHeight = llmax(mKnownDrawHeight, height) ;
mKnownDrawSizeChanged = TRUE ;
mFullyLoaded = FALSE ;
}
addTextureStats((F32)(width * height));
addTextureStats((F32)(mKnownDrawWidth * mKnownDrawHeight));
}
//virtual