diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-04-25 21:00:16 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-04-25 21:00:16 -0700 |
| commit | fd447189c5e05df53cd8ec0a4168370c03c3bb16 (patch) | |
| tree | 484b5075ff9c977dd29679c87f6eaa08144b292f /indra/newview/llpreviewtexture.cpp | |
| parent | b1d608ee99824fde13f3f16e0947ec5b54299fca (diff) | |
| parent | 2dc4f8f8e98da565c158ec9947fe96eccd4920e9 (diff) | |
Merge 3.5.1 into Materials
Diffstat (limited to 'indra/newview/llpreviewtexture.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llpreviewtexture.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp index 3ff5a05d81..91a98792eb 100644..100755 --- a/indra/newview/llpreviewtexture.cpp +++ b/indra/newview/llpreviewtexture.cpp @@ -70,7 +70,7 @@ LLPreviewTexture::LLPreviewTexture(const LLSD& key) mAspectRatio(0.f), mPreviewToSave(FALSE), mImage(NULL), - mImageOldBoostLevel(LLViewerTexture::BOOST_NONE) + mImageOldBoostLevel(LLGLTexture::BOOST_NONE) { updateImageID(); if (key.has("save_as")) @@ -468,9 +468,9 @@ void LLPreviewTexture::onAspectRatioCommit(LLUICtrl* ctrl, void* userdata) void LLPreviewTexture::loadAsset() { - mImage = LLViewerTextureManager::getFetchedTexture(mImageID, MIPMAP_TRUE, LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); + mImage = LLViewerTextureManager::getFetchedTexture(mImageID, FTT_DEFAULT, MIPMAP_TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE); mImageOldBoostLevel = mImage->getBoostLevel(); - mImage->setBoostLevel(LLViewerTexture::BOOST_PREVIEW); + mImage->setBoostLevel(LLGLTexture::BOOST_PREVIEW); mImage->forceToSaveRawImage(0) ; mAssetStatus = PREVIEW_ASSET_LOADING; mUpdateDimensions = TRUE; |