diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-09 18:51:23 -0800 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-09 18:51:23 -0800 |
| commit | c9044c03b3157c330a0b3b640bfce6bacc0c9343 (patch) | |
| tree | d22f74cf380629ef398eea71d937646bfd726a40 /indra/llrender/llglheaders.h | |
| parent | 1786a7150e754ea10dfd5172ec2491dd67e83a9a (diff) | |
| parent | 8a3384adafff1b34d5a903e4d8cfd2dabca9e243 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
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 |