diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-05-07 11:14:26 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-05-07 11:14:26 -0700 |
| commit | 48fece44737fa8b9614fd864354d9287a216ea33 (patch) | |
| tree | f68426d79f4631c6b49be142a92e59086870fa38 /indra/test_apps/llplugintest/llmediaplugintest.cpp | |
| parent | ae856ef31830912cec0f4de37167858a24e4ba30 (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
Merge with 3.7.7-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" |