diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-10-16 21:02:48 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-10-16 21:02:48 -0400 |
| commit | c370313676451f6e5cfd72bec314ad79bc653833 (patch) | |
| tree | 1bd99330b482d828f8edc71691d177078123fd1e /indra/llrender/llglheaders.h | |
| parent | 988767d5ec4631ad9f0099180a92c4f186553940 (diff) | |
| parent | f2e2ea99a351ca8663af460974137545d020b97f (diff) | |
Automated merge with file:///Users/nat/linden/viewer-sourceid
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 |