From 8534623734e64387736ddb76683939104d796ade Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Mon, 8 Jan 2007 21:58:33 +0000 Subject: Showstopper merge from maintenance svn merge -r 56564:56570 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance NOTE: This skips -r 56560:56464 which should be merged after being QA'd --- indra/newview/pipeline.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 8bc9007310..f4de3b0dc3 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -1528,12 +1528,14 @@ LLDrawPool* LLPipeline::getPoolFromTE(const LLTextureEntry* te, LLViewerImage* i { alpha = alpha || (imagep->getComponents() == 4) || (imagep->getComponents() == 2); } - +#if 0 // Not currently used if (te->getMediaFlags() == LLTextureEntry::MF_WEB_PAGE) { return gPipeline.getPool(LLDrawPool::POOL_MEDIA, imagep); } - else if (alpha) + else +#endif + if (alpha) { return gPipeline.getPool(LLDrawPool::POOL_ALPHA); } -- cgit v1.2.3