summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerdisplay.cpp
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2012-01-04 13:12:46 -0500
committerprep <prep@lindenlab.com>2012-01-04 13:12:46 -0500
commit06bfbf61e16ffec0e54f131a7f3b37c475f10cd9 (patch)
treee0eb2de9ecbbea0d2eda3c698e7f403d834632b5 /indra/newview/llviewerdisplay.cpp
parentd2609e7dda6c52b9f17e0fe5657514d2e6be18a7 (diff)
Path-177. Updated to newest version of LLPathingLibrary
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
-rw-r--r--indra/newview/llviewerdisplay.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index d710076228..2b2dd5ef7c 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -885,6 +885,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
LLAppViewer::instance()->pingMainloopTimeout("Display:RenderGeom");
bool exclusiveDraw = false;
BOOL allowRenderables = false;
+ BOOL allowPathToBeDrawn = false;
if (!(LLAppViewer::instance()->logoutRequestSent() && LLAppViewer::instance()->hasSavedFinalSnapshot())
&& !gRestoreGL)
{
@@ -906,6 +907,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
{
allowRenderables = true;
}
+ //Determine if we should also draw a user supplied path on top of the scene
+ if ( pFloater && pFloater->getShowPathToggle() )
+ {
+ allowPathToBeDrawn = true;
+ }
//Navmesh
if ( LLPathingLib::getInstance()->getRenderNavMeshState() )
{
@@ -929,7 +935,12 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
LLPathingLib::getInstance()->renderNavMeshShapesVBO();
exclusiveDraw = true;
- }
+ }
+ //User designated path
+ if ( allowPathToBeDrawn )
+ {
+ LLPathingLib::getInstance()->renderPath();
+ }
}
}