diff options
| author | Don Kjer <don@lindenlab.com> | 2013-09-10 14:59:33 -0700 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2013-09-10 14:59:33 -0700 |
| commit | 683c36ae2f81bd08d83d7e37c60f447196635834 (patch) | |
| tree | 05c60ca16e66a297a9ec19f0dc64c3f7664edcf0 /indra/llrender/llglheaders.h | |
| parent | 3a44c5c2a3e04ed8e7174bedb5753d29e6581019 (diff) | |
| parent | e6a68e1f09e4d056b4932111e09c3bff98acf29d (diff) | |
Automated merge
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 |