From c902ff338b85d244bd0a1a972c9d0eed35668c44 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Thu, 17 Nov 2011 11:53:48 -0600
Subject: SH-2670 Fix for terrain being wrong detail.

---
 indra/newview/lldrawpoolterrain.cpp | 30 ++++--------------------------
 1 file 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
 	{
-- 
cgit v1.2.3