diff options
| author | prep <prep@lindenlab.com> | 2011-12-01 10:54:21 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-12-01 10:54:21 -0500 |
| commit | 0538dcf62e3c13b50fc0828e930fa50e4050302d (patch) | |
| tree | 22db10891a271b591766bd048f48dfbef5800f2d /indra/newview/pipeline.cpp | |
| parent | 38b7f033b28027711a03e5a28d6ea384be909318 (diff) | |
New navmesh viewer options, rendering improvements, etc.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index f797822d41..97b69370c9 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -104,8 +104,7 @@ #include "lltoolpie.h" #include "llcurl.h" #include "llnotifications.h" -//prep# -#include "LLPathingLib.h" +#include "llpathinglib.h" void check_stack_depth(S32 stack_depth) { @@ -3787,9 +3786,16 @@ void LLPipeline::renderGeom(LLCamera& camera, BOOL forceVBOUpdate) LLVertexBuffer::unbind(); //prep# - if ( LLPathingLib::getInstance() ) - { - LLPathingLib::getInstance()->renderNavMesh(); + if ( LLPathingLib::getInstance() ) + { + if ( LLPathingLib::getInstance()->getRenderNavMeshState() ) + { + LLPathingLib::getInstance()->renderNavMesh(); + } + if ( LLPathingLib::getInstance()->getRenderNavMeshandShapesState() ) + { + LLPathingLib::getInstance()->renderNavMeshandShapes(); + } } if (!LLPipeline::sReflectionRender && !LLPipeline::sRenderDeferred) |