diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-02-13 10:21:51 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-02-13 10:21:51 -0800 |
| commit | 06ec2607ce9db7cecee7c76b52cca5f263ef7402 (patch) | |
| tree | 3ed56bbe956c6091f6f5891f5bdcded1ece77ec3 | |
| parent | 33ad069ea6138cb0e161a9131dc076ffa719c871 (diff) | |
| parent | ec335c7007ac05a098fed320fc2bbc650f0268ea (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
| -rw-r--r-- | autobuild.xml | 8 | ||||
| -rw-r--r-- | indra/llrender/llrendernavprim.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/autobuild.xml b/autobuild.xml index 697285a68d..37aa012816 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1110,9 +1110,9 @@ <key>archive</key> <map> <key>hash</key> - <string>11f47c76b9a3ebb29ca228043d33ef95</string> + <string>ba4f8022af6ef39ed7ec9f64125a24fc</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_lion/rev/249128/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120208.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary_lion/rev/249340/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120213.tar.bz2</string> </map> <key>name</key> <string>darwin</string> @@ -1134,9 +1134,9 @@ <key>archive</key> <map> <key>hash</key> - <string>e058374056856a7a0a7dec48625b937f</string> + <string>3c68384687fcaafb8b1edc776296c02b</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/249128/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120208.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/249340/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120213.tar.bz2</string> </map> <key>name</key> <string>windows</string> diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp index 71e808d04e..b99a8cdc86 100644 --- a/indra/llrender/llrendernavprim.cpp +++ b/indra/llrender/llrendernavprim.cpp @@ -38,6 +38,7 @@ LLRenderNavPrim gRenderNav; void LLRenderNavPrim::renderSegment( const LLVector3& start, const LLVector3& end, int color, bool overlayMode ) const
{
LLGLSLShader::sNoFixedFunction = false;
+ LLGLEnable smooth(GL_LINE_SMOOTH);
LLColor4 colorA( color );
glLineWidth(1.5f);
gGL.color3fv( colorA.mV );
@@ -51,6 +52,7 @@ void LLRenderNavPrim::renderSegment( const LLVector3& start, const LLVector3& en gGL.flush();
LLGLSLShader::sNoFixedFunction = true;
+ LLGLDisable smoothout(GL_LINE_SMOOTH);
glLineWidth(1.0f);
}
//=============================================================================
@@ -86,7 +88,7 @@ void LLRenderNavPrim::renderTri( const LLVector3& a, const LLVector3& b, const L void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt )
{
LLGLSUIDefault gls_ui;
- glEnable( GL_DEPTH_TEST );
+ LLGLEnable depth( GL_DEPTH_TEST );
LLGLEnable cull( GL_CULL_FACE );
glLineWidth(1.5f);
LLGLSLShader::sNoFixedFunction = false; @@ -94,11 +96,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);
//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);
}
//=============================================================================
void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, int color ) const
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 3e21334cd4..0774ab4029 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -907,9 +907,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) //NavMesh if ( llPathingLibInstance->getRenderNavMeshState() ) { - glClearColor(0.0f, 0.0f, 0.0f, 0.5f); - glEnable(GL_DEPTH_TEST); - gGL.setAmbientLightColor( LLColor4::white ); llPathingLibInstance->renderNavMesh(); exclusiveDraw = true; } |