Merge branch 'sl-base-1.22' into next

Conflicts:
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml

1 files changed, 7 insertions, 1 deletions

diff --git a/linden/indra/test/math.cpp b/linden/indra/test/math.cpp
index 405b8a3..3b9c6ef 100644
--- a/linden/indra/test/math.cpp
+++ b/linden/indra/test/math.cpp
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
  * 
- * Copyright (c) 2005-2008, Linden Research, Inc.
+ * Copyright (c) 2005-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -517,6 +517,10 @@ namespace tut
         template<> template<>
         void line_object::test<2>()
         {
+          /*
+            These tests fail intermittently on all platforms - see DEV-16600
+            Commenting this out until dev has time to investigate.
+            
                 // this is a test for LLLine::nearestApproach(LLLIne) method
                 // which computes the point on a line nearest another line
 
@@ -612,11 +616,13 @@ namespace tut
                         //}
 
                         // test that the errors are small
+
                         ensure("first line should accurately compute its closest approach", 
                                         first_relative_error <= allowable_relative_error);
                         ensure("second line should accurately compute its closest approach", 
                                         second_relative_error <= allowable_relative_error);
                 }
+          */
         }
 
         F32 ALMOST_PARALLEL = 0.99f;