diff options
author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-02-22 09:49:58 -0800 |
---|---|---|
committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-02-22 09:49:58 -0800 |
commit | 98e02a5d76ccc044e72949965e84f0803ad0026c (patch) | |
tree | 49df15d88f940e9901c618eacc9e2286cccb6952 /indra/llrender/llglheaders.h | |
parent | e17d69d1d16c607aa304936ebf2ab151684f9c76 (diff) | |
parent | 27b01e94dd7e98415fa8ec645c37f9291f60df0b (diff) |
Merge new boost and add OS X 10.8 mods
Diffstat (limited to 'indra/llrender/llglheaders.h')
-rw-r--r-- | indra/llrender/llglheaders.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h index 509de51f4d..dcac5e897b 100644 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -993,12 +993,7 @@ 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 |