Second Life viewer sources 1.18.4.0-RC

62 files changed, 341 insertions, 174 deletions

diff --git a/linden/indra/test/common.cpp b/linden/indra/test/common.cpp
index d32a4ca..f647a8d 100644
--- a/linden/indra/test/common.cpp
+++ b/linden/indra/test/common.cpp
@@ -4,6 +4,8 @@
  * @date 2005-10-12
  * @brief Common templates for test framework
  *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
  * Copyright (c) 2005-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 /** 
diff --git a/linden/indra/test/inventory.cpp b/linden/indra/test/inventory.cpp
index 944647f..b58ebc5 100644
--- a/linden/indra/test/inventory.cpp
+++ b/linden/indra/test/inventory.cpp
@@ -4,6 +4,8 @@
  * @date 2005-11-15
  * @brief Functions for inventory test framework
  *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
  * Copyright (c) 2005-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/test/io.cpp b/linden/indra/test/io.cpp
index 412c010..363f375 100644
--- a/linden/indra/test/io.cpp
+++ b/linden/indra/test/io.cpp
@@ -4,6 +4,8 @@
  * @date 2005-10-02
  * @brief Tests for io classes and helpers
  *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
  * Copyright (c) 2005-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/test/llapp_tut.cpp b/linden/indra/test/llapp_tut.cpp
index 60995ba..1b5d946 100644
--- a/linden/indra/test/llapp_tut.cpp
+++ b/linden/indra/test/llapp_tut.cpp
@@ -3,6 +3,8 @@
  * @author Phoenix
  * @date 2006-09-12
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
diff --git a/linden/indra/test/llbase64_tut.cpp b/linden/indra/test/llbase64_tut.cpp
index 1d059dce..d9073cf 100644
--- a/linden/indra/test/llbase64_tut.cpp
+++ b/linden/indra/test/llbase64_tut.cpp
@@ -3,7 +3,9 @@
  * @author James Cook
  * @date 2007-02-04
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/test/llbitpack_tut.cpp b/linden/indra/test/llbitpack_tut.cpp
index 71e4a4d..39b630c 100644
--- a/linden/indra/test/llbitpack_tut.cpp
+++ b/linden/indra/test/llbitpack_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-02
  * @brief llstreamtools test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
  
 #include <tut/tut.h>
diff --git a/linden/indra/test/llblowfish_tut.cpp b/linden/indra/test/llblowfish_tut.cpp
index ba63860..b220755 100644
--- a/linden/indra/test/llblowfish_tut.cpp
+++ b/linden/indra/test/llblowfish_tut.cpp
@@ -7,7 +7,9 @@
  * openssl enc -bf-cbc -in blowfish.digits.txt -out blowfish.1.bin -K 00000000000000000000000000000000 -iv 0000000000000000 -p
  * openssl enc -bf-cbc -in blowfish.digits.txt -out blowfish.2.bin -K 526a1e07a19dbaed84c4ff08a488d15e -iv 0000000000000000 -p
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -29,6 +31,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
@@ -36,8 +39,6 @@
 
 #include "llblowfishcipher.h"
 
-#include <string>
-#include <stdio.h>
 #include "lluuid.h"
 
 namespace tut
diff --git a/linden/indra/test/llbuffer_tut.cpp b/linden/indra/test/llbuffer_tut.cpp
index afe3133..cd659ce 100644
--- a/linden/indra/test/llbuffer_tut.cpp
+++ b/linden/indra/test/llbuffer_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-03
  * @brief llbuffer test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,9 +28,11 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
 #include "llbuffer.h"
 #include "llerror.h"
diff --git a/linden/indra/test/lldatapacker_tut.cpp b/linden/indra/test/lldatapacker_tut.cpp
index 1c2a10e..a010ed0 100644
--- a/linden/indra/test/lldatapacker_tut.cpp
+++ b/linden/indra/test/lldatapacker_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-02
  * @brief LLDataPacker test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
diff --git a/linden/indra/test/lldate_tut.cpp b/linden/indra/test/lldate_tut.cpp
index f8813e3..5e6d003 100644
--- a/linden/indra/test/lldate_tut.cpp
+++ b/linden/indra/test/lldate_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-02
  * @brief LLDate test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
@@ -35,6 +38,7 @@
 #define VALID_DATE                                                                      "2003-04-30T04:00:00Z"
 #define VALID_DATE_LEAP                                                         "2004-02-29T04:00:00Z"
 #define VALID_DATE_HOUR_BOUNDARY                                        "2003-04-30T23:59:59Z"
+#define VALID_DATE_FRACTIONAL_SECS                                      "2007-09-26T20:31:33.70Z"
 
 // invalid format
 #define INVALID_DATE_MISSING_YEAR                                       "-04-30T22:59:59Z"
@@ -88,6 +92,10 @@ namespace tut
                 expected_string = VALID_DATE_HOUR_BOUNDARY;     
                 ensure_equals("VALID_DATE_HOUR_BOUNDARY failed" , expected_string, date.asString());
 
+                result = date.fromString(VALID_DATE_FRACTIONAL_SECS);
+                expected_string = VALID_DATE_FRACTIONAL_SECS;
+                ensure_equals("VALID_DATE_FRACTIONAL_SECS failed" , expected_string, date.asString());
+
                 result = date.fromString(INVALID_DATE_MISSING_YEAR);
                 ensure_equals("INVALID_DATE_MISSING_YEAR should have failed" , result, false);
 
diff --git a/linden/indra/test/llerror_tut.cpp b/linden/indra/test/llerror_tut.cpp
index 6c3df43..6a24eda 100644
--- a/linden/indra/test/llerror_tut.cpp
+++ b/linden/indra/test/llerror_tut.cpp
@@ -3,6 +3,8 @@
  * @date   December 2006
  * @brief error unit tests
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,9 +27,12 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
+#include "linden_common.h"
 #include "llerror.h"
+
 namespace
 {
         void test_that_error_h_includes_enough_things_to_compile_a_message()
diff --git a/linden/indra/test/llhost_tut.cpp b/linden/indra/test/llhost_tut.cpp
index 01f3079..bbc1f02 100644
--- a/linden/indra/test/llhost_tut.cpp
+++ b/linden/indra/test/llhost_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-02
  * @brief llhost test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,11 +28,12 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
  
 #include <tut/tut.h>
-#include "lltut.h"
 #include "linden_common.h"
+#include "lltut.h"
 #include "llhost.h"
 
 namespace tut
diff --git a/linden/indra/test/llhttpclient_tut.cpp b/linden/indra/test/llhttpclient_tut.cpp
index 77f1e25..b29caf9 100644
--- a/linden/indra/test/llhttpclient_tut.cpp
+++ b/linden/indra/test/llhttpclient_tut.cpp
@@ -2,6 +2,8 @@
  * @file llhttpclient_tut.cpp
  * @brief Testing the HTTP client classes.
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 /**
diff --git a/linden/indra/test/llhttpdate_tut.cpp b/linden/indra/test/llhttpdate_tut.cpp
index 5279a81..1be9825 100644
--- a/linden/indra/test/llhttpdate_tut.cpp
+++ b/linden/indra/test/llhttpdate_tut.cpp
@@ -3,7 +3,9 @@
  * @author Kartic Krishnamurthy
  * @date Wednesday, 18 Jul 2007 17:00:00 GMT :)
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
@@ -33,9 +36,6 @@
 #include "lldate.h"
 #include "llframetimer.h"
 
-#include <string>
-#include <time.h>
-
 namespace tut
 {
     struct httpdate_data
diff --git a/linden/indra/test/llhttpnode_tut.cpp b/linden/indra/test/llhttpnode_tut.cpp
index 59d339c..245ea17 100644
--- a/linden/indra/test/llhttpnode_tut.cpp
+++ b/linden/indra/test/llhttpnode_tut.cpp
@@ -3,6 +3,8 @@
  * @date   May 2006
  * @brief HTTP server unit tests
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,11 +27,11 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
-#include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
-
 #include "llhttpnode.h"
 #include "llsdhttpserver.h"
 
diff --git a/linden/indra/test/llinventoryparcel_tut.cpp b/linden/indra/test/llinventoryparcel_tut.cpp
index 1a815ca..a88c8d7 100644
--- a/linden/indra/test/llinventoryparcel_tut.cpp
+++ b/linden/indra/test/llinventoryparcel_tut.cpp
@@ -3,7 +3,9 @@
  * @author Moss
  * @date 2007-04-17
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/test/lliohttpserver_tut.cpp b/linden/indra/test/lliohttpserver_tut.cpp
index a5693be..5ac79e6 100644
--- a/linden/indra/test/lliohttpserver_tut.cpp
+++ b/linden/indra/test/lliohttpserver_tut.cpp
@@ -3,6 +3,8 @@
  * @date   May 2006
  * @brief HTTP server unit tests
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,11 +27,11 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
-#include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
-
 #include "llbufferstream.h"
 #include "lliohttpserver.h"
 #include "llsdhttpserver.h"
diff --git a/linden/indra/test/lljoint_tut.cpp b/linden/indra/test/lljoint_tut.cpp
index 5be81ae..d633141 100644
--- a/linden/indra/test/lljoint_tut.cpp
+++ b/linden/indra/test/lljoint_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007=-03
  * @brief lljoint test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifdef THIS_DOESNT_LINK
diff --git a/linden/indra/test/llmessageconfig_tut.cpp b/linden/indra/test/llmessageconfig_tut.cpp
index cc2a0a2..df50d90 100644
--- a/linden/indra/test/llmessageconfig_tut.cpp
+++ b/linden/indra/test/llmessageconfig_tut.cpp
@@ -3,6 +3,8 @@
  * @date   March 2007
  * @brief LLMessageConfig unit tests
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,16 +27,18 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
-#include <tut/tut.h>
-#include "lltut.h"
+#include "linden_common.h"
 #include "llmessageconfig.h"
+#include "lltut.h"
 #include "llsdserialize.h"
 #include "llfile.h"
 #include "lldir.h"
 #include "lltimer.h"
 #include "llframetimer.h"
+#include "llsdutil.h"
 
 namespace tut
 {
@@ -43,30 +47,30 @@ namespace tut
 
                 LLMessageConfigTestData()
                 {
+                        LLUUID random;
+                        random.generate();
                         // generate temp dir
-                        mTestConfigDir = "/tmp/llmessage-config-test";
+                        std::ostringstream oStr;
+                        oStr << "/tmp/llmessage-config-test-" << random;
+                        mTestConfigDir = oStr.str();
                         LLFile::mkdir(mTestConfigDir.c_str());
-
+                        writeConfigFile(LLSD());
                         LLMessageConfig::initClass("simulator", mTestConfigDir);
                 }
 
                 ~LLMessageConfigTestData()
                 {
                         // rm contents of temp dir
-                        gDirUtilp->deleteFilesInDir(mTestConfigDir, "*");
+                        int rmfile = LLFile::remove((mTestConfigDir + "/message.xml").c_str());
+                        ensure_equals("rmfile value", rmfile, 0);
                         // rm temp dir
-                        LLFile::rmdir(mTestConfigDir.c_str());
+                        int rmdir = LLFile::rmdir(mTestConfigDir.c_str());
+                        ensure_equals("rmdir value", rmdir, 0);
                 }
 
-                void reloadConfig(const LLSD& config)
-                {
-                        LLMessageConfig::useConfig(config);
-                }
-                
                 void writeConfigFile(const LLSD& config)
                 {
-                        std::string configFile = mTestConfigDir + "/message.xml";
-                        llofstream file(configFile.c_str());
+                        llofstream file((mTestConfigDir + "/message.xml").c_str());
                         if (file.is_open())
                         {
                                 LLSDSerialize::toPrettyXML(config, file);
@@ -85,7 +89,7 @@ namespace tut
         {
                 LLSD config;
                 config["serverDefaults"]["simulator"] = "template";
-                reloadConfig(config);
+                LLMessageConfig::useConfig(config);
                 ensure_equals("Ensure server default is not template",
                                           LLMessageConfig::getServerDefaultFlavor(),
                                           LLMessageConfig::TEMPLATE_FLAVOR);
@@ -99,7 +103,7 @@ namespace tut
                 config["serverDefaults"]["simulator"] = "template";
                 config["messages"]["msg1"]["flavor"] = "template";
                 config["messages"]["msg2"]["flavor"] = "llsd";
-                reloadConfig(config);
+                LLMessageConfig::useConfig(config);
                 ensure_equals("Ensure msg template flavor",
                                           LLMessageConfig::getMessageFlavor("msg1"),
                                           LLMessageConfig::TEMPLATE_FLAVOR);
@@ -115,7 +119,7 @@ namespace tut
                 LLSD config;
                 config["serverDefaults"]["simulator"] = "llsd";
                 config["messages"]["msg1"]["trusted-sender"] = true;
-                reloadConfig(config);
+                LLMessageConfig::useConfig(config);
                 ensure_equals("Ensure missing message gives no flavor",
                                           LLMessageConfig::getMessageFlavor("Test"),
                                           LLMessageConfig::NO_FLAVOR);
@@ -137,7 +141,7 @@ namespace tut
                 config["messages"]["msg1"]["trusted-sender"] = false;
                 config["messages"]["msg2"]["flavor"] = "llsd";
                 config["messages"]["msg2"]["trusted-sender"] = true;
-                reloadConfig(config);
+                LLMessageConfig::useConfig(config);
                 ensure_equals("Ensure untrusted is untrusted",
                                           LLMessageConfig::getSenderTrustedness("msg1"),
                                           LLMessageConfig::UNTRUSTED);
@@ -156,7 +160,7 @@ namespace tut
                 LLSD config;
                 config["serverDefaults"]["simulator"] = "template";
                 config["messages"]["msg1"]["flavor"] = "llsd";
-                reloadConfig(config);
+                LLMessageConfig::useConfig(config);
                 ensure_equals("Ensure msg1 exists, has llsd flavor",
                                           LLMessageConfig::getMessageFlavor("msg1"),
                                           LLMessageConfig::LLSD_FLAVOR);
@@ -171,7 +175,7 @@ namespace tut
                 LLSD config;
                 config["capBans"]["MapLayer"] = true;
                 config["capBans"]["MapLayerGod"] = false;
-                reloadConfig(config);
+                LLMessageConfig::useConfig(config);
                 ensure_equals("Ensure cap ban true MapLayer",
                                           LLMessageConfig::isCapBanned("MapLayer"),
                                           true);
diff --git a/linden/indra/test/llmessagetemplateparser_tut.cpp b/linden/indra/test/llmessagetemplateparser_tut.cpp
index 7e1f5a3..e9988be 100644
--- a/linden/indra/test/llmessagetemplateparser_tut.cpp
+++ b/linden/indra/test/llmessagetemplateparser_tut.cpp
@@ -3,6 +3,8 @@
  * @date April 2007
  * @brief LLMessageTemplateParser unit tests
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,12 +27,12 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
-#include <tut/tut.h>
-#include "lltut.h"
 #include "linden_common.h"
 #include "llmessagetemplateparser.h"
+#include "lltut.h"
 
 namespace tut
 {
diff --git a/linden/indra/test/llmime_tut.cpp b/linden/indra/test/llmime_tut.cpp
index ac1a036..a3ddb94 100644
--- a/linden/indra/test/llmime_tut.cpp
+++ b/linden/indra/test/llmime_tut.cpp
@@ -4,6 +4,8 @@
  * @date 2006-12-24
  * @brief BRIEF_DESC of llmime_tut.cpp
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
diff --git a/linden/indra/test/llnamevalue_tut.cpp b/linden/indra/test/llnamevalue_tut.cpp
index 77e5ff2..44fc70c 100644
--- a/linden/indra/test/llnamevalue_tut.cpp
+++ b/linden/indra/test/llnamevalue_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-02
  * @brief LLNameValue unit test
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,10 +28,11 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
-#include "lltut.h"
 #include "linden_common.h"
+#include "lltut.h"
 #include "llnamevalue.h"
 #include "llsdserialize.h"
 
diff --git a/linden/indra/test/llpartdata_tut.cpp b/linden/indra/test/llpartdata_tut.cpp
index ce2cedc..1cbfc1a 100644
--- a/linden/indra/test/llpartdata_tut.cpp
+++ b/linden/indra/test/llpartdata_tut.cpp
@@ -4,7 +4,9 @@
  * @date March 2007
  * @brief LLPartData and LLPartSysData test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
diff --git a/linden/indra/test/llpermissions_tut.cpp b/linden/indra/test/llpermissions_tut.cpp
index 3b2cee0..8d5223e 100644
--- a/linden/indra/test/llpermissions_tut.cpp
+++ b/linden/indra/test/llpermissions_tut.cpp
@@ -4,7 +4,9 @@
  * @date March 2007
  * @brief llpermissions test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
  
 #include <tut/tut.h>
diff --git a/linden/indra/test/llpipeutil.cpp b/linden/indra/test/llpipeutil.cpp
index 085d883..b7b9122 100644
--- a/linden/indra/test/llpipeutil.cpp
+++ b/linden/indra/test/llpipeutil.cpp
@@ -3,6 +3,8 @@
  * @date 2006-05-18
  * @brief Utility pipe fittings for injecting and extracting strings
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 
diff --git a/linden/indra/test/llpipeutil.h b/linden/indra/test/llpipeutil.h
index a2c59dd..2531178 100644
--- a/linden/indra/test/llpipeutil.h
+++ b/linden/indra/test/llpipeutil.h
@@ -3,6 +3,8 @@
  * @date 2006-05-18
  * @brief Utility pipe fittings for injecting and extracting strings
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLPIPEUTIL_H
diff --git a/linden/indra/test/llquaternion_tut.cpp b/linden/indra/test/llquaternion_tut.cpp
index f64e87a..bfca1c4 100644
--- a/linden/indra/test/llquaternion_tut.cpp
+++ b/linden/indra/test/llquaternion_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-03
  * @brief Test cases of llquaternion.h
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,12 +28,13 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
-#include "llmath.h"
-#include "lltut.h"
+
 #include "linden_common.h"
+#include "lltut.h"
 #include "llquaternion.h"
 #include "v4math.h"
 #include "v3math.h"
@@ -335,16 +338,15 @@ namespace tut
         template<> template<>
         void llquat_test_object_t::test<10>()
         {
-#if (LL_RELEASE && LL_LINUX)
-                skip_fail("Doesn't work under Linux -- FIX ME!");
-#endif
                 LLVector4 vect(12.0f, 5.0f, 60.0f, 75.1f);
                 LLQuaternion quat(2323.034f, 23.5f, 673.23f, 57667.5f);
                 LLVector4 result = vect * quat;
                 ensure(
                         "1. LLVector4 operator*(const LLVector4 &a, const LLQuaternion &rot) failed", 
                         (39928406016.0f == result.mV[0]) &&
-                        (1457801728.0f == result.mV[1]) &&
+                        // gcc on x86 actually gives us more precision than we were expecting, verified with -ffloat-store - we forgive this
+                        (1457802240.0f >= result.mV[1]) && // gcc+x86+linux
+                        (1457801728.0f <= result.mV[1]) && // elsewhere
                         (200580612096.0f == result.mV[2]) &&
                         (75.099998f == result.mV[3]));
 
@@ -367,7 +369,7 @@ namespace tut
                 LLQuaternion quat(23.5f, 6.5f, 3.23f, 56.5f);
                 LLVector3 result = vect * quat;
                 ensure(
-                        "1. LLVEctor3 operator*(const LLVector3 &a, const LLQuaternion &rot) failed", 
+                        "1. LLVector3 operator*(const LLVector3 &a, const LLQuaternion &rot) failed", 
                         is_approx_equal(97182.953125f,result.mV[0]) &&
                         is_approx_equal(-135405.640625f, result.mV[1]) &&
                         is_approx_equal(162986.140f, result.mV[2]));
@@ -390,7 +392,7 @@ namespace tut
                 LLQuaternion quat(-3.5f, 4.5f, 3.5f, 6.5f);
                 LLVector3d result = vect * quat;
                 ensure(
-                        "1. LLVEctor3d operator*(const LLVector3d &a, const LLQuaternion &rot) failed ", 
+                        "1. LLVector3d operator*(const LLVector3d &a, const LLQuaternion &rot) failed ", 
                         (-633.0f == result.mdV[0]) &&
                         (-300.0f == result.mdV[1]) &&
                         (-36.0f == result.mdV[2]));
@@ -408,7 +410,7 @@ namespace tut
                 LLQuaternion quat2(1.0f, 4.0f, 2.0f, 5.0f);
                 result = vect2 * quat2;
                 ensure(
-                        "3. LLvector3d operator*(const LLVector3d &a, const LLQuaternion &rot) failed", 
+                        "3. LLVector3d operator*(const LLVector3d &a, const LLQuaternion &rot) failed", 
                         is_approx_equal_fraction(18.400001f, (F32) result.mdV[0], 8) &&
                         is_approx_equal_fraction(188.6f, (F32) result.mdV[1], 8) &&
                         is_approx_equal_fraction(32.20f, (F32) result.mdV[2], 8));
diff --git a/linden/indra/test/llrandom_tut.cpp b/linden/indra/test/llrandom_tut.cpp
index c5b0488..846cfab 100644
--- a/linden/indra/test/llrandom_tut.cpp
+++ b/linden/indra/test/llrandom_tut.cpp
@@ -3,7 +3,9 @@
  * @author Phoenix
  * @date 2007-01-25
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
diff --git a/linden/indra/test/llsaleinfo_tut.cpp b/linden/indra/test/llsaleinfo_tut.cpp
index 9dc7f77..96da93a 100644
--- a/linden/indra/test/llsaleinfo_tut.cpp
+++ b/linden/indra/test/llsaleinfo_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-03
  * @brief Test cases of llsaleinfo.h
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,11 +28,12 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
-#include "lltut.h"
 #include "linden_common.h"
+#include "lltut.h"
 #include "llsaleinfo.h"
 
 namespace tut
diff --git a/linden/indra/test/llsd_new_tut.cpp b/linden/indra/test/llsd_new_tut.cpp
index 55e259d..b40d4fa 100644
--- a/linden/indra/test/llsd_new_tut.cpp
+++ b/linden/indra/test/llsd_new_tut.cpp
@@ -3,6 +3,8 @@
  * @date   February 2006
  * @brief LLSD unit tests
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,9 +27,9 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
-#include <math.h>
 #include <tut/tut.h>
 #include "linden_common.h"
 #include "lltut.h"
diff --git a/linden/indra/test/llsdmessagebuilder_tut.cpp b/linden/indra/test/llsdmessagebuilder_tut.cpp
index 95a49dd..96b37cc 100755
--- a/linden/indra/test/llsdmessagebuilder_tut.cpp
+++ b/linden/indra/test/llsdmessagebuilder_tut.cpp
@@ -3,6 +3,8 @@
  * @date   February 2006
  * @brief LLSDMessageBuilder unit tests
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,11 +27,13 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
-#include "lltut.h"
 
+#include "linden_common.h"
+#include "lltut.h"
 #include "llsdmessagebuilder.h"
 #include "llsdmessagereader.h"
 #include "llsdtraits.h"
diff --git a/linden/indra/test/llsdmessagereader_tut.cpp b/linden/indra/test/llsdmessagereader_tut.cpp
index 0dd8974..646b875 100755
--- a/linden/indra/test/llsdmessagereader_tut.cpp
+++ b/linden/indra/test/llsdmessagereader_tut.cpp
@@ -3,6 +3,8 @@
  * @date   February 2006
  * @brief LLSDMessageReader unit tests
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
diff --git a/linden/indra/test/llsdserialize_tut.cpp b/linden/indra/test/llsdserialize_tut.cpp
index 09097d8..43571c0 100644
--- a/linden/indra/test/llsdserialize_tut.cpp
+++ b/linden/indra/test/llsdserialize_tut.cpp
@@ -3,6 +3,8 @@
  * @date   April 2006
  * @brief LLSDSerialize unit tests
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,12 +27,12 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
-#include <math.h>
-#include <sstream>
 #include <tut/tut.h>
 
+#include "linden_common.h"
 #include "llsd.h"
 #include "llsdserialize.h"
 #include "lltut.h"
diff --git a/linden/indra/test/llsdtraits.h b/linden/indra/test/llsdtraits.h
index 84fc1fe..97eece6 100644
--- a/linden/indra/test/llsdtraits.h
+++ b/linden/indra/test/llsdtraits.h
@@ -2,7 +2,9 @@
  * @file llsdtraits.h
  * @brief Unit test helpers
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LLSDTRAITS_H
diff --git a/linden/indra/test/llsdutil_tut.cpp b/linden/indra/test/llsdutil_tut.cpp
index bb5d7fd..3d0b601 100644
--- a/linden/indra/test/llsdutil_tut.cpp
+++ b/linden/indra/test/llsdutil_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-02
  * @brief LLSD conversion routines test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/test/llservicebuilder_tut.cpp b/linden/indra/test/llservicebuilder_tut.cpp
index 3b9d8b4..127a2a1 100644
--- a/linden/indra/test/llservicebuilder_tut.cpp
+++ b/linden/indra/test/llservicebuilder_tut.cpp
@@ -3,33 +3,37 @@
 * @brief  LLServiceBuilder unit tests
 * @date   March 2007
 *
+* $LicenseInfo:firstyear=2006&license=viewergpl$
+* 
 * Copyright (c) 2006-2007, Linden Research, Inc.
 * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+* Second Life Viewer Source Code
+* The source code in this file ("Source Code") is provided by Linden Lab
+* to you under the terms of the GNU General Public License, version 2.0
+* ("GPL"), unless you have obtained a separate licensing agreement
+* ("Other License"), formally executed by you and Linden Lab.  Terms of
+* the GPL can be found in doc/GPL-license.txt in this distribution, or
+* online at http://secondlife.com/developers/opensource/gplv2
+* 
+* There are special exceptions to the terms and conditions of the GPL as
+* it is applied to this Source Code. View the full text of the exception
+* in the file doc/FLOSS-exception.txt in this software distribution, or
+* online at http://secondlife.com/developers/opensource/flossexception
+* 
+* By copying, modifying or distributing this software, you acknowledge
+* that you have read and understood your obligations described above,
+* and agree to abide by those obligations.
+* 
+* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* COMPLETENESS OR PERFORMANCE.
+* $/LicenseInfo$
 */
 
 #include <tut/tut.h>
-#include "lltut.h"
 
+#include "linden_common.h"
+#include "lltut.h"
 #include "llsd.h"
 #include "llservicebuilder.h"
 
diff --git a/linden/indra/test/llstreamtools_tut.cpp b/linden/indra/test/llstreamtools_tut.cpp
index aea2e4f..2bd0169 100644
--- a/linden/indra/test/llstreamtools_tut.cpp
+++ b/linden/indra/test/llstreamtools_tut.cpp
@@ -4,7 +4,9 @@
  * @date February 2007
  * @brief llstreamtools test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,10 +28,12 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
  
 #include <tut/tut.h>
-#include <fstream>
+
+#include "linden_common.h"
 #include "llstreamtools.h"
 #include "lltut.h"
 
diff --git a/linden/indra/test/llstring_tut.cpp b/linden/indra/test/llstring_tut.cpp
index f49fb1c..2346789 100644
--- a/linden/indra/test/llstring_tut.cpp
+++ b/linden/indra/test/llstring_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2006-12-24
  * @brief Test cases of llstring.cpp
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
diff --git a/linden/indra/test/lltemplatemessagebuilder_tut.cpp b/linden/indra/test/lltemplatemessagebuilder_tut.cpp
index 7aff445..31e9c71 100644
--- a/linden/indra/test/lltemplatemessagebuilder_tut.cpp
+++ b/linden/indra/test/lltemplatemessagebuilder_tut.cpp
@@ -3,7 +3,9 @@
  * @date 2007-04
  * @brief Tests for building messages.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
diff --git a/linden/indra/test/lltiming_tut.cpp b/linden/indra/test/lltiming_tut.cpp
index c2c9fd8..bbecb7a 100644
--- a/linden/indra/test/lltiming_tut.cpp
+++ b/linden/indra/test/lltiming_tut.cpp
@@ -3,6 +3,8 @@
  * @date 2006-07-23
  * @brief Tests the timers.
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/test/lltut.cpp b/linden/indra/test/lltut.cpp
index c872077..03a70c7 100644
--- a/linden/indra/test/lltut.cpp
+++ b/linden/indra/test/lltut.cpp
@@ -4,6 +4,8 @@
  * @date 5/16/06
  * @brief MacTester
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/test/lltut.h b/linden/indra/test/lltut.h
index f40555e..1827624 100644
--- a/linden/indra/test/lltut.h
+++ b/linden/indra/test/lltut.h
@@ -4,6 +4,8 @@
  * @date 2005-09-26
  * @brief helper tut methods
  *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
  * Copyright (c) 2005-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLTUT_H
diff --git a/linden/indra/test/lluri_tut.cpp b/linden/indra/test/lluri_tut.cpp
index b49f6dd..8ff1921 100644
--- a/linden/indra/test/lluri_tut.cpp
+++ b/linden/indra/test/lluri_tut.cpp
@@ -3,6 +3,8 @@
  * @brief  LLURI unit tests
  * @date   September 2006
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,11 +27,11 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
-#include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
-
 #include "llsd.h"
 #include "lluri.h"
 #include "llhost.h"
diff --git a/linden/indra/test/lluserrelations_tut.cpp b/linden/indra/test/lluserrelations_tut.cpp
index f9b4615..4d07ba9 100644
--- a/linden/indra/test/lluserrelations_tut.cpp
+++ b/linden/indra/test/lluserrelations_tut.cpp
@@ -4,6 +4,8 @@
  * @date 2006-10-12
  * @brief Unit tests for the LLRelationship class.
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
diff --git a/linden/indra/test/lluuidhashmap_tut.cpp b/linden/indra/test/lluuidhashmap_tut.cpp
index a787326..129d17a 100644
--- a/linden/indra/test/lluuidhashmap_tut.cpp
+++ b/linden/indra/test/lluuidhashmap_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-02
  * @brief Test cases for LLUUIDHashMap
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
diff --git a/linden/indra/test/llxfer_tut.cpp b/linden/indra/test/llxfer_tut.cpp
index c4665c9..0b1b8a6 100644
--- a/linden/indra/test/llxfer_tut.cpp
+++ b/linden/indra/test/llxfer_tut.cpp
@@ -3,7 +3,9 @@
  * @author Moss
  * @date 2007-04-17
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/test/llxorcipher_tut.cpp b/linden/indra/test/llxorcipher_tut.cpp
index 07b33b6..a2a9b51 100644
--- a/linden/indra/test/llxorcipher_tut.cpp
+++ b/linden/indra/test/llxorcipher_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-03
  * @brief llxorcipher, llnullcipher test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,9 +28,10 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
  
-#include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
 #include "llxorcipher.h"
 #include "llnullcipher.h"
diff --git a/linden/indra/test/m3math_tut.cpp b/linden/indra/test/m3math_tut.cpp
index b693193..be2b474 100644
--- a/linden/indra/test/m3math_tut.cpp
+++ b/linden/indra/test/m3math_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-03
  * @brief Test cases of m3math.h
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
diff --git a/linden/indra/test/math.cpp b/linden/indra/test/math.cpp
index 3f5a15c..5256e40 100644
--- a/linden/indra/test/math.cpp
+++ b/linden/indra/test/math.cpp
@@ -4,6 +4,8 @@
  * @date 2005-09-26
  * @brief Tests for the llmath library.
  *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
  * Copyright (c) 2005-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/test/message_tut.cpp b/linden/indra/test/message_tut.cpp
index 2a7bf45..5d9f6ee 100644
--- a/linden/indra/test/message_tut.cpp
+++ b/linden/indra/test/message_tut.cpp
@@ -3,7 +3,9 @@
  * @date 2007-04
  * @brief LLDataPacker test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
diff --git a/linden/indra/test/reflection_tut.cpp b/linden/indra/test/reflection_tut.cpp
index 7230c60..d3d5606 100644
--- a/linden/indra/test/reflection_tut.cpp
+++ b/linden/indra/test/reflection_tut.cpp
@@ -3,6 +3,8 @@
  * @date   May 2006
  * @brief Reflection unit tests.
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -25,10 +27,12 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
 
+#include "linden_common.h"
 #include "lltut.h"
 #include "reflective.h"
 #include "metaclasst.h"
diff --git a/linden/indra/test/test.cpp b/linden/indra/test/test.cpp
index 1c03768..fc8f8d9 100644
--- a/linden/indra/test/test.cpp
+++ b/linden/indra/test/test.cpp
@@ -4,6 +4,8 @@
  * @date 2005-09-26
  * @brief Entry point for the test app.
  *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
  * Copyright (c) 2005-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 /** 
diff --git a/linden/indra/test/test.vcproj b/linden/indra/test/test.vcproj
index 1a55b8c..7e84533 100644
--- a/linden/indra/test/test.vcproj
+++ b/linden/indra/test/test.vcproj
@@ -35,7 +35,7 @@
                         <Tool
                                 Name="VCLinkerTool"
                                 AdditionalOptions="/FORCE:MULTIPLE"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib llcommon.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib llcommon.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib psapi.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
                                 OutputFile="$(OutDir)/test.exe"
                                 LinkIncremental="2"
                                 AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_debug&quot;"
@@ -90,7 +90,7 @@
                         <Tool
                                 Name="VCLinkerTool"
                                 AdditionalOptions="/FORCE:MULTIPLE"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib llcommon.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib dinput8.lib dsound.lib dxerr8.lib dxguid.lib freetype.lib gdi32.lib glu32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib llcommon.lib llprimitive.lib llvfs.lib llxml.lib lscript_library.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib opengl32.lib psapi.lib shell32.lib ssleay32.lib user32.lib Vfw32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
                                 OutputFile="$(OutDir)/test.exe"
                                 LinkIncremental="2"
                                 AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
@@ -145,7 +145,7 @@
                                 Name="VCCustomBuildTool"/>
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib gdi32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib shell32.lib ssleay32.lib user32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
+                                AdditionalDependencies="advapi32.lib apr-1.lib aprutil-1.lib comdlg32.lib gdi32.lib jpeglib_6b.lib kernel32.lib libboost_regex-vc71-mt-s.lib libcurl.lib libeay32.lib libexpatMT.lib mswsock.lib netapi32.lib odbc32.lib odbccp32.lib ole32.lib oleaut32.lib psapi.lib shell32.lib ssleay32.lib user32.lib winmm.lib winspool.lib ws2_32.lib xmlrpcepi.lib zlib.lib"
                                 OutputFile="$(OutDir)/test.exe"
                                 LinkIncremental="2"
                                 AdditionalLibraryDirectories="&quot;../lib_$(ConfigurationName)/i686-win32&quot;;&quot;../../libraries/i686-win32/lib_release&quot;"
diff --git a/linden/indra/test/test_llmanifest.py b/linden/indra/test/test_llmanifest.py
index 797d5ac..dfe79e2 100644
--- a/linden/indra/test/test_llmanifest.py
+++ b/linden/indra/test/test_llmanifest.py
@@ -1,30 +1,35 @@
 #!/usr/bin/python
-# @file test_llmanifest.py
-# @author Ryan Williams
-# @brief Test cases for LLManifest library.
-#
-# Copyright (c) 2006-2007, Linden Research, Inc.
-# 
-# Second Life Viewer Source Code
-# The source code in this file ("Source Code") is provided by Linden Lab
-# to you under the terms of the GNU General Public License, version 2.0
-# ("GPL"), unless you have obtained a separate licensing agreement
-# ("Other License"), formally executed by you and Linden Lab.  Terms of
-# the GPL can be found in doc/GPL-license.txt in this distribution, or
-# online at http://secondlife.com/developers/opensource/gplv2
-# 
-# There are special exceptions to the terms and conditions of the GPL as
-# it is applied to this Source Code. View the full text of the exception
-# in the file doc/FLOSS-exception.txt in this software distribution, or
-# online at http://secondlife.com/developers/opensource/flossexception
-# 
-# By copying, modifying or distributing this software, you acknowledge
-# that you have read and understood your obligations described above,
-# and agree to abide by those obligations.
-# 
-# ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-# WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-# COMPLETENESS OR PERFORMANCE.
+"""
+@file test_llmanifest.py
+@author Ryan Williams
+@brief Test cases for LLManifest library.
+
+$LicenseInfo:firstyear=2006&license=viewergpl$
+
+Copyright (c) 2006-2007, Linden Research, Inc.
+
+Second Life Viewer Source Code
+The source code in this file ("Source Code") is provided by Linden Lab
+to you under the terms of the GNU General Public License, version 2.0
+("GPL"), unless you have obtained a separate licensing agreement
+("Other License"), formally executed by you and Linden Lab.  Terms of
+the GPL can be found in doc/GPL-license.txt in this distribution, or
+online at http://secondlife.com/developers/opensource/gplv2
+
+There are special exceptions to the terms and conditions of the GPL as
+it is applied to this Source Code. View the full text of the exception
+in the file doc/FLOSS-exception.txt in this software distribution, or
+online at http://secondlife.com/developers/opensource/flossexception
+
+By copying, modifying or distributing this software, you acknowledge
+that you have read and understood your obligations described above,
+and agree to abide by those obligations.
+
+ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+COMPLETENESS OR PERFORMANCE.
+$/LicenseInfo$
+"""
 
 from indra.util import llmanifest
 import os.path
diff --git a/linden/indra/test/v2math_tut.cpp b/linden/indra/test/v2math_tut.cpp
index 0765989..cb9da6e 100644
--- a/linden/indra/test/v2math_tut.cpp
+++ b/linden/indra/test/v2math_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-02
  * @brief v2math test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,11 +28,13 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
  
 #include <tut/tut.h>
-#include "lltut.h"
+
 #include "linden_common.h"
+#include "lltut.h"
 #include "v2math.h"
 
 
@@ -261,9 +265,6 @@ namespace tut
         template<> template<>
         void v2math_object::test<13>()
         {
-#if (LL_RELEASE && LL_LINUX)
-                skip_fail("Doesn't work under Linux -- FIX ME!");
-#endif
                 F32 x1 = 1.f, y1 = 2.f,x2 = 2.332f, y2 = -1.23f;
                 F32 val1, val2;
                 LLVector2 vec2(x1, y1), vec3(x2, y2);
@@ -292,7 +293,7 @@ namespace tut
                 vec2 -=vec3;
                 val1 = x1-x2;
                 val2 = y1-y2;
-                ensure("4:operator-= failed",(val1 == vec2.mV[VX]) && (val2 == vec2.mV[VY]));
+                ensure("4:operator-= failed", is_approx_equal(val1, vec2.mV[VX]) && is_approx_equal(val2, vec2.mV[VY]));
         }
 
         template<> template<>
@@ -431,10 +432,6 @@ namespace tut
         template<> template<>
         void v2math_object::test<23>()
         {
-#if (LL_RELEASE && LL_LINUX)
-                skip_fail("Doesn't work under Linux -- FIX ME!");
-#endif
-
                 F32 x1 =1.f, y1 = 2.f;
                 F32 val1, val2;
                 LLVector2 vec2(x1, y1);
@@ -446,7 +443,7 @@ namespace tut
                 val1 = x1 * oomag;
                 val2 = y1 * oomag;
 
-                ensure("normVec failed", val1 == vec2.mV[VX] && val2 == vec2.mV[VY] && vecMag == mag);
+                ensure("normVec failed", is_approx_equal(val1, vec2.mV[VX]) && is_approx_equal(val2, vec2.mV[VY]) && is_approx_equal(vecMag, mag));
 
                 x1 =.00000001f, y1 = 0.f;
 
diff --git a/linden/indra/test/v3color_tut.cpp b/linden/indra/test/v3color_tut.cpp
index 411d196..6f00d42 100644
--- a/linden/indra/test/v3color_tut.cpp
+++ b/linden/indra/test/v3color_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-03
  * @brief v3color test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,11 +28,12 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
-#include "lltut.h"
 #include "linden_common.h"
+#include "lltut.h"
 #include "v3color.h"
 
 
@@ -101,9 +104,6 @@ namespace tut
         template<> template<>
         void v3color_object::test<5>()
         {
-#if (LL_RELEASE && LL_LINUX)
-                skip_fail("Doesn't work under Linux -- FIX ME!");
-#endif
                 F32 r = 2.3436212f, g = 1231.f, b = 4.7849321232f;
                 F32 val1, val2,val3;
                 LLColor3 llcolor3(r,g,b);
@@ -113,7 +113,7 @@ namespace tut
                 val1 = r * oomag;
                 val2 = g * oomag;
                 val3 = b * oomag;
-                ensure("1:normVec failed ", (val1 == llcolor3.mV[0] && val2 == llcolor3.mV[1] && val3 == llcolor3.mV[2] && vecMag == mag));
+                ensure("1:normVec failed ", (is_approx_equal(val1, llcolor3.mV[0]) && is_approx_equal(val2, llcolor3.mV[1]) && is_approx_equal(val3, llcolor3.mV[2]) && is_approx_equal(vecMag, mag)));
                 r = .000000000f, g = 0.f, b = 0.0f;
                 llcolor3.setVec(r,g,b);
                 vecMag = llcolor3.normVec();
diff --git a/linden/indra/test/v3dmath_tut.cpp b/linden/indra/test/v3dmath_tut.cpp
index 2f5ea8e..1f6dc14 100644
--- a/linden/indra/test/v3dmath_tut.cpp
+++ b/linden/indra/test/v3dmath_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-03
  * @brief v3dmath test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,9 +28,11 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
  
 #include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
 #include "llquaternion.h"
 #include "m3math.h"
@@ -273,9 +277,6 @@ namespace tut
         template<> template<>
         void v3dmath_object::test<12>()
         {
-#if (LL_RELEASE && LL_LINUX)
-                skip_fail("Doesn't work under Linux -- FIX ME!");
-#endif
                 F64 x1 = 1., y1 = 2., z1 = -1.1;
                 F64 x2 = 1.2, y2 = 2.5, z2 = 1.;
                 F64 val1, val2, val3;
@@ -286,7 +287,10 @@ namespace tut
                 val3 = x1*y2-x2*y1;
                 ensure("1:operator% failed",(val1 == vec3Db.mdV[VX]) && (val2 == vec3Db.mdV[VY]) && (val3 == vec3Db.mdV[VZ])); 
                 vec3D %= vec3Da;
-                ensure_equals("2:operator%= failed",vec3D,vec3Db); 
+                ensure("2:operator%= failed",
+                       is_approx_equal(vec3D.mdV[VX],vec3Db.mdV[VX]) &&
+                       is_approx_equal(vec3D.mdV[VY],vec3Db.mdV[VY]) &&
+                       is_approx_equal(vec3D.mdV[VZ],vec3Db.mdV[VZ]) ); 
         }
 
         template<> template<>
diff --git a/linden/indra/test/v3math_tut.cpp b/linden/indra/test/v3math_tut.cpp
index 4f4e7e0..40f649d 100644
--- a/linden/indra/test/v3math_tut.cpp
+++ b/linden/indra/test/v3math_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-02
  * @brief v3math test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,9 +28,11 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
  
 #include <tut/tut.h>
+#include "linden_common.h"
 #include "lltut.h"
 #include "llquaternion.h"
 #include "linden_common.h"
@@ -390,9 +394,6 @@ namespace tut
         template<> template<>
         void v3math_object::test<22>()
         {
-#if (LL_RELEASE && LL_LINUX)
-                skip_fail("Doesn't work under Linux -- FIX ME!");
-#endif
                 F32 x1 =1.f, y1 = 2.f,z1 = 1.2f, x2 = -2.3f, y2 = 1.11f, z2 = 1234.234f;
                 F32 val1,val2,val3;
                 LLVector3 vec3(x1,y1,z1), vec3a(x2,y2,z2);
@@ -407,7 +408,7 @@ namespace tut
                 val1 = x1*mulVal;
                 val2 = y1*mulVal;
                 val3 = z1*mulVal;
-                ensure("2:operator*= failed ", (val1 == vec3.mV[VX]) && (val2 == vec3.mV[VY]) && (val3 == vec3.mV[VZ]));
+                ensure("2:operator*= failed ", is_approx_equal(val1, vec3.mV[VX]) && is_approx_equal(val2, vec3.mV[VY]) && is_approx_equal(val3, vec3.mV[VZ]));
         }
 
         template<> template<>
@@ -527,15 +528,12 @@ namespace tut
         template<> template<>
         void v3math_object::test<32>()
         {
-#if (LL_RELEASE && LL_LINUX)
-                skip_fail("Doesn't work under Linux -- FIX ME!");
-#endif
                 F32 x =12.3524f, y = -342.f,z = 4.126341f;
                 LLVector3 vec3(x,y,z);
                 F32 mag = vec3.normVec();
                 mag = 1.f/ mag;
                 F32 val1 = x* mag, val2 = y* mag, val3 = z* mag;
-                ensure("1:normVec: Fail ", (val1 == vec3.mV[VX]) && (val2 == vec3.mV[VY])&& (val3 == vec3.mV[VZ]));
+                ensure("1:normVec: Fail ", is_approx_equal(val1, vec3.mV[VX]) && is_approx_equal(val2, vec3.mV[VY]) && is_approx_equal(val3, vec3.mV[VZ]));
                 x = 0.000000001f, y = 0.f, z = 0.f;
                 vec3.clearVec();
                 vec3.setVec(x,y,z);
@@ -556,9 +554,6 @@ namespace tut
         template<> template<>
         void v3math_object::test<34>()
         {
-#if (LL_RELEASE && LL_LINUX)
-                skip_fail("Doesn't work under Linux -- FIX ME!");
-#endif
                 F32 x = 10.f, y = 20.f, z = -15.f;
                 F32 x1, y1, z1;
                 F32 lowerxy = 0.f, upperxy = 1.0f, lowerz = -1.0f, upperz = 1.f;
@@ -567,12 +562,12 @@ namespace tut
                 x1 = U16_to_F32(F32_to_U16(x, lowerxy, upperxy), lowerxy, upperxy);
                 y1 = U16_to_F32(F32_to_U16(y, lowerxy, upperxy), lowerxy, upperxy);
                 z1 = U16_to_F32(F32_to_U16(z, lowerz,  upperz),  lowerz,  upperz);
-                ensure("1:quantize16: Fail ", (x1 == vec3.mV[VX]) && (y1 == vec3.mV[VY])&& (z1 == vec3.mV[VZ]));
+                ensure("1:quantize16: Fail ", is_approx_equal(x1, vec3.mV[VX]) && is_approx_equal(y1, vec3.mV[VY]) && is_approx_equal(z1, vec3.mV[VZ]));
                 LLVector3 vec3a(x,y,z);
                 vec3a.quantize8(lowerxy,upperxy,lowerz,upperz);
                 x1 = U8_to_F32(F32_to_U8(x, lowerxy, upperxy), lowerxy, upperxy);
                 y1 = U8_to_F32(F32_to_U8(y, lowerxy, upperxy), lowerxy, upperxy);
                 z1 = U8_to_F32(F32_to_U8(z, lowerz, upperz), lowerz, upperz);
-                ensure("2:quantize8: Fail ", (x1 == vec3a.mV[VX]) && (y1 == vec3a.mV[VY])&& (z1 == vec3a.mV[VZ]));
+                ensure("2:quantize8: Fail ", is_approx_equal(x1, vec3a.mV[VX]) && is_approx_equal(y1, vec3a.mV[VY]) && is_approx_equal(z1, vec3a.mV[VZ]));
         }
 }
diff --git a/linden/indra/test/v4color_tut.cpp b/linden/indra/test/v4color_tut.cpp
index 2d1cd7e..be0854b 100644
--- a/linden/indra/test/v4color_tut.cpp
+++ b/linden/indra/test/v4color_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-03
  * @brief v4color test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,12 +28,13 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 
 #include <tut/tut.h>
-#include "lltut.h"
 #include "linden_common.h"
+#include "lltut.h"
 #include "v4coloru.h"
 #include "llsd.h"
 #include "v3color.h"
@@ -163,16 +166,13 @@ namespace tut
         template<> template<>
         void v4color_object::test<7>()
         {
-#if (LL_RELEASE && LL_LINUX)
-                skip_fail("Doesn't work under Linux -- FIX ME!");
-#endif
                 F32 r = 0x20, g = 0xFFFF, b = 0xFF;
                 LLColor4 llcolor4(r,g,b);
                 F32 vecMag = llcolor4.normVec();
                 F32 mag = fsqrtf(r*r + g*g + b*b);
                 F32 oomag = 1.f / mag;
                 F32 val1 = r * oomag, val2 = g * oomag, val3 = b * oomag;
-                ensure("1:normVec failed ", (val1 == llcolor4.mV[0] && val2 == llcolor4.mV[1] && val3 == llcolor4.mV[2] && vecMag == mag));
+                ensure("1:normVec failed ", (is_approx_equal(val1, llcolor4.mV[0]) && is_approx_equal(val2, llcolor4.mV[1]) && is_approx_equal(val3, llcolor4.mV[2]) && is_approx_equal(vecMag, mag)));
         }
 
         template<> template<>
diff --git a/linden/indra/test/v4coloru_tut.cpp b/linden/indra/test/v4coloru_tut.cpp
index f671cf1..0ec117c 100644
--- a/linden/indra/test/v4coloru_tut.cpp
+++ b/linden/indra/test/v4coloru_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-03
  * @brief v4coloru test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,12 +28,13 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 
 #include <tut/tut.h>
-#include "lltut.h"
 #include "linden_common.h"
+#include "lltut.h"
 #include "llsd.h"
 #include "v4coloru.h"
 
diff --git a/linden/indra/test/v4math_tut.cpp b/linden/indra/test/v4math_tut.cpp
index 055e825..fab6372 100644
--- a/linden/indra/test/v4math_tut.cpp
+++ b/linden/indra/test/v4math_tut.cpp
@@ -4,7 +4,9 @@
  * @date 2007-03
  * @brief v4math test cases.
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,11 +28,12 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
  
 #include <tut/tut.h>
-#include "lltut.h"
 #include "linden_common.h"
+#include "lltut.h"
 #include "llquaternion.h"
 #include "llsd.h"
 #include "m4math.h"
diff --git a/linden/indra/test/xform_tut.cpp b/linden/indra/test/xform_tut.cpp
index b3bc347..bb96445 100644
--- a/linden/indra/test/xform_tut.cpp
+++ b/linden/indra/test/xform_tut.cpp
@@ -4,7 +4,9 @@
  * @date March 2007 
  * @brief Test cases for LLXform
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -26,11 +28,12 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include <tut/tut.h>
-#include "lltut.h"
 #include "linden_common.h"
+#include "lltut.h"
 #include "xform.h"
 
 namespace tut