diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-17 11:53:48 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-17 11:53:48 -0600 |
| commit | c902ff338b85d244bd0a1a972c9d0eed35668c44 (patch) | |
| tree | 0066b396c91b2d4128c48951396cabbe1e23d5c5 /indra | |
| parent | e822ecc8035fe2624270c0c81ace9f74dcc8a8e1 (diff) | |
SH-2670 Fix for terrain being wrong detail.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/lldrawpoolterrain.cpp | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index b8e653c5de..b95d8296fa 100644 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -130,24 +130,9 @@ void LLDrawPoolTerrain::beginRenderPass( S32 pass ) LLFastTimer t(FTM_RENDER_TERRAIN); LLFacePool::beginRenderPass(pass); - if (sDetailMode > 0) - { - sShader = LLPipeline::sUnderWaterRender ? - &gTerrainWaterProgram : - &gTerrainProgram; - } - else - { - if (LLPipeline::sUnderWaterRender) - { - sShader = &gObjectSimpleNonIndexedTexGenWaterProgram; - } - else - { - sShader = &gObjectSimpleNonIndexedTexGenProgram; - } - } - + sShader = LLPipeline::sUnderWaterRender ? + &gTerrainWaterProgram : + &gTerrainProgram; if (mVertexShaderLevel > 1 && sShader->mShaderLevel > 0) { @@ -210,14 +195,7 @@ void LLDrawPoolTerrain::render(S32 pass) { gPipeline.enableLightsDynamic(); - if (sDetailMode > 0) - { - renderFullShader(); - } - else - { - renderSimple(); - } + renderFullShader(); } else { |