From 35eda06ae47255f4d4ba15ab7e3df443c1c39a6e Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Wed, 18 Jul 2012 17:35:10 -0700
Subject: llglheader include change for building on Lion

---
 indra/llrender/llglheaders.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'indra/llrender/llglheaders.h')

diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h
index a0727b8686..d93f464502 100644
--- a/indra/llrender/llglheaders.h
+++ b/indra/llrender/llglheaders.h
@@ -993,7 +993,12 @@ extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
 }
 #endif
 
+#ifdef MAC_OS_VERSION_10_7
+#include <OpenGL/gl.h>
+#else
 #include <AGL/gl.h>
+#endif
+
 
 #endif // LL_MESA / LL_WINDOWS / LL_DARWIN
 
-- 
cgit v1.2.3


From a1d026889343b4745eeebffc85695bbcb2b93d64 Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Tue, 24 Jul 2012 16:52:33 -0700
Subject: Minor improvement to identifying gl lib to use.  Should use xcode
 version.

---
 indra/llrender/llglheaders.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llrender/llglheaders.h')

diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h
index d93f464502..509de51f4d 100644
--- a/indra/llrender/llglheaders.h
+++ b/indra/llrender/llglheaders.h
@@ -993,7 +993,7 @@ extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
 }
 #endif
 
-#ifdef MAC_OS_VERSION_10_7
+#if __MAC_OS_X_VERSION_MAX_ALLOWED <= 1070
 #include <OpenGL/gl.h>
 #else
 #include <AGL/gl.h>
-- 
cgit v1.2.3