diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
| commit | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (patch) | |
| tree | 12a4e92720c531105a21ef4f9f363b8572d72a3a /indra/newview/lltextureview.cpp | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/newview/lltextureview.cpp')
| -rw-r--r-- | indra/newview/lltextureview.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index 06c014a7e7..4df5444d66 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -641,16 +641,20 @@ void LLTextureView::draw() #if 1 if (pri < HIGH_PRIORITY && gSelectMgr) { - S32 te; - LLViewerObject *objectp; - LLObjectSelectionHandle selection = gSelectMgr->getSelection(); - for (selection->getFirstTE(&objectp, &te); objectp; selection->getNextTE(&objectp, &te)) + struct f : public LLSelectedTEFunctor { - if (imagep == objectp->getTEImage(te)) + LLViewerImage* mImage; + f(LLViewerImage* image) : mImage(image) {} + virtual bool apply(LLViewerObject* object, S32 te) { - pri += 3*HIGH_PRIORITY; - break; + return (mImage == object->getTEImage(te)); } + } func(imagep); + const bool firstonly = true; + bool match = gSelectMgr->getSelection()->applyToTEs(&func, firstonly); + if (match) + { + pri += 3*HIGH_PRIORITY; } } #endif |