diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-03 20:12:47 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-03 20:12:47 +0000 |
| commit | 403d1b6404355fa26b0bfeff206f5c56758a491c (patch) | |
| tree | 6438eb8fa29dc8946d404ac79f89cf1bd140bbe1 /indra/llrender | |
| parent | 21c364c4d455cc05ec176032e8c090be0cc4ed50 (diff) | |
| parent | 825cc7873251ad90720ab40221d689abed7b2ac8 (diff) | |
Merge VirLinden/sunshine -> don_linden/sunshine-experimental
Diffstat (limited to 'indra/llrender')
| -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 |