summaryrefslogtreecommitdiff
path: root/indra/llrender/llrendernavprim.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-27 10:12:53 +0200
committerGitHub <noreply@github.com>2024-03-27 10:12:53 +0200
commit16e638db975278f6018fe1e21ba1954b7f159149 (patch)
tree876030bddc3b9e6cd885f829fb4a071aea309508 /indra/llrender/llrendernavprim.cpp
parentf815b015cecda18098dd2d16f65682a37e1bff7c (diff)
parent990c8b81dad8bd0580c2c48f77e99b3ac53e581e (diff)
Merge pull request #1062 from secondlife/marchcat/yz-merge
Merge main into maint YZ
Diffstat (limited to 'indra/llrender/llrendernavprim.cpp')
-rw-r--r--indra/llrender/llrendernavprim.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp
index d610a44bc6..eea3077632 100644
--- a/indra/llrender/llrendernavprim.cpp
+++ b/indra/llrender/llrendernavprim.cpp
@@ -40,20 +40,20 @@ LLRenderNavPrim gRenderNav;
//=============================================================================
void LLRenderNavPrim::renderLLTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, const LLColor4U& color ) const
{
- LLColor4 cV(color);
- gGL.color4fv( cV.mV );
- gGL.begin(LLRender::TRIANGLES);
+ gGL.color4ubv(color.mV);
+
+ gGL.begin(LLRender::TRIANGLES);
{
gGL.vertex3fv( a.mV );
gGL.vertex3fv( b.mV );
gGL.vertex3fv( c.mV );
}
- gGL.end();
+ gGL.end();
}
//=============================================================================
void LLRenderNavPrim::renderNavMeshVB( U32 mode, LLVertexBuffer* pVBO, int vertCnt )
{
pVBO->setBuffer();
- pVBO->drawArrays( mode, 0, vertCnt );
+ pVBO->drawArrays( mode, 0, vertCnt );
}
//=============================================================================