summaryrefslogtreecommitdiff
path: root/indra/llui/llui.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-04-13 11:55:44 -0500
committerDave Parks <davep@lindenlab.com>2012-04-13 11:55:44 -0500
commit3efa013ee4e037c2ba20aaf550aa06bcf578b145 (patch)
tree1808e32d080fa0ff00a5976ca09c21f29e724938 /indra/llui/llui.cpp
parent94a6782510b72f0f029bc06be7cfa962082fd73c (diff)
MAINT-939 Potential fix for crash when editing objects.
Diffstat (limited to 'indra/llui/llui.cpp')
-rw-r--r--indra/llui/llui.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index a38d0a0b0b..49666a991d 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -831,7 +831,11 @@ void gl_stippled_line_3d( const LLVector3& start, const LLVector3& end, const LL
gGL.flush();
glLineWidth(2.5f);
- glLineStipple(2, 0x3333 << shift);
+
+ if (!LLGLSLShader::sNoFixedFunction)
+ {
+ glLineStipple(2, 0x3333 << shift);
+ }
gGL.begin(LLRender::LINES);
{