aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lltextureview.cpp
diff options
context:
space:
mode:
authorArmin Weatherwax2010-07-29 23:04:28 +0200
committerJacek Antonelli2010-08-01 15:59:32 -0500
commitd0e4b54cef5f8b582ece01d6a206c4e93f649b13 (patch)
treeb77d7bb13bd8baf5e01ba2eb0296d835ddd317d4 /linden/indra/newview/lltextureview.cpp
parentfix crash on relog introduced in 66b8150d4ec94161887c (diff)
downloadmeta-impy-d0e4b54cef5f8b582ece01d6a206c4e93f649b13.zip
meta-impy-d0e4b54cef5f8b582ece01d6a206c4e93f649b13.tar.gz
meta-impy-d0e4b54cef5f8b582ece01d6a206c4e93f649b13.tar.bz2
meta-impy-d0e4b54cef5f8b582ece01d6a206c4e93f649b13.tar.xz
don't show textures without fetcher in texture-console (backport from Viewer 2.1)
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/lltextureview.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/linden/indra/newview/lltextureview.cpp b/linden/indra/newview/lltextureview.cpp
index cda01fa..04cebf5 100644
--- a/linden/indra/newview/lltextureview.cpp
+++ b/linden/indra/newview/lltextureview.cpp
@@ -666,6 +666,10 @@ void LLTextureView::draw()
666 iter != gImageList.mImageList.end(); ) 666 iter != gImageList.mImageList.end(); )
667 { 667 {
668 LLPointer<LLViewerImage> imagep = *iter++; 668 LLPointer<LLViewerImage> imagep = *iter++;
669 if(!imagep->hasFetcher())
670 {
671 continue ;
672 }
669 673
670 S32 cur_discard = imagep->getDiscardLevel(); 674 S32 cur_discard = imagep->getDiscardLevel();
671 S32 desired_discard = imagep->mDesiredDiscardLevel; 675 S32 desired_discard = imagep->mDesiredDiscardLevel;
@@ -711,7 +715,7 @@ void LLTextureView::draw()
711 pri = imagep->getDecodePriority(); 715 pri = imagep->getDecodePriority();
712 } 716 }
713 pri = llclamp(pri, 0.0f, HIGH_PRIORITY-1.f); 717 pri = llclamp(pri, 0.0f, HIGH_PRIORITY-1.f);
714 718
715 if (sDebugImages.find(imagep) != sDebugImages.end()) 719 if (sDebugImages.find(imagep) != sDebugImages.end())
716 { 720 {
717 pri += 4*HIGH_PRIORITY; 721 pri += 4*HIGH_PRIORITY;
@@ -773,7 +777,7 @@ void LLTextureView::draw()
773 { 777 {
774 display_image_list.insert(std::make_pair(pri, imagep)); 778 display_image_list.insert(std::make_pair(pri, imagep));
775 } 779 }
776 } 780 }//for
777 781
778 if (mPrintList) 782 if (mPrintList)
779 { 783 {