summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorprep <none@none>2012-04-24 13:15:00 -0400
committerprep <none@none>2012-04-24 13:15:00 -0400
commit7200b1500247ebdfbf69bb125c80b9528050698c (patch)
treef1541742ca99b9fe12f5b05050bfa7db14a8273d /indra
parentc32f12afd3e6d22614a84a81918c26b5f82e5efa (diff)
Added support for rendering the regions water height.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/pipeline.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 89ce6c8cd8..b162ec422a 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4437,6 +4437,20 @@ void LLPipeline::renderDebug()
}
}
+
+ if ( pathfindingConsole->isRenderWaterPlane() )
+ {
+ if (LLGLSLShader::sNoFixedFunction)
+ {
+ LLGLEnable blend(GL_BLEND);
+ gPathfindingProgram.uniform1f("alpha_scale", 0.90f);
+ llPathingLibInstance->renderSimpleShapes( gGL, gAgent.getRegion()->getWaterHeight() );
+ }
+ else
+ {
+ llPathingLibInstance->renderSimpleShapes( gGL, gAgent.getRegion()->getWaterHeight() );
+ }
+ }
//physics/exclusion shapes
if ( pathfindingConsole->isRenderAnyShapes() )
{