diff options
| author | prep <none@none> | 2012-02-24 13:16:35 -0500 |
|---|---|---|
| committer | prep <none@none> | 2012-02-24 13:16:35 -0500 |
| commit | b7d93d8adf9f604a2f345336bd0e37c08a0d10cb (patch) | |
| tree | 98ac371a36c13cb5fa89e99799b2f929ff7abd41 | |
| parent | 11bc6e9780d741cdd9405a1dcbe6b6dfb728c15a (diff) | |
Path-267: Add support for rendering of walkable objects, obstacles and material phantoms.
| -rw-r--r-- | indra/llrender/llrendernavprim.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llfloaterpathfindingconsole.cpp | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp index 30d470729f..bd05f05751 100644 --- a/indra/llrender/llrendernavprim.cpp +++ b/indra/llrender/llrendernavprim.cpp @@ -87,8 +87,7 @@ void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const L //=============================================================================
void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt )
{
- LLGLSUIDefault gls_ui;
- LLGLEnable depth( GL_DEPTH_TEST );
+ LLGLEnable blend( GL_BLEND );
LLGLEnable cull( GL_CULL_FACE );
glLineWidth(1.5f);
LLGLSLShader::sNoFixedFunction = false; @@ -96,13 +95,13 @@ void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ) pVBO->setBuffer( LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_COLOR | LLVertexBuffer::MAP_NORMAL );
pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt );
glPolygonMode( GL_FRONT_AND_BACK, GL_LINE );
- LLGLEnable smooth(GL_LINE_SMOOTH);
+ LLGLEnable smooth( GL_LINE_SMOOTH );
//pass 2 outlined
pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt );
LLGLSLShader::sNoFixedFunction = true;
glLineWidth(1.0f);
glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
- LLGLDisable smoothout(GL_LINE_SMOOTH);
+ LLGLDisable smoothout( GL_LINE_SMOOTH );
}
//=============================================================================
void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, int color ) const
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp index 7795397803..e09bc028ce 100644 --- a/indra/newview/llfloaterpathfindingconsole.cpp +++ b/indra/newview/llfloaterpathfindingconsole.cpp @@ -248,7 +248,7 @@ void LLFloaterPathfindingConsole::onClose(bool pIsAppQuitting) {
mAgentStateSlot.disconnect();
}
-
+ LLPathingLib::getInstance()->cleanupResidual();
LLFloater::onClose(pIsAppQuitting);
}
|