From 4dabd9c0472deb49573fdafef2fa413e59703f19 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 2 Mar 2007 21:25:50 +0000 Subject: merge release@58699 beta-1-14-0@58707 -> release --- indra/newview/lldrawpoolclouds.cpp | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'indra/newview/lldrawpoolclouds.cpp') diff --git a/indra/newview/lldrawpoolclouds.cpp b/indra/newview/lldrawpoolclouds.cpp index c279f085d5..d611338248 100644 --- a/indra/newview/lldrawpoolclouds.cpp +++ b/indra/newview/lldrawpoolclouds.cpp @@ -17,7 +17,7 @@ #include "pipeline.h" LLDrawPoolClouds::LLDrawPoolClouds() : - LLDrawPool(POOL_CLOUDS, DATA_SIMPLE_IL_MASK, 0) + LLDrawPool(POOL_CLOUDS) { } @@ -26,16 +26,15 @@ LLDrawPool *LLDrawPoolClouds::instancePool() return new LLDrawPoolClouds(); } +BOOL LLDrawPoolClouds::addFace(LLFace* face) +{ + llerrs << "WTF?" << llendl; + return FALSE; +} + void LLDrawPoolClouds::enqueue(LLFace *facep) { - if (facep->isState(LLFace::BACKLIST)) - { - mMoveFace.put(facep); - } - else - { - mDrawFace.push_back(facep); - } + mDrawFace.push_back(facep); facep->mDistance = (facep->mCenterAgent - gCamera->getOrigin()) * gCamera->getAtAxis(); } @@ -71,10 +70,6 @@ void LLDrawPoolClouds::render(S32 pass) gPipeline.enableLightsFullbright(LLColor4(1.f,1.f,1.f)); mDrawFace[0]->bindTexture(); - - bindGLVertexPointer(); - bindGLTexCoordPointer(); - bindGLNormalPointer(); std::sort(mDrawFace.begin(), mDrawFace.end(), LLFace::CompareDistanceGreater()); -- cgit v1.2.3