Second Life viewer sources 1.20.10

1 files changed, 1 insertions, 40 deletions

diff --git a/linden/indra/newview/lldrawpoolbump.cpp b/linden/indra/newview/lldrawpoolbump.cpp
index c7c19d9..6154c5b 100644
--- a/linden/indra/newview/lldrawpoolbump.cpp
+++ b/linden/indra/newview/lldrawpoolbump.cpp
@@ -556,30 +556,7 @@ void LLDrawPoolBump::renderGroup(LLSpatialGroup* group, U32 type, U32 mask, BOOL
         for (LLSpatialGroup::drawmap_elem_t::iterator k = draw_info.begin(); k != draw_info.end(); ++k) 
         {
                 LLDrawInfo& params = **k;
-                if (LLPipeline::sDynamicReflections)
-                {
-                        if (params.mReflectionMap.notNull())
-                        {
-                                params.mReflectionMap->bind();
-                        }
-                        else
-                        {
-                                if (params.mModelMatrix)
-                                {
-                                        sCubeMap = gPipeline.findReflectionMap(params.mModelMatrix->getTranslation());  
-                                }
-
-                                if (sCubeMap)
-                                {
-                                        sCubeMap->bind();
-                                }
-                                else if (gSky.mVOSkyp->getCubeMap())
-                                {
-                                        gSky.mVOSkyp->getCubeMap()->bind();
-                                }
-                        }
-                }
-                
+                        
                 applyModelMatrix(params);
 
                 params.mVertexBuffer->setBuffer(mask);
@@ -1121,22 +1098,6 @@ void LLDrawPoolBump::pushBatch(LLDrawInfo& params, U32 mask, BOOL texture)
                 {
                         LLImageGL::unbindTexture(0);
                 }
-
-                if (LLPipeline::sDynamicReflections)
-                {
-                        LLCubeMap* cube_map = params.mReflectionMap;
-
-                        if (!cube_map && params.mModelMatrix)
-                        {
-                                cube_map = gPipeline.findReflectionMap(params.mModelMatrix->getTranslation());
-                        }
-
-                        if (cube_map)
-                        {
-                                cube_map->enableTexture(cube_channel);
-                                cube_map->bind();
-                        }       
-                }
         }
         
         params.mVertexBuffer->setBuffer(mask);