diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-09-09 12:46:20 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-09-09 12:46:20 -0700 |
| commit | 07cb32449f601e2d47e83d781af3bb9df2474d5c (patch) | |
| tree | a913755d041e5ac780c840301ec4676894497e82 /indra/llrender/llglheaders.h | |
| parent | 51c01f5294b68b66706685346ecea16246b85cce (diff) | |
| parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) | |
Merge with 3.6.5
Diffstat (limited to 'indra/llrender/llglheaders.h')
| -rwxr-xr-x | 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 dace572953..1bec6d376b 100755 --- a/indra/llrender/llglheaders.h +++ b/indra/llrender/llglheaders.h @@ -1009,12 +1009,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 |