livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
Josh Bell 2007-01-08 21:58:33 +00:00
parent fbf49910f3
commit 8534623734
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/pipeline.cpp
View File

@ -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);
}