diff options
author | Oz Linden <oz@lindenlab.com> | 2012-08-22 17:11:10 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-08-22 17:11:10 -0400 |
commit | 43d29ea03e39419e401db5fbe05cdb4e9364144f (patch) | |
tree | c2c7273bb0d121d27ae5806cdb042cd2ba116ade /indra/llrender/llglheaders.h | |
parent | f78861c7bc355ddbcc3e942c41835a94070614c9 (diff) | |
parent | d34e584b41ce317a942aa93e6217e678c88b9050 (diff) |
merge changes for DRTVWR-202
Diffstat (limited to 'indra/llrender/llglheaders.h')
-rw-r--r-- | indra/llrender/llglheaders.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index a0727b8686..509de51f4d 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -993,7 +993,12 @@ extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *); } #endif +#if __MAC_OS_X_VERSION_MAX_ALLOWED <= 1070 +#include <OpenGL/gl.h> +#else #include <AGL/gl.h> +#endif + #endif // LL_MESA / LL_WINDOWS / LL_DARWIN |