diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2011-12-20 17:04:33 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2011-12-20 17:04:33 -0800 |
| commit | 28ca7a76cd1290ce8d83ef56feb1dfadc0fd0d37 (patch) | |
| tree | 3dc2358f5a2d6eb6cc315704bb2c68014c0639ed /indra/llrender/llrendernavprim.cpp | |
| parent | fd29df8c720b6c61680ecea002ecf5c116a69fde (diff) | |
| parent | d22baa365c06c4f27c526e74ceafbf63dd39ac10 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/llrender/llrendernavprim.cpp')
| -rw-r--r-- | indra/llrender/llrendernavprim.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp index 3b217b426f..11e60548e2 100644 --- a/indra/llrender/llrendernavprim.cpp +++ b/indra/llrender/llrendernavprim.cpp @@ -36,7 +36,8 @@ LLRenderNavPrim gRenderNav;
//=============================================================================
void LLRenderNavPrim::renderSegment( const LLVector3& start, const LLVector3& end, int color ) const
-{
+{
+ LLGLSLShader::sNoFixedFunction = false;
LLColor4 colorA( color );
glLineWidth(1.5f);
gGL.color3fv( colorA.mV );
@@ -48,6 +49,8 @@ void LLRenderNavPrim::renderSegment( const LLVector3& start, const LLVector3& en }
gGL.end();
+ gGL.flush();
+ LLGLSLShader::sNoFixedFunction = true;
glLineWidth(1.0f);
}
//=============================================================================
|