[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.21.6-100-g8dcf305

[Robin Cornelius]

The following commit has been merged in the master branch:
commit 8dcf305e837874e8e71a9905d1a6f99703199fca
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Fri Oct 31 18:38:41 2008 +0000

    Fix build if nvidia gl.h is present and pass CFLAGS to cmake

diff --git a/debian/patches/VWR-9557-nvidia-headers-missing-defines.patch b/debian/patches/VWR-9557-nvidia-headers-missing-defines.patch
new file mode 100644
index 0000000..68172e7
--- /dev/null
+++ b/debian/patches/VWR-9557-nvidia-headers-missing-defines.patch
@@ -0,0 +1,15 @@
+--- a/indra/llrender/llglheaders.h
++++ b/indra/llrender/llglheaders.h
+@@ -77,6 +75,12 @@
+ #endif // LL_LINUX && !LL_MESA_HEADLESS
+ 
+ 
++// Needed to compile with Nvidia's gl.h
++
++extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
++extern PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTextureARB;
++extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;
++
+ // GL_ARB_vertex_buffer_object
+ extern PFNGLBINDBUFFERARBPROC		glBindBufferARB;
+ extern PFNGLDELETEBUFFERSARBPROC	glDeleteBuffersARB;

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids