aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltexturectrl.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2010-02-09 21:11:42 -0600
committerJacek Antonelli2010-02-16 18:50:15 -0600
commite6247fbe78c4d3dacb74f3b2359aba2b6538133b (patch)
tree10c42d670a2c635b4339f7f68809c221756774f8 /linden/indra/newview/lltexturectrl.cpp
parentPorted some cURL and HTTP-related changes from Snowglobe. (diff)
downloadmeta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.zip
meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.gz
meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.bz2
meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.xz
Ported many texture engine changes from Snowglobe.
Diffstat (limited to 'linden/indra/newview/lltexturectrl.cpp')
-rw-r--r--linden/indra/newview/lltexturectrl.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp
index 5500973..f4476fb 100644
--- a/linden/indra/newview/lltexturectrl.cpp
+++ b/linden/indra/newview/lltexturectrl.cpp
@@ -556,12 +556,12 @@ void LLFloaterTexturePicker::draw()
556 if(mImageAssetID.notNull()) 556 if(mImageAssetID.notNull())
557 { 557 {
558 mTexturep = gImageList.getImage(mImageAssetID, MIPMAP_YES, IMMEDIATE_NO); 558 mTexturep = gImageList.getImage(mImageAssetID, MIPMAP_YES, IMMEDIATE_NO);
559 mTexturep->setBoostLevel(LLViewerImage::BOOST_PREVIEW); 559 mTexturep->setBoostLevel(LLViewerImageBoostLevel::BOOST_PREVIEW);
560 } 560 }
561 else if (!mFallbackImageName.empty()) 561 else if (!mFallbackImageName.empty())
562 { 562 {
563 mTexturep = gImageList.getImageFromFile(mFallbackImageName); 563 mTexturep = gImageList.getImageFromFile(mFallbackImageName);
564 mTexturep->setBoostLevel(LLViewerImage::BOOST_PREVIEW); 564 mTexturep->setBoostLevel(LLViewerImageBoostLevel::BOOST_PREVIEW);
565 } 565 }
566 566
567 if (mTentativeLabel) 567 if (mTentativeLabel)
@@ -1314,13 +1314,13 @@ void LLTextureCtrl::draw()
1314 else if (!mImageAssetID.isNull()) 1314 else if (!mImageAssetID.isNull())
1315 { 1315 {
1316 mTexturep = gImageList.getImage(mImageAssetID, MIPMAP_YES, IMMEDIATE_NO); 1316 mTexturep = gImageList.getImage(mImageAssetID, MIPMAP_YES, IMMEDIATE_NO);
1317 mTexturep->setBoostLevel(LLViewerImage::BOOST_PREVIEW); 1317 mTexturep->setBoostLevel(LLViewerImageBoostLevel::BOOST_PREVIEW);
1318 } 1318 }
1319 else if (!mFallbackImageName.empty()) 1319 else if (!mFallbackImageName.empty())
1320 { 1320 {
1321 // Show fallback image. 1321 // Show fallback image.
1322 mTexturep = gImageList.getImageFromFile(mFallbackImageName); 1322 mTexturep = gImageList.getImageFromFile(mFallbackImageName);
1323 mTexturep->setBoostLevel(LLViewerImage::BOOST_PREVIEW); 1323 mTexturep->setBoostLevel(LLViewerImageBoostLevel::BOOST_PREVIEW);
1324 } 1324 }
1325 1325
1326 // Border 1326 // Border