summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-09-20 00:54:37 -0500
committerDave Parks <davep@lindenlab.com>2011-09-20 00:54:37 -0500
commit9ea41c8094695365bc7ea10165ffd54cda204e88 (patch)
treee5a02d1c64b70181516d936da07a75fc9caefc7d /indra/llui
parent2ead1691317e9bf32e996fa1f6a70f6a2a9ced02 (diff)
SH-2243 No deprecated calls for the whole session.
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llui.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index b7894f5bf7..212672b809 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -992,10 +992,18 @@ void gl_rect_2d_checkerboard(const LLRect& rect, GLfloat alpha)
// ...gray squares
gGL.color4f( .7f, .7f, .7f, alpha );
gGL.flush();
- glPolygonStipple( checkerboard );
- LLGLEnable polygon_stipple(GL_POLYGON_STIPPLE);
- gl_rect_2d(rect);
+ if (!LLGLSLShader::sNoFixedFunction)
+ { //polygon stipple is deprecated
+ glPolygonStipple( checkerboard );
+
+ LLGLEnable polygon_stipple(GL_POLYGON_STIPPLE);
+ gl_rect_2d(rect);
+ }
+ else
+ {
+ gl_rect_2d(rect);
+ }
gGL.flush();
}