diff options
| author | Richard Linden <none@none> | 2013-10-01 14:28:39 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-01 14:28:39 -0700 |
| commit | 59628d6f85deed89cb35d9343183069cfccd13c0 (patch) | |
| tree | 6b4c35053c2291fd5ff1cccedf86bbd76ce78e1d /indra/test_apps/llplugintest/llmediaplugintest.cpp | |
| parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) | |
| parent | 9e486f6c6abbee6cb41ba9a6271d8a025ad924ef (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/test_apps/llplugintest/llmediaplugintest.cpp')
| -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" |