diff options
author | Steven Bennetts <steve@lindenlab.com> | 2008-05-08 18:41:20 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2008-05-08 18:41:20 +0000 |
commit | 63e7894148fdc7064b422bf65a0b75ffcf293496 (patch) | |
tree | 4cca89d9da518f264001e7cb4950f453647f2e5f /indra/newview/llviewerjoint.cpp | |
parent | a75b85112ffa4b7140561083c2e5de05fb510805 (diff) |
QAR-570 maint-render-4 merge
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
Diffstat (limited to 'indra/newview/llviewerjoint.cpp')
-rw-r--r-- | indra/newview/llviewerjoint.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerjoint.cpp b/indra/newview/llviewerjoint.cpp index b1cad86a61..9bf392249e 100644 --- a/indra/newview/llviewerjoint.cpp +++ b/indra/newview/llviewerjoint.cpp @@ -148,7 +148,7 @@ void LLViewerJoint::renderSkeleton(BOOL recursive) //---------------------------------------------------------------- if (mComponents & SC_AXES) { - gGL.begin(GL_LINES); + gGL.begin(LLVertexBuffer::LINES); gGL.color3f( 1.0f, 0.0f, 0.0f ); gGL.vertex3f( 0.0f, 0.0f, 0.0f ); gGL.vertex3f( 0.1f, 0.0f, 0.0f ); @@ -170,7 +170,7 @@ void LLViewerJoint::renderSkeleton(BOOL recursive) { gGL.color3f( 1.0f, 1.0f, 0.0f ); - gGL.begin(GL_TRIANGLES); + gGL.begin(LLVertexBuffer::TRIANGLES); // joint top half glNormal3f(nc, nc, nc); @@ -360,7 +360,7 @@ void LLViewerJoint::drawBone() // render the bone gGL.color3f( 0.5f, 0.5f, 0.0f ); - gGL.begin(GL_TRIANGLES); + gGL.begin(LLVertexBuffer::TRIANGLES); gGL.vertex3f( length, 0.0f, 0.0f); gGL.vertex3f( 0.0f, boneSize, 0.0f); |