diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-04-13 13:58:55 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-04-13 13:58:55 -0500 |
| commit | b2999c50890c22eac950bcec0f05ad20b4b01f49 (patch) | |
| tree | fbf415b02529405739b8e0afc2d517b9faca20d0 /indra/newview/llselectmgr.cpp | |
| parent | f78039fd9509642296f2ff9c298c9828b6613975 (diff) | |
| parent | 3efa013ee4e037c2ba20aaf550aa06bcf578b145 (diff) | |
merge
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index eec2c0a521..c69dcfad81 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -5583,7 +5583,7 @@ void pushWireframe(LLDrawable* drawable) for (S32 i = 0; i < volume->getNumVolumeFaces(); ++i) { const LLVolumeFace& face = volume->getVolumeFace(i); - LLVertexBuffer::drawElements(LLRender::TRIANGLES, face.mPositions, face.mTexCoords, face.mNumIndices, face.mIndices); + LLVertexBuffer::drawElements(LLRender::TRIANGLES, face.mPositions, NULL, face.mNumIndices, face.mIndices); } } @@ -5610,7 +5610,7 @@ void LLSelectNode::renderOneWireframe(const LLColor4& color) if (shader) { - gHighlightProgram.bind(); + gDebugProgram.bind(); } gGL.matrixMode(LLRender::MM_MODELVIEW); |