diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 21:28:02 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 21:28:02 +0000 |
| commit | d6d2159bf875884bb060aaf8234478dd1ec478b4 (patch) | |
| tree | 6873979584b8d269fb250c35219725598cb9b5d6 /indra/newview/lltexturectrl.cpp | |
| parent | 960139aa6f02f90c6102d3c5d5c38b5ebe689f9c (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
Merge. Pull in viewer-release reflecting new release structure.
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/lltexturectrl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 007eb8e33f..e2d0fdf357 100644..100755 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -571,8 +571,8 @@ void LLFloaterTexturePicker::draw() mTexturep = NULL; if(mImageAssetID.notNull()) { - mTexturep = LLViewerTextureManager::getFetchedTexture(mImageAssetID, MIPMAP_YES); - mTexturep->setBoostLevel(LLViewerTexture::BOOST_PREVIEW); + mTexturep = LLViewerTextureManager::getFetchedTexture(mImageAssetID); + mTexturep->setBoostLevel(LLGLTexture::BOOST_PREVIEW); } if (mTentativeLabel) @@ -1442,9 +1442,9 @@ void LLTextureCtrl::draw() } else if (!mImageAssetID.isNull()) { - LLPointer<LLViewerFetchedTexture> texture = LLViewerTextureManager::getFetchedTexture(mImageAssetID, MIPMAP_YES,LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); + LLPointer<LLViewerFetchedTexture> texture = LLViewerTextureManager::getFetchedTexture(mImageAssetID, FTT_DEFAULT, MIPMAP_YES,LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); - texture->setBoostLevel(LLViewerTexture::BOOST_PREVIEW); + texture->setBoostLevel(LLGLTexture::BOOST_PREVIEW); texture->forceToSaveRawImage(0) ; mTexturep = texture; |