summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-03-14 22:52:11 -0700
committerMerov Linden <merov@lindenlab.com>2011-03-14 22:52:11 -0700
commit35b61cdd44a9195a5174a8bd22e96e6b404f42bc (patch)
tree8fa3c0e0e055d2995b86c212105ed5910392c320 /indra/llmath
parentab27883b7ec6e3affde28ab061654adb264526c7 (diff)
parent72d1febadb5f254eb7199bd26eb04a7553a6e55d (diff)
Pull from jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/tests/m3math_test.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llmath/tests/m3math_test.cpp b/indra/llmath/tests/m3math_test.cpp
index 479a00b99f..baff5a2d45 100644
--- a/indra/llmath/tests/m3math_test.cpp
+++ b/indra/llmath/tests/m3math_test.cpp
@@ -36,6 +36,11 @@
#include "../v3dmath.h"
#include "../test/lltut.h"
+
+#if LL_WINDOWS
+// disable unreachable code warnings caused by usage of skip.
+#pragma warning(disable: 4702)
+#endif
#if LL_WINDOWS
// disable unreachable code warnings caused by usage of skip.