diff options
author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-03-12 04:40:51 -0700 |
---|---|---|
committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-03-12 04:40:51 -0700 |
commit | 35383790fb250532fa7701638d39a8f1c6a0cf76 (patch) | |
tree | 7b75e77faca2cc9ce0ca1d0b1bf022f9f4f85d0e /indra/newview/llface.cpp | |
parent | 6613d80d72931b13cc008c3dcc8ee90a39bec8f5 (diff) |
Merge pragma warning hack to fix linux build
Diffstat (limited to 'indra/newview/llface.cpp')
-rwxr-xr-x | indra/newview/llface.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 5f86205175..c3cb914120 100755 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -53,6 +53,12 @@ #include "llviewershadermgr.h" #include "llvoavatar.h" +#if LL_LINUX +// Work-around spurious used before init warning on Vector4a +// +#pragma GCC diagnostic ignored "-Wuninitialized" +#endif + extern BOOL gGLDebugLoggingEnabled; #define LL_MAX_INDICES_COUNT 1000000 @@ -64,8 +70,6 @@ BOOL LLFace::sSafeRenderSelect = TRUE; // FALSE #define DOTVEC(a,b) (a.mV[0]*b.mV[0] + a.mV[1]*b.mV[1] + a.mV[2]*b.mV[2]) -//#pragma GCC diagnostic ignored "-Wuninitialized" - /* For each vertex, given: B - binormal |