Merge with siana/future

2011-10-13 00:03:56 -05:00
parent 4963a064f1
commit 008bebd817
169 changed files with 15033 additions and 2475 deletions
--- a/indra/test/lltut.cpp
+++ b/indra/test/lltut.cpp
@@ -94,7 +94,7 @@ namespace tut
 				return;
 			
 			case LLSD::TypeReal:
-				ensure_equals(msg + " real", actual.asReal(), expected.asReal());
+				tut::ensure_equals(msg + " real", actual.asReal(), expected.asReal());
 				return;
 			
 			case LLSD::TypeString: