diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-09 10:45:20 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-09 10:45:20 +0100 |
| commit | e9a94a04ff3562742c52bba45b8377fce9eeaad6 (patch) | |
| tree | de0380171db1e5233d914d8b6ee233cf2bb1dd29 /indra/newview/llviewertexture.cpp | |
| parent | d1c701dc6b506e3cf6ed222fa651c8032a4141f3 (diff) | |
| parent | 4ed913c3760308ea67db8beb9e6330933104a8ab (diff) | |
merge from viewer-trunk
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 7d75d7a183..886db08928 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1433,15 +1433,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 |