diff --git a/indra/llrender/llrendernavprim.cpp b/indra/llrender/llrendernavprim.cpp index fb762b0870a61571b6cf1e04fe1e2f9dd3b3f9ec..d6da722e0c1af0b93ac559ef08d0099e1e116695 100644 --- a/indra/llrender/llrendernavprim.cpp +++ b/indra/llrender/llrendernavprim.cpp @@ -35,7 +35,7 @@ //============================================================================= LLRenderNavPrim gRenderNav; //============================================================================= -void LLRenderNavPrim::renderSegment( const LLVector3& start, const LLVector3& end, int color ) const +void LLRenderNavPrim::renderLLSegment( const LLVector3& start, const LLVector3& end, const LLColor4U& color ) const { LLColor4 colorA( color ); gGL.color3fv( colorA.mV ); @@ -81,7 +81,7 @@ void LLRenderNavPrim::renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ) pVBO->drawArrays( LLRender::TRIANGLES, 0, vertCnt ); } //============================================================================= -void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, int color ) const +void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, const LLColor4U& color ) const { for (int k=0; k<3; k++) { @@ -90,7 +90,7 @@ void LLRenderNavPrim::renderStar( const LLVector3& center, const float scale, in star[k] = 0.5f; pt1 = center + star; pt2 = center - star; - renderSegment( pt1, pt2, color ); + renderLLSegment( pt1, pt2, color ); } } //============================================================================= diff --git a/indra/llrender/llrendernavprim.h b/indra/llrender/llrendernavprim.h index 044a20f0fe7c62405524fd6b5b93bd4a063bb68e..d5899471a63a1022ab0c136b3bad6c09919b26e4 100644 --- a/indra/llrender/llrendernavprim.h +++ b/indra/llrender/llrendernavprim.h @@ -40,7 +40,7 @@ class LLRenderNavPrim { public: //Draw a line - void renderSegment( const LLVector3& start, const LLVector3& end, int color ) const; + void renderLLSegment( const LLVector3& start, const LLVector3& end, const LLColor4U& color ) const; //Draw simple tri void renderTri( const LLVector3& a, const LLVector3& b, const LLVector3& c, int color ) const; //Draw simple tri @@ -48,7 +48,7 @@ class LLRenderNavPrim //Draw the contents of vertex buffer void renderNavMeshVB( LLVertexBuffer* pVBO, int vertCnt ); //Draw a star - void renderStar( const LLVector3& center, const float scale, int color ) const; + void renderStar( const LLVector3& center, const float scale, const LLColor4U& color ) const; //Flush the device void flushDevice() { gGL.flush(); } private: