diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-04-13 11:55:44 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-04-13 11:55:44 -0500 |
| commit | 3efa013ee4e037c2ba20aaf550aa06bcf578b145 (patch) | |
| tree | 1808e32d080fa0ff00a5976ca09c21f29e724938 /indra/newview | |
| parent | 94a6782510b72f0f029bc06be7cfa962082fd73c (diff) | |
MAINT-939 Potential fix for crash when editing objects.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llmaniptranslate.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp index 4dd3fa1722..f8088d04b4 100644 --- a/indra/newview/llmaniptranslate.cpp +++ b/indra/newview/llmaniptranslate.cpp @@ -1581,7 +1581,11 @@ void LLManipTranslate::renderSnapGuides() LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_GREATER); LLGLEnable stipple(GL_LINE_STIPPLE); gGL.flush(); - glLineStipple(1, 0x3333); + + if (!LLGLSLShader::sNoFixedFunction) + { + glLineStipple(1, 0x3333); + } switch (mManipPart) { 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); |