From d373dcc7cbed5fdea72c6b71a5594e4e85549b43 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Fri, 20 Jul 2007 20:38:05 +0000
Subject: svn merge -r 64548:64837
 svn+ssh://svn/svn/linden/branches/maintenance into release * WARNING *: 
 maintenance r64837 is not the last rev to use in the next merge. use r65269

---
 indra/newview/llviewerjointmesh.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/newview/llviewerjointmesh.cpp')

diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp
index 923d574499..7ba2208958 100644
--- a/indra/newview/llviewerjointmesh.cpp
+++ b/indra/newview/llviewerjointmesh.cpp
@@ -38,8 +38,7 @@
 #include "m3math.h"
 #include "m4math.h"
 
-
-#if !LL_DARWIN && !LL_LINUX
+#if !LL_DARWIN && !LL_LINUX && !LL_SOLARIS
 extern PFNGLWEIGHTPOINTERARBPROC glWeightPointerARB;
 extern PFNGLWEIGHTFVARBPROC glWeightfvARB;
 extern PFNGLVERTEXBLENDARBPROC glVertexBlendARB;
-- 
cgit v1.2.3