diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-06-28 13:22:04 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-06-28 13:22:04 -0500 |
| commit | ed72fd0ae98671f1cfce3c975b93e1f760fc40f0 (patch) | |
| tree | 10596d0f2040e9a0414e8a9f14d1269b58942264 /indra/llui/llui.cpp | |
| parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) | |
| parent | a1d0d67e05c45bdc1a7a8bb0aad79772a2a94f6e (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 b5e27616b7..87bf518aa1 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); { |