summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorprep <none@none>2011-12-09 15:56:12 -0500
committerprep <none@none>2011-12-09 15:56:12 -0500
commit4c60c59610493c5f95776af2ac93ff34f741b427 (patch)
tree92e5057c08cb35817a1761df22295a596b4eebf0 /indra/newview/pipeline.cpp
parenta5e2dad53dda8585b82a2e6ae84f178aa25bcb67 (diff)
added vbo support for physics shapes & fixed navmesh/shape menu toggle
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 40cefb8d05..8b51d1cd6c 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -3646,21 +3646,21 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate)
{
- //prep#
- enableLightsFullbright(LLColor4(1,1,1,1));
-
+
if ( LLPathingLib::getInstance() )
{
-
+ //prep#
+ enableLightsFullbright(LLColor4(1,1,1,1));
+
bool exclusiveDraw = false;
if ( LLPathingLib::getInstance()->getRenderNavMeshState() )
{
LLPathingLib::getInstance()->renderNavMesh();
exclusiveDraw = true;
}
- if ( LLPathingLib::getInstance()->getRenderNavMeshandShapesState() )
+ if ( LLPathingLib::getInstance()->getRenderShapeState() )
{
- //LLPathingLib::getInstance()->renderNavMeshShapesVBO();
+ LLPathingLib::getInstance()->renderNavMeshShapesVBO();
exclusiveDraw = true;
}
@@ -8142,6 +8142,7 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
gGL.setColorMask(true, false);
renderGeom(camera);
+
}
LLPipeline::sUnderWaterRender = FALSE;