summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorKent Quirk <q@lindenlab.com>2010-06-17 11:37:21 -0400
committerKent Quirk <q@lindenlab.com>2010-06-17 11:37:21 -0400
commitb770415b6a2f52946eafb99800af7409b900cd8e (patch)
tree11c6e9bdeee80d486445ea301e97742c00cdff7a /indra/llmath
parentbe72a10a89f98a5c7c372ecee3d839be2031b80a (diff)
parent7cc006347822a70f36175dc2627814a0eaeb9c0a (diff)
Merge (and resolve conflict) from q/viewer-release
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/tests/mathmisc_test.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llmath/tests/mathmisc_test.cpp b/indra/llmath/tests/mathmisc_test.cpp
index ea42f6e001..68d9ddc0fe 100644
--- a/indra/llmath/tests/mathmisc_test.cpp
+++ b/indra/llmath/tests/mathmisc_test.cpp
@@ -334,6 +334,8 @@ namespace tut
template<> template<>
void sphere_object::test<2>()
{
+ skip("See SNOW-620. Neither the test nor the code being tested seem good. Also sim-only.");
+
// test LLSphere::getBoundingSphere()
S32 number_of_tests = 100;
S32 number_of_spheres = 10;