diff options
| author | Callum Prentice <callum@mbp.local> | 2021-06-07 16:27:27 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@mbp.local> | 2021-06-07 16:27:27 -0700 |
| commit | 1b0e3d68183fb63ac5c160bc9aa7956746f33faf (patch) | |
| tree | 260f0972726dc9d8957486f2e03773dac4a10afc /indra/newview/llviewerjointmesh.cpp | |
| parent | 7772ed0cb2ebf81d4e6b1a35dcffdfe88f6c1bcc (diff) | |
| parent | 4623b822386accfae5907c88099c2a88377a0271 (diff) | |
Merge branch 'master' into DRTVWR-531
Diffstat (limited to 'indra/newview/llviewerjointmesh.cpp')
| -rw-r--r-- | indra/newview/llviewerjointmesh.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerjointmesh.cpp b/indra/newview/llviewerjointmesh.cpp index fdfd22c117..63ad708e59 100644 --- a/indra/newview/llviewerjointmesh.cpp +++ b/indra/newview/llviewerjointmesh.cpp @@ -56,7 +56,7 @@ #include "m4math.h" #include "llmatrix4a.h" -#if !LL_DARWIN && !LL_LINUX && !LL_SOLARIS +#if !LL_DARWIN && !LL_LINUX extern PFNGLWEIGHTPOINTERARBPROC glWeightPointerARB; extern PFNGLWEIGHTFVARBPROC glWeightfvARB; extern PFNGLVERTEXBLENDARBPROC glVertexBlendARB; |