diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-03-02 17:06:08 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-03-02 17:06:08 -0600 |
| commit | 5f9591535138d782f0f9666b39534149de0562a1 (patch) | |
| tree | 6790076712a5ef1000f835cd6bc97b5e14d87ea3 /indra/newview/llviewertexture.cpp | |
| parent | e38adc5baf0bf4090168088fc4b9a71a5b231aa4 (diff) | |
Can upload textures from model preview now.
Fix for bad region crossing.
Diffstat (limited to 'indra/newview/llviewertexture.cpp')
| -rw-r--r-- | indra/newview/llviewertexture.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 0f0fd5da30..d0c3768b34 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1367,8 +1367,15 @@ BOOL LLViewerFetchedTexture::createTexture(S32 usename/*= 0*/) mOrigWidth = mRawImage->getWidth(); mOrigHeight = mRawImage->getHeight(); - // leave black border, do not scale image content - mRawImage->expandToPowerOfTwo(MAX_IMAGE_SIZE, FALSE); + + if (mBoostLevel == BOOST_PREVIEW) + { + mRawImage->biasedScaleToPowerOfTwo(1024); + } + else + { // leave black border, do not scale image content + mRawImage->expandToPowerOfTwo(MAX_IMAGE_SIZE, FALSE); + } mFullWidth = mRawImage->getWidth(); mFullHeight = mRawImage->getHeight(); |