summaryrefslogtreecommitdiff
path: root/indra/newview/lltextureview.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2010-03-07 21:19:21 -0700
committerXiaohong Bao <bao@lindenlab.com>2010-03-07 21:19:21 -0700
commit6220697f1893bec2d2a4a5fd263dc4f7aa3a6c3f (patch)
tree7b4bcfa88b45d187d742fccac9097e9e55cf0b30 /indra/newview/lltextureview.cpp
parent93051dc23cb3252af327a9b113abc45de154ff4e (diff)
parent6a8b63e9de7ee78db2e24ed77f855c1e19790af2 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/lltextureview.cpp')
-rw-r--r--indra/newview/lltextureview.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
index 98731f90f4..1b44063840 100644
--- a/indra/newview/lltextureview.cpp
+++ b/indra/newview/lltextureview.cpp
@@ -683,6 +683,10 @@ void LLTextureView::draw()
iter != gTextureList.mImageList.end(); )
{
LLPointer<LLViewerFetchedTexture> imagep = *iter++;
+ if(!imagep->hasFetcher())
+ {
+ continue ;
+ }
S32 cur_discard = imagep->getDiscardLevel();
S32 desired_discard = imagep->mDesiredDiscardLevel;