From 8534623734e64387736ddb76683939104d796ade Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Mon, 8 Jan 2007 21:58:33 +0000
Subject: [PATCH] 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(-)
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 8bc90073109..f4de3b0dc3e 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);
}
--
GitLab