don't show textures without fetcher in texture-console (backport from Viewer 2.1)

2 files changed, 7 insertions, 3 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()
                          iter != gImageList.mImageList.end(); )
                 {
                         LLPointer<LLViewerImage> imagep = *iter++;
+                        if(!imagep->hasFetcher())
+                        {
+                                continue ;
+                        }
 
                         S32 cur_discard = imagep->getDiscardLevel();
                         S32 desired_discard = imagep->mDesiredDiscardLevel;
@@ -711,7 +715,7 @@ void LLTextureView::draw()
                                 pri = imagep->getDecodePriority();
                         }
                         pri = llclamp(pri, 0.0f, HIGH_PRIORITY-1.f);
-                        
+
                         if (sDebugImages.find(imagep) != sDebugImages.end())
                         {
                                 pri += 4*HIGH_PRIORITY;
@@ -773,7 +777,7 @@ void LLTextureView::draw()
                         {
                                 display_image_list.insert(std::make_pair(pri, imagep));
                         }
-                }
+                }//for
                 
                 if (mPrintList)
                 {
diff --git a/linden/indra/newview/llviewerimage.h b/linden/indra/newview/llviewerimage.h
index fdf8ff0..fc27f17 100644
--- a/linden/indra/newview/llviewerimage.h
+++ b/linden/indra/newview/llviewerimage.h
@@ -277,7 +277,7 @@ public:
         void setDecodePriority(F32 priority = -1.0f);
 
         bool updateFetch();
-        
+        BOOL hasFetcher() const { return mHasFetcher;}
         // Override the computation of discard levels if we know the exact output
         // size of the image.  Used for UI textures to not decode, even if we have
         // more data.