diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-04-08 17:06:42 -0700 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-04-08 17:06:42 -0700 |
| commit | 4ed913c3760308ea67db8beb9e6330933104a8ab (patch) | |
| tree | d459b28762773451148ddc8ce661fc30334839dd /indra/newview/llviewertexture.cpp | |
| parent | 2a42ba08a351fd29af1e1ffc85840e2323ed8163 (diff) | |
| parent | 571ee16a1ff240873b602c6d01a1e3dbd17f2bc2 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index af0dcd8e35..a5adb11c53 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -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 |