diff options
| author | Richard Linden <none@none> | 2014-02-24 18:45:59 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-02-24 18:45:59 -0800 |
| commit | 80b4a4a1f54dccb814b5486423bf6492b3ae58a7 (patch) | |
| tree | f17c7a9b433e443b2f30251dd15b1bf50d4f803c /indra/test_apps | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
| parent | ef591d280eb3c5bae7da20540ad4cbb30858d0aa (diff) | |
merge with release
Diffstat (limited to 'indra/test_apps')
| -rwxr-xr-x | indra/test_apps/llplugintest/llmediaplugintest.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.cpp b/indra/test_apps/llplugintest/llmediaplugintest.cpp index 884b00f0cc..fa4f5abd28 100755 --- a/indra/test_apps/llplugintest/llmediaplugintest.cpp +++ b/indra/test_apps/llplugintest/llmediaplugintest.cpp @@ -37,6 +37,12 @@ #include "llmediaplugintest.h" + +#if LL_WINDOWS +#pragma warning(disable: 4263) +#pragma warning(disable: 4264) +#endif + #if __APPLE__ #include <GLUT/glut.h> #include <CoreFoundation/CoreFoundation.h> @@ -46,10 +52,6 @@ #define GLUI_FREEGLUT #endif -#if LL_WINDOWS -#pragma warning(disable: 4263) -#pragma warning(disable: 4264) -#endif #include "glui.h" |