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/llui/llui.cpp | |
| parent | f78039fd9509642296f2ff9c298c9828b6613975 (diff) | |
| parent | 3efa013ee4e037c2ba20aaf550aa06bcf578b145 (diff) | |
merge
Diffstat (limited to 'indra/llui/llui.cpp')
| -rw-r--r-- | indra/llui/llui.cpp | 6 |
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); { |