diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-14 14:10:51 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-14 14:10:51 -0700 |
| commit | 9f1331375c781ccf898a3b87a2c3bbb09a06d0c2 (patch) | |
| tree | 38878ec6e4cc21903304508f1273d3dea1657dda /indra | |
| parent | d4fb7c99febf07b4eb7f3a9d2eab485e356d1439 (diff) | |
| parent | 72f6df493cacdd8ccf160dd785081e5b2b579862 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llrendernavprim.h | 3 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index d88fe656b7..158093690e 100644 --- a/indra/llrender/llrendernavprim.h +++ b/indra/llrender/llrendernavprim.h @@ -47,7 +47,8 @@ public: void renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt );
//Draw a star
void renderStar( const LLVector3& center, const float scale, int color ) const;
-
+ //Flush the device
+ void flushDevice() { gGL.flush(); }
private:
};
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 28d59785d3..f0c5342425 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -4335,7 +4335,7 @@ void LLPipeline::renderDebug() //NavMesh
if ( pathfindingConsole->isRenderNavMesh() )
{
- glLineWidth(1.5f);
+ glLineWidth(2.0f);
LLGLEnable cull(GL_CULL_FACE);
if ( pathfindingConsole->isRenderWorld() )
{
|