159 files changed, 636 insertions, 147 deletions
diff --git a/linden/indra/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp
index b1d7fef..d5e0445 100644
--- a/linden/indra/llmessage/llassetstorage.cpp
+++ b/linden/indra/llmessage/llassetstorage.cpp
@@ -2,6 +2,8 @@
 * @file llassetstorage.cpp
 * @brief Implementation of the base asset storage system.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,16 +26,14 @@
 * 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"
 // system library includes
-#include <stdlib.h>
-#include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <algorithm>
 #include "llassetstorage.h"
diff --git a/linden/indra/llmessage/llassetstorage.h b/linden/indra/llmessage/llassetstorage.h
index 630268d..e2ccf2c 100644
--- a/linden/indra/llmessage/llassetstorage.h
+++ b/linden/indra/llmessage/llassetstorage.h
@@ -3,6 +3,8 @@
 * @brief definition of LLAssetStorage class which allows simple
 * up/downloads of uuid,type asets
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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_LLASSETSTORAGE_H
diff --git a/linden/indra/llmessage/llblowfishcipher.cpp b/linden/indra/llmessage/llblowfishcipher.cpp
index 62464de..7c9194d 100644
--- a/linden/indra/llmessage/llblowfishcipher.cpp
+++ b/linden/indra/llmessage/llblowfishcipher.cpp
@@ -5,7 +5,9 @@
 * We do not have OpenSSL headers or libraries on Windows, so this
 * class only works on Linux.
 *
- * 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
@@ -27,6 +29,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/llmessage/llblowfishcipher.h b/linden/indra/llmessage/llblowfishcipher.h
index 0ba1473..f477184 100644
--- a/linden/indra/llmessage/llblowfishcipher.h
+++ b/linden/indra/llmessage/llblowfishcipher.h
@@ -5,7 +5,9 @@
 * two UUIDs and a timestamp (16x2 + 4 = 36 bytes) with only 40 bytes of
 * output.  AES has a block size of 32 bytes, so this would require 64 bytes.
 *
- * 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
@@ -27,6 +29,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 LLBLOWFISHCIPHER_H
diff --git a/linden/indra/llmessage/llbuffer.cpp b/linden/indra/llmessage/llbuffer.cpp
index ad822bc..c3433e9 100644
--- a/linden/indra/llmessage/llbuffer.cpp
+++ b/linden/indra/llmessage/llbuffer.cpp
@@ -4,6 +4,8 @@
 * @date 2005-09-20
 * @brief Implementation of the segments, buffers, and buffer arrays.
 *
+ * $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/llmessage/llbuffer.h b/linden/indra/llmessage/llbuffer.h
index 63f7bea..b251af8 100644
--- a/linden/indra/llmessage/llbuffer.h
+++ b/linden/indra/llmessage/llbuffer.h
@@ -4,6 +4,8 @@
 * @date 2005-09-20
 * @brief Declaration of buffer and buffer arrays primarily used in I/O.
 *
+ * $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_LLBUFFER_H
diff --git a/linden/indra/llmessage/llbufferstream.cpp b/linden/indra/llmessage/llbufferstream.cpp
index 4a4d892..72310a5 100644
--- a/linden/indra/llmessage/llbufferstream.cpp
+++ b/linden/indra/llmessage/llbufferstream.cpp
@@ -4,6 +4,8 @@
 * @date 2005-10-10
 * @brief Implementation of the buffer iostream classes
 *
+ * $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/llmessage/llbufferstream.h b/linden/indra/llmessage/llbufferstream.h
index 5447a80..78b7f3c 100644
--- a/linden/indra/llmessage/llbufferstream.h
+++ b/linden/indra/llmessage/llbufferstream.h
@@ -4,6 +4,8 @@
 * @date 2005-10-10
 * @brief Classes to treat an LLBufferArray as a c++ iostream.
 *
+ * $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_LLBUFFERSTREAM_H
diff --git a/linden/indra/llmessage/llcachename.cpp b/linden/indra/llmessage/llcachename.cpp
index d960429..f731c95 100644
--- a/linden/indra/llmessage/llcachename.cpp
+++ b/linden/indra/llmessage/llcachename.cpp
@@ -2,6 +2,8 @@
 * @file llcachename.cpp
 * @brief A hierarchical cache of first and last names queried based on UUID.
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -23,20 +25,14 @@
 * 
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE. 
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
 */
 #include "linden_common.h"
 #include "llcachename.h"
-// system includes
-#include <string.h>             // strcpy
-#include <time.h>
-#include <algorithm>
-#include <functional>
-#include <map>
 // linden library includes
 #include "message.h"
 #include "llrand.h"
diff --git a/linden/indra/llmessage/llcachename.h b/linden/indra/llmessage/llcachename.h
index d1a5cfe..ab62829 100644
--- a/linden/indra/llmessage/llcachename.h
+++ b/linden/indra/llmessage/llcachename.h
@@ -2,6 +2,8 @@
 * @file llcachename.h
 * @brief A cache of names from UUIDs.
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,14 +26,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$
 */
 #ifndef LL_LLCACHENAME_H
 #define LL_LLCACHENAME_H
-// Forward declarations
-#include <stdio.h>
 class LLMessageSystem;
 class LLHost;
 class LLUUID;
diff --git a/linden/indra/llmessage/llcallbacklisth.h b/linden/indra/llmessage/llcallbacklisth.h
index 74dbcc8..eee3977 100644
--- a/linden/indra/llmessage/llcallbacklisth.h
+++ b/linden/indra/llmessage/llcallbacklisth.h
@@ -3,6 +3,8 @@
 * @brief Like LLCallbackList but uses handles instead of pointers for
 * user data
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-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_LLCALLBACKLISTH_H
diff --git a/linden/indra/llmessage/llchainio.cpp b/linden/indra/llmessage/llchainio.cpp
index 47352d1..226ee10 100644
--- a/linden/indra/llmessage/llchainio.cpp
+++ b/linden/indra/llmessage/llchainio.cpp
@@ -4,6 +4,8 @@
 * @date 2005-08-04
 * @brief Implementaiton of the chain factory.
 *
+ * $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/llmessage/llchainio.h b/linden/indra/llmessage/llchainio.h
index ef2747a..3e32956 100644
--- a/linden/indra/llmessage/llchainio.h
+++ b/linden/indra/llmessage/llchainio.h
@@ -4,6 +4,8 @@
 * @date 2005-08-04
 * @brief This class declares the interface for constructing io chains.
 *
+ * $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_LLCHAINIO_H
diff --git a/linden/indra/llmessage/llcipher.h b/linden/indra/llmessage/llcipher.h
index 1860277..669c8aa 100644
--- a/linden/indra/llmessage/llcipher.h
+++ b/linden/indra/llmessage/llcipher.h
@@ -2,6 +2,8 @@
 * @file llcipher.h
 * @brief Abstract base class for encryption ciphers.
 *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
 * Copyright (c) 2003-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$
 */
 #ifndef LLCIPHER_H
diff --git a/linden/indra/llmessage/llcircuit.cpp b/linden/indra/llmessage/llcircuit.cpp
index 3c947d9..1d1be56 100644
--- a/linden/indra/llmessage/llcircuit.cpp
+++ b/linden/indra/llmessage/llcircuit.cpp
@@ -2,6 +2,8 @@
 * @file llcircuit.cpp
 * @brief Class to track UDP endpoints for the message system.
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llcircuit.h b/linden/indra/llmessage/llcircuit.h
index 33c0e10..128b1bc 100644
--- a/linden/indra/llmessage/llcircuit.h
+++ b/linden/indra/llmessage/llcircuit.h
@@ -3,6 +3,8 @@
 * @brief Provides a method for tracking network circuit information
 * for the UDP message system
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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_LLCIRCUIT_H
diff --git a/linden/indra/llmessage/llclassifiedflags.cpp b/linden/indra/llmessage/llclassifiedflags.cpp
index ed595b1..b34ebfe 100644
--- a/linden/indra/llmessage/llclassifiedflags.cpp
+++ b/linden/indra/llmessage/llclassifiedflags.cpp
@@ -2,6 +2,8 @@
 * @file llclassifiedflags.cpp
 * @brief 
 *
+ * $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/llmessage/llclassifiedflags.h b/linden/indra/llmessage/llclassifiedflags.h
index a2a93d8..bcd03d9 100644
--- a/linden/indra/llmessage/llclassifiedflags.h
+++ b/linden/indra/llmessage/llclassifiedflags.h
@@ -2,6 +2,8 @@
 * @file llclassifiedflags.h
 * @brief Flags used in the classifieds.
 *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
 * Copyright (c) 2005-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$
 */
 #ifndef LL_LLCLASSIFIEDFLAGS_H
diff --git a/linden/indra/llmessage/llcurl.cpp b/linden/indra/llmessage/llcurl.cpp
index b94a41e..01976b1 100644
--- a/linden/indra/llmessage/llcurl.cpp
+++ b/linden/indra/llmessage/llcurl.cpp
@@ -4,6 +4,8 @@
 * @date 2006-10-15
 * @brief Curl wrapper
 *
+ * $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/llmessage/llcurl.h b/linden/indra/llmessage/llcurl.h
index 2d7d5d8..d21cdc4 100644
--- a/linden/indra/llmessage/llcurl.h
+++ b/linden/indra/llmessage/llcurl.h
@@ -4,6 +4,8 @@
 * @date 2006-10-15
 * @brief Curl wrapper
 *
+ * $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$
 */
 
 #ifndef LL_LLCURL_H
diff --git a/linden/indra/llmessage/lldatapacker.cpp b/linden/indra/llmessage/lldatapacker.cpp
index 8725870..2ebd1b7 100644
--- a/linden/indra/llmessage/lldatapacker.cpp
+++ b/linden/indra/llmessage/lldatapacker.cpp
@@ -2,6 +2,8 @@
 * @file lldatapacker.cpp
 * @brief Data packer implementation.
 *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
 * Copyright (c) 2006-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,10 +26,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 <string.h>
 #include "linden_common.h"
 #include "lldatapacker.h"
diff --git a/linden/indra/llmessage/lldatapacker.h b/linden/indra/llmessage/lldatapacker.h
index 700f8fb..ff33d4e 100644
--- a/linden/indra/llmessage/lldatapacker.h
+++ b/linden/indra/llmessage/lldatapacker.h
@@ -2,6 +2,8 @@
 * @file lldatapacker.h
 * @brief Data packer declaration for tightly storing binary data.
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,16 +26,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$
 */
 #ifndef LL_LLDATAPACKER_H 
 #define LL_LLDATAPACKER_H
-#include <stdio.h>
-#include <iostream>
-#include "llerror.h"
 class LLColor4;
 class LLColor4U;
 class LLVector2;
diff --git a/linden/indra/llmessage/lldbstrings.h b/linden/indra/llmessage/lldbstrings.h
index dd249b1..f36f4c4 100644
--- a/linden/indra/llmessage/lldbstrings.h
+++ b/linden/indra/llmessage/lldbstrings.h
@@ -2,6 +2,8 @@
 * @file lldbstrings.h
 * @brief Database String Lengths.
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-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$
 */
 #ifndef LL_LLDBSTRINGS_H
diff --git a/linden/indra/llmessage/lldispatcher.cpp b/linden/indra/llmessage/lldispatcher.cpp
index 2e775f9..d0e1e68 100644
--- a/linden/indra/llmessage/lldispatcher.cpp
+++ b/linden/indra/llmessage/lldispatcher.cpp
@@ -2,6 +2,8 @@
 * @file lldispatcher.cpp
 * @brief Implementation of the dispatcher object.
 *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
 * Copyright (c) 2004-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/lldispatcher.h b/linden/indra/llmessage/lldispatcher.h
index 374ee0d..452be7c 100644
--- a/linden/indra/llmessage/lldispatcher.h
+++ b/linden/indra/llmessage/lldispatcher.h
@@ -2,6 +2,8 @@
 * @file lldispatcher.h
 * @brief LLDispatcher class header file.
 *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
 * Copyright (c) 2004-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$
 */
 #ifndef LL_LLDISPATCHER_H
diff --git a/linden/indra/llmessage/lleventflags.h b/linden/indra/llmessage/lleventflags.h
index f6b89e3..9a5b889 100644
--- a/linden/indra/llmessage/lleventflags.h
+++ b/linden/indra/llmessage/lleventflags.h
@@ -2,6 +2,8 @@
 * @file lleventflags.h
 * @brief Flags for events.
 *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
 * Copyright (c) 2004-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$
 */
 #ifndef LL_LLEVENTFLAGS_H
diff --git a/linden/indra/llmessage/llfiltersd2xmlrpc.cpp b/linden/indra/llmessage/llfiltersd2xmlrpc.cpp
index 34a4621..eac7dc1 100644
--- a/linden/indra/llmessage/llfiltersd2xmlrpc.cpp
+++ b/linden/indra/llmessage/llfiltersd2xmlrpc.cpp
@@ -3,6 +3,8 @@
 * @author Phoenix
 * @date 2005-04-26
 *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
 * Copyright (c) 2005-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/llmessage/llfiltersd2xmlrpc.h b/linden/indra/llmessage/llfiltersd2xmlrpc.h
index 8b2f066..c82a518 100644
--- a/linden/indra/llmessage/llfiltersd2xmlrpc.h
+++ b/linden/indra/llmessage/llfiltersd2xmlrpc.h
@@ -3,6 +3,8 @@
 * @author Phoenix
 * @date 2005-04-26
 *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
 * Copyright (c) 2005-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_LLFILTERSD2XMLRPC_H
diff --git a/linden/indra/llmessage/llfollowcamparams.h b/linden/indra/llmessage/llfollowcamparams.h
index 0979474..0affcf9 100644
--- a/linden/indra/llmessage/llfollowcamparams.h
+++ b/linden/indra/llmessage/llfollowcamparams.h
@@ -2,6 +2,8 @@
 * @file llfollowcamparams.h
 * @brief Follow camera parameters.
 *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
 * Copyright (c) 2005-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$
 */
 #ifndef LL_FOLLOWCAM_PARAMS_H
diff --git a/linden/indra/llmessage/llhost.cpp b/linden/indra/llmessage/llhost.cpp
index d57d52d..b73becf 100644
--- a/linden/indra/llmessage/llhost.cpp
+++ b/linden/indra/llmessage/llhost.cpp
@@ -2,6 +2,8 @@
 * @file llhost.cpp
 * @brief Encapsulates an IP address and a port.
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llhost.h b/linden/indra/llmessage/llhost.h
index 1d37639..e6f811a 100644
--- a/linden/indra/llmessage/llhost.h
+++ b/linden/indra/llmessage/llhost.h
@@ -3,6 +3,8 @@
 * @brief a LLHost uniquely defines a host (Simulator, Proxy or other)
 * across the network
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-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_LLHOST_H
diff --git a/linden/indra/llmessage/llhttpassetstorage.cpp b/linden/indra/llmessage/llhttpassetstorage.cpp
index 924d903..c5b897b 100644
--- a/linden/indra/llmessage/llhttpassetstorage.cpp
+++ b/linden/indra/llmessage/llhttpassetstorage.cpp
@@ -3,6 +3,8 @@
 * @brief Subclass capable of loading asset data to/from an external
 * source. Currently, a web server accessed via curl
 *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
 * Copyright (c) 2003-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"
@@ -336,15 +339,17 @@ size_t LLHTTPAssetRequest::readCompressedData(void* data, size_t size)
        while (mZStream.avail_out > 0)
        {
-                if (mZStream.avail_in == 0  &&  !mZInputExhausted)
+                if (mZStream.avail_in == 0 && !mZInputExhausted)
                {
                        S32 to_read = llmin(COMPRESSED_INPUT_BUFFER_SIZE,
                                                        (S32)(mVFile->getSize() - mVFile->tell()));
                        
-                        mVFile->read((U8*)mZInputBuffer, to_read); /*Flawfinder: ignore*/
+                        if ( to_read > 0 )
+                        {
-                        mZStream.next_in = (Bytef*)mZInputBuffer;
+                                mVFile->read((U8*)mZInputBuffer, to_read); /*Flawfinder: ignore*/
-                        mZStream.avail_in = mVFile->getLastBytesRead();
+                                mZStream.next_in = (Bytef*)mZInputBuffer;
+                                mZStream.avail_in = mVFile->getLastBytesRead();
+                        }
                        mZInputExhausted = mZStream.avail_in == 0;
                }
@@ -352,8 +357,13 @@ size_t LLHTTPAssetRequest::readCompressedData(void* data, size_t size)
                int r = deflate(&mZStream,
                                        mZInputExhausted ? Z_FINISH : Z_NO_FLUSH);
-                if (r == Z_STREAM_END)
+                if (r == Z_STREAM_END || r < 0 || mZInputExhausted)
                {
+                        if (r < 0)
+                        {
+                                llwarns << "LLHTTPAssetRequest::readCompressedData: deflate returned error code " 
+                                                << (S32) r << llendl;
+                        }
                        break;
                }
        }
@@ -365,15 +375,20 @@ size_t LLHTTPAssetRequest::readCompressedData(void* data, size_t size)
 size_t LLHTTPAssetRequest::curlCompressedUploadCallback(
                void *data, size_t size, size_t nmemb, void *user_data)
 {
-        if (!gAssetStorage)
+        size_t num_read = 0;
+        if (gAssetStorage)
        {
-                return 0;
+                CURL *curl_handle = (CURL *)user_data;
+                LLHTTPAssetRequest *req = NULL;
+                curl_easy_getinfo(curl_handle, CURLINFO_PRIVATE, &req);
+                if (req)
+                {
+                        num_read = req->readCompressedData(data, size * nmemb);
+                }
        }
-        CURL *curl_handle = (CURL *)user_data;
-        LLHTTPAssetRequest *req = NULL;
-        curl_easy_getinfo(curl_handle, CURLINFO_PRIVATE, &req);
-        return req->readCompressedData(data, size * nmemb);
+        return num_read;
 }
 /////////////////////////////////////////////////////////////////////////////////
@@ -531,9 +546,8 @@ void LLHTTPAssetStorage::storeAssetData(
                {
                        callback(LLUUID::null, user_data, LL_ERR_CANNOT_OPEN_FILE, LL_EXSTAT_BLOCKED_FILE);
                }
+                delete legacy;
        }
-        // Coverity CID-269 says there's a leak of 'legacy' here, but
-        // legacyStoreDataCallback() will delete it somewhere down the line.
 }
 // virtual
diff --git a/linden/indra/llmessage/llhttpassetstorage.h b/linden/indra/llmessage/llhttpassetstorage.h
index 7fee143..e6ec39e 100644
--- a/linden/indra/llmessage/llhttpassetstorage.h
+++ b/linden/indra/llmessage/llhttpassetstorage.h
@@ -2,6 +2,8 @@
 * @file llhttpassetstorage.h
 * @brief Class for loading asset data to/from an external source over http.
 *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
 * Copyright (c) 2003-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$
 */
 #ifndef LLHTTPASSETSTORAGE_H
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index 4e844c3..7144f13 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -2,6 +2,8 @@
 * @file llhttpclient.cpp
 * @brief Implementation of classes for making HTTP requests.
 *
+ * $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$
 */
 #include "linden_common.h"
@@ -74,7 +77,7 @@ void LLHTTPClient::Responder::completedRaw(U32 status, const std::string& reason
        LLBufferStream istr(channels, buffer.get());
        LLSD content;
-        if (200 <= status && status < 300)
+        if (isGoodStatus(status))
        {
                LLSDSerialize::fromXML(content, istr);
 /*
@@ -93,7 +96,7 @@ void LLHTTPClient::Responder::completedRaw(U32 status, const std::string& reason
 // virtual
 void LLHTTPClient::Responder::completed(U32 status, const std::string& reason, const LLSD& content)
 {
-        if (200 <= status  &&  status < 300)
+        if(isGoodStatus(status))
        {
                result(content);
        }
diff --git a/linden/indra/llmessage/llhttpclient.h b/linden/indra/llmessage/llhttpclient.h
index 578b176..8c2309c 100644
--- a/linden/indra/llmessage/llhttpclient.h
+++ b/linden/indra/llmessage/llhttpclient.h
@@ -2,6 +2,8 @@
 * @file llhttpclient.h
 * @brief Declaration of classes for making HTTP client requests.
 *
+ * $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$
 */
 #ifndef LL_LLHTTPCLIENT_H
@@ -57,6 +60,14 @@ public:
                Responder();
                virtual ~Responder();
+                /**
+                 * @brief return true if the status code indicates success.
+                 */
+                static bool isGoodStatus(U32 status)
+                {
+                        return((200 <= status) && (status < 300));
+                }
                virtual void error(U32 status, const std::string& reason);      // called with bad status codes
                
                virtual void result(const LLSD& content);
diff --git a/linden/indra/llmessage/llhttpnode.cpp b/linden/indra/llmessage/llhttpnode.cpp
index 25413b4..1289b63 100644
--- a/linden/indra/llmessage/llhttpnode.cpp
+++ b/linden/indra/llmessage/llhttpnode.cpp
@@ -2,6 +2,8 @@
 * @file llhttpnode.cpp
 * @brief Implementation of classes for generic HTTP/LSL/REST handling.
 *
+ * $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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llhttpnode.h b/linden/indra/llmessage/llhttpnode.h
index db82296..a283a26 100644
--- a/linden/indra/llmessage/llhttpnode.h
+++ b/linden/indra/llmessage/llhttpnode.h
@@ -2,6 +2,8 @@
 * @file llhttpnode.h
 * @brief Declaration of classes for generic HTTP/LSL/REST handling.
 *
+ * $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$
 */
 #ifndef LL_LLHTTPNODE_H
diff --git a/linden/indra/llmessage/llhttpsender.cpp b/linden/indra/llmessage/llhttpsender.cpp
index 3796a52..096bc73 100644
--- a/linden/indra/llmessage/llhttpsender.cpp
+++ b/linden/indra/llmessage/llhttpsender.cpp
@@ -2,7 +2,9 @@
 * @file llhttpsender.cpp
 * @brief Abstracts details of sending messages via HTTP.
 *
- * 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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llhttpsender.h b/linden/indra/llmessage/llhttpsender.h
index 5d8b028..3a6cd68 100644
--- a/linden/indra/llmessage/llhttpsender.h
+++ b/linden/indra/llmessage/llhttpsender.h
@@ -2,7 +2,9 @@
 * @file llhttpsender.h
 * @brief Abstracts details of sending messages via HTTP.
 *
- * 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 LL_HTTP_SENDER_H
diff --git a/linden/indra/llmessage/llinstantmessage.cpp b/linden/indra/llmessage/llinstantmessage.cpp
index 0a3a1e6..04af44f 100644
--- a/linden/indra/llmessage/llinstantmessage.cpp
+++ b/linden/indra/llmessage/llinstantmessage.cpp
@@ -4,6 +4,8 @@
 * @date 2005-08-29
 * @brief Constants and functions used in IM.
 *
+ * $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/llmessage/llinstantmessage.h b/linden/indra/llmessage/llinstantmessage.h
index 45db037..abb1651 100644
--- a/linden/indra/llmessage/llinstantmessage.h
+++ b/linden/indra/llmessage/llinstantmessage.h
@@ -2,6 +2,8 @@
 * @file llinstantmessage.h
 * @brief Constants and declarations used by instant messages. 
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-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$
 */
 #ifndef LL_LLINSTANTMESSAGE_H
diff --git a/linden/indra/llmessage/llinvite.h b/linden/indra/llmessage/llinvite.h
index d3774c4..e9439de 100644
--- a/linden/indra/llmessage/llinvite.h
+++ b/linden/indra/llmessage/llinvite.h
@@ -2,6 +2,8 @@
 * @file llinvite.h
 * @brief Constants used for inviting users to join groups.
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-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$
 */
 #ifndef LL_LLINVITE_H
diff --git a/linden/indra/llmessage/lliobuffer.cpp b/linden/indra/llmessage/lliobuffer.cpp
index 7dea578..061e8f0 100644
--- a/linden/indra/llmessage/lliobuffer.cpp
+++ b/linden/indra/llmessage/lliobuffer.cpp
@@ -4,6 +4,8 @@
 * @date 2005-05-04
 * @brief Definition of buffer based implementations of IO Pipes.
 *
+ * $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/llmessage/lliobuffer.h b/linden/indra/llmessage/lliobuffer.h
index ac24576..14381ab 100644
--- a/linden/indra/llmessage/lliobuffer.h
+++ b/linden/indra/llmessage/lliobuffer.h
@@ -4,6 +4,8 @@
 * @date 2005-05-04
 * @brief Declaration of buffers for use in IO Pipes.
 *
+ * $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_LLIOBUFFER_H
diff --git a/linden/indra/llmessage/lliohttpserver.cpp b/linden/indra/llmessage/lliohttpserver.cpp
index 3c8010b..473eaea 100644
--- a/linden/indra/llmessage/lliohttpserver.cpp
+++ b/linden/indra/llmessage/lliohttpserver.cpp
@@ -4,6 +4,8 @@
 * @date 2005-10-05
 * @brief Implementation of the http server classes
 *
+ * $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/llmessage/lliohttpserver.h b/linden/indra/llmessage/lliohttpserver.h
index 8a6c8d4..bf61dae 100644
--- a/linden/indra/llmessage/lliohttpserver.h
+++ b/linden/indra/llmessage/lliohttpserver.h
@@ -3,6 +3,8 @@
 * @brief Declaration of function for creating an HTTP wire server
 * @see LLIOServerSocket, LLPumpIO
 *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
 * Copyright (c) 2005-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_LLIOHTTPSERVER_H
diff --git a/linden/indra/llmessage/lliopipe.cpp b/linden/indra/llmessage/lliopipe.cpp
index a37b046..8c0d01f 100644
--- a/linden/indra/llmessage/lliopipe.cpp
+++ b/linden/indra/llmessage/lliopipe.cpp
@@ -4,6 +4,8 @@
 * @date 2004-11-19
 * @brief Implementation of the LLIOPipe class
 *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
 * Copyright (c) 2004-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/llmessage/lliopipe.h b/linden/indra/llmessage/lliopipe.h
index 38a98a6..47924ee 100644
--- a/linden/indra/llmessage/lliopipe.h
+++ b/linden/indra/llmessage/lliopipe.h
@@ -4,6 +4,8 @@
 * @date 2004-11-18
 * @brief Declaration of base IO class
 *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
 * Copyright (c) 2004-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_LLIOPIPE_H
diff --git a/linden/indra/llmessage/lliosocket.cpp b/linden/indra/llmessage/lliosocket.cpp
index fdb4a89..920a5e4 100644
--- a/linden/indra/llmessage/lliosocket.cpp
+++ b/linden/indra/llmessage/lliosocket.cpp
@@ -4,6 +4,8 @@
 * @date 2005-07-31
 * @brief Sockets declarations for use with the io pipes
 *
+ * $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/llmessage/lliosocket.h b/linden/indra/llmessage/lliosocket.h
index 0f5eae8..586f489 100644
--- a/linden/indra/llmessage/lliosocket.h
+++ b/linden/indra/llmessage/lliosocket.h
@@ -4,6 +4,8 @@
 * @date 2005-07-31
 * @brief Declaration of files used for handling sockets and associated pipes
 *
+ * $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_LLIOSOCKET_H
diff --git a/linden/indra/llmessage/llioutil.cpp b/linden/indra/llmessage/llioutil.cpp
index 21e36fa..b00ec87 100644
--- a/linden/indra/llmessage/llioutil.cpp
+++ b/linden/indra/llmessage/llioutil.cpp
@@ -4,6 +4,8 @@
 * @date 2005-10-05
 * @brief Utility functionality for the io pipes.
 *
+ * $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/llmessage/llioutil.h b/linden/indra/llmessage/llioutil.h
index 27cd39a..e2f33a4 100644
--- a/linden/indra/llmessage/llioutil.h
+++ b/linden/indra/llmessage/llioutil.h
@@ -4,6 +4,8 @@
 * @date 2005-10-05
 * @brief Helper classes for dealing with IOPipes
 *
+ * $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_LLIOUTIL_H
diff --git a/linden/indra/llmessage/llloginflags.h b/linden/indra/llmessage/llloginflags.h
index 7725419..ab8228b 100644
--- a/linden/indra/llmessage/llloginflags.h
+++ b/linden/indra/llmessage/llloginflags.h
@@ -2,6 +2,8 @@
 * @file llloginflags.h
 * @brief Login flag constants.
 *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
 * Copyright (c) 2003-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$
 */
 #ifndef LL_LLLOGINFLAGS_H
diff --git a/linden/indra/llmessage/lllogtextmessage.cpp b/linden/indra/llmessage/lllogtextmessage.cpp
index 06c88b9..5a02860 100644
--- a/linden/indra/llmessage/lllogtextmessage.cpp
+++ b/linden/indra/llmessage/lllogtextmessage.cpp
@@ -4,6 +4,8 @@
 * @date 2005-01-12
 * @brief Impelmentation of the text logger.
 *
+ * $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/llmessage/lllogtextmessage.h b/linden/indra/llmessage/lllogtextmessage.h
index 89fb90c..a0a1509 100644
--- a/linden/indra/llmessage/lllogtextmessage.h
+++ b/linden/indra/llmessage/lllogtextmessage.h
@@ -5,6 +5,8 @@
 * @brief Declaration of class for coalescing text logs generated
 * from chat and IM
 *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
 * Copyright (c) 2005-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -27,6 +29,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_LLLOGTEXTMESSAGE_H
diff --git a/linden/indra/llmessage/llmail.cpp b/linden/indra/llmessage/llmail.cpp
index 633a2a3..ac0ee66 100644
--- a/linden/indra/llmessage/llmail.cpp
+++ b/linden/indra/llmessage/llmail.cpp
@@ -2,6 +2,8 @@
 * @file llmail.cpp
 * @brief smtp helper functions.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llmail.h b/linden/indra/llmessage/llmail.h
index 26aaa3a..2a88592 100644
--- a/linden/indra/llmessage/llmail.h
+++ b/linden/indra/llmessage/llmail.h
@@ -2,6 +2,8 @@
 * @file llmail.h
 * @brief smtp helper functions.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 #ifndef LL_LLMAIL_H
diff --git a/linden/indra/llmessage/llmessagebuilder.cpp b/linden/indra/llmessage/llmessagebuilder.cpp
index 364e417..cd0b07e 100644
--- a/linden/indra/llmessage/llmessagebuilder.cpp
+++ b/linden/indra/llmessage/llmessagebuilder.cpp
@@ -2,6 +2,8 @@
 * @file llmessagebuilder.cpp
 * @brief LLMessageBuilder class implementation
 *
+ * $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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llmessagebuilder.h b/linden/indra/llmessage/llmessagebuilder.h
index 5c231bd..c478c45 100644
--- a/linden/indra/llmessage/llmessagebuilder.h
+++ b/linden/indra/llmessage/llmessagebuilder.h
@@ -2,7 +2,9 @@
 * @file llmessagebuilder.h
 * @brief Declaration of LLMessageBuilder class.
 *
- * 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 LL_LLMESSAGEBUILDER_H
diff --git a/linden/indra/llmessage/llmessageconfig.cpp b/linden/indra/llmessage/llmessageconfig.cpp
index a619e80..78e22dd 100644
--- a/linden/indra/llmessage/llmessageconfig.cpp
+++ b/linden/indra/llmessage/llmessageconfig.cpp
@@ -2,6 +2,8 @@
 * @file llmessageconfig.cpp
 * @brief Live file handling for messaging
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-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$
 */
 #include "linden_common.h"
@@ -50,10 +53,10 @@ class LLMessageConfigFile : public LLLiveFile
 {
 public:
        LLMessageConfigFile()
-        : LLLiveFile(fileName(), messageConfigRefreshRate)
+        : LLLiveFile(filename(), messageConfigRefreshRate)
            { }
-    static std::string fileName();
+    static std::string filename();
    LLSD mMessages;
        std::string mServerDefault;
@@ -72,7 +75,7 @@ public:
        LLSD mCapBans;
 };
-std::string LLMessageConfigFile::fileName()
+std::string LLMessageConfigFile::filename()
 {
    std::ostringstream ostr;
        ostr << sConfigDir//gAppSimp->getOption("configdir").asString()
@@ -93,9 +96,10 @@ void LLMessageConfigFile::loadFile()
        LLSD data;
    {
        llifstream file(filename().c_str());
+        
        if (file.is_open())
        {
-                        llinfos << "Loading message.xml file at " << fileName() << llendl;
+                        llinfos << "Loading message.xml file at " << filename() << llendl;
            LLSDSerialize::fromXML(data, file);
        }
diff --git a/linden/indra/llmessage/llmessageconfig.h b/linden/indra/llmessage/llmessageconfig.h
index 86e7fb0..eb3113b 100644
--- a/linden/indra/llmessage/llmessageconfig.h
+++ b/linden/indra/llmessage/llmessageconfig.h
@@ -2,6 +2,8 @@
 * @file llmessageconfig.h
 * @brief Live file handling for messaging
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-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$
 */
 #ifndef LL_MESSAGECONFIG_H
diff --git a/linden/indra/llmessage/llmessagereader.cpp b/linden/indra/llmessage/llmessagereader.cpp
index 2679019..7ec4f56 100644
--- a/linden/indra/llmessage/llmessagereader.cpp
+++ b/linden/indra/llmessage/llmessagereader.cpp
@@ -2,7 +2,9 @@
 * @file llmessagereader.cpp
 * @brief LLMessageReader class implementation
 *
- * 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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llmessagereader.h b/linden/indra/llmessage/llmessagereader.h
index 9c1923a..4687191 100644
--- a/linden/indra/llmessage/llmessagereader.h
+++ b/linden/indra/llmessage/llmessagereader.h
@@ -2,7 +2,9 @@
 * @file llmessagereader.h
 * @brief Declaration of LLMessageReader class.
 *
- * 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 LL_LLMESSAGEREADER_H
diff --git a/linden/indra/llmessage/llmessagetemplate.cpp b/linden/indra/llmessage/llmessagetemplate.cpp
index daf7f7a..b6c5304 100644
--- a/linden/indra/llmessage/llmessagetemplate.cpp
+++ b/linden/indra/llmessage/llmessagetemplate.cpp
@@ -2,7 +2,9 @@
 * @file llmessagetemplate.cpp
 * @brief Implementation of message template classes.
 *
- * 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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llmessagetemplate.h b/linden/indra/llmessage/llmessagetemplate.h
index 804c343..5821474 100644
--- a/linden/indra/llmessage/llmessagetemplate.h
+++ b/linden/indra/llmessage/llmessagetemplate.h
@@ -2,7 +2,9 @@
 * @file llmessagetemplate.h
 * @brief Declaration of the message template classes.
 *
- * 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 LL_LLMESSAGETEMPLATE_H
diff --git a/linden/indra/llmessage/llmessagetemplateparser.cpp b/linden/indra/llmessage/llmessagetemplateparser.cpp
index 4c14ede..e8843c7 100644
--- a/linden/indra/llmessage/llmessagetemplateparser.cpp
+++ b/linden/indra/llmessage/llmessagetemplateparser.cpp
@@ -2,7 +2,9 @@
 * @file llmessagetemplateparser.cpp
 * @brief LLMessageTemplateParser implementation
 *
- * 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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llmessagetemplateparser.h b/linden/indra/llmessage/llmessagetemplateparser.h
index f56dfec..9a71184 100644
--- a/linden/indra/llmessage/llmessagetemplateparser.h
+++ b/linden/indra/llmessage/llmessagetemplateparser.h
@@ -2,6 +2,8 @@
 * @file llmessagetemplateparser.h
 * @brief Classes to parse message template.
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-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$
 */
 #ifndef LL_MESSAGETEMPLATEPARSER_H
diff --git a/linden/indra/llmessage/llmessagethrottle.cpp b/linden/indra/llmessage/llmessagethrottle.cpp
index bbaa9d8..c45feb2 100644
--- a/linden/indra/llmessage/llmessagethrottle.cpp
+++ b/linden/indra/llmessage/llmessagethrottle.cpp
@@ -2,6 +2,8 @@
 * @file llmessagethrottle.cpp
 * @brief LLMessageThrottle class used for throttling messages.
 *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
 * Copyright (c) 2004-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llmessagethrottle.h b/linden/indra/llmessage/llmessagethrottle.h
index 522358c..b43b5a0 100644
--- a/linden/indra/llmessage/llmessagethrottle.h
+++ b/linden/indra/llmessage/llmessagethrottle.h
@@ -2,6 +2,8 @@
 * @file llmessagethrottle.h
 * @brief LLMessageThrottle class used for throttling messages.
 *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
 * Copyright (c) 2004-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$
 */
 #ifndef LL_LLMESSAGETHROTTLE_H
diff --git a/linden/indra/llmessage/llmime.cpp b/linden/indra/llmessage/llmime.cpp
index 6938ed7..7d43f38 100644
--- a/linden/indra/llmessage/llmime.cpp
+++ b/linden/indra/llmessage/llmime.cpp
@@ -4,6 +4,8 @@
 * @date 2006-12-20
 * @brief Implementation of mime tools.
 *
+ * $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/llmessage/llmime.h b/linden/indra/llmessage/llmime.h
index 307a33d..0a7fa1d 100644
--- a/linden/indra/llmessage/llmime.h
+++ b/linden/indra/llmessage/llmime.h
@@ -4,6 +4,8 @@
 * @date 2006-12-20
 * @brief Declaration of mime tools.
 *
+ * $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$
 */
 #ifndef LL_LLMIME_H
diff --git a/linden/indra/llmessage/llmsgvariabletype.h b/linden/indra/llmessage/llmsgvariabletype.h
index 59fba7c..5ce171b 100644
--- a/linden/indra/llmessage/llmsgvariabletype.h
+++ b/linden/indra/llmessage/llmsgvariabletype.h
@@ -2,7 +2,9 @@
 * @file llmsgvariabletype.h
 * @brief Declaration of the EMsgVariableType enumeration.
 *
- * 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 LL_LLMSGVARIABLETYPE_H
diff --git a/linden/indra/llmessage/llnamevalue.cpp b/linden/indra/llmessage/llnamevalue.cpp
index a11bf97..932eeaa 100644
--- a/linden/indra/llmessage/llnamevalue.cpp
+++ b/linden/indra/llmessage/llnamevalue.cpp
@@ -2,6 +2,8 @@
 * @file llnamevalue.cpp
 * @brief class for defining name value pairs.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 // Examples:
diff --git a/linden/indra/llmessage/llnamevalue.h b/linden/indra/llmessage/llnamevalue.h
index 580c99d..1bdfeb2 100644
--- a/linden/indra/llmessage/llnamevalue.h
+++ b/linden/indra/llmessage/llnamevalue.h
@@ -2,6 +2,8 @@
 * @file llnamevalue.h
 * @brief class for defining name value pairs.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,18 +26,15 @@
 * 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_LLNAMEVALUE_H
 #define LL_LLNAMEVALUE_H
-#include <iostream>
-#include <string.h>
 #include "string_table.h"
 #include "llskipmap.h"
 #include "llmath.h"
-//#include "vmath.h"
 #include "v3math.h"
 #include "lldbstrings.h"
diff --git a/linden/indra/llmessage/llnullcipher.cpp b/linden/indra/llmessage/llnullcipher.cpp
index eddadeb..613e764 100644
--- a/linden/indra/llmessage/llnullcipher.cpp
+++ b/linden/indra/llmessage/llnullcipher.cpp
@@ -2,6 +2,8 @@
 * @file llnullcipher.cpp
 * @brief Implementation of a cipher which does not encrypt.
 *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
 * Copyright (c) 2003-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llnullcipher.h b/linden/indra/llmessage/llnullcipher.h
index 2e41063..a6dec02 100644
--- a/linden/indra/llmessage/llnullcipher.h
+++ b/linden/indra/llmessage/llnullcipher.h
@@ -1,6 +1,8 @@
 /** 
 * @file llnullcipher.h
 *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
 * Copyright (c) 2003-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -23,6 +25,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 LLNULLCIPHER_H
diff --git a/linden/indra/llmessage/llpacketack.cpp b/linden/indra/llmessage/llpacketack.cpp
index 27d9916..dbc7865 100644
--- a/linden/indra/llmessage/llpacketack.cpp
+++ b/linden/indra/llmessage/llpacketack.cpp
@@ -4,7 +4,9 @@
 * @date 2007-05-09
 * @brief Implementation of the LLReliablePacket.
 *
- * 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/llmessage/llpacketack.h b/linden/indra/llmessage/llpacketack.h
index 33fb5a0..a5b425c 100644
--- a/linden/indra/llmessage/llpacketack.h
+++ b/linden/indra/llmessage/llpacketack.h
@@ -2,6 +2,8 @@
 * @file llpacketack.h
 * @brief Reliable UDP helpers for the message system.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 #ifndef LL_LLPACKETACK_H
diff --git a/linden/indra/llmessage/llpacketbuffer.cpp b/linden/indra/llmessage/llpacketbuffer.cpp
index 525569d..cb71fcd 100644
--- a/linden/indra/llmessage/llpacketbuffer.cpp
+++ b/linden/indra/llmessage/llpacketbuffer.cpp
@@ -2,6 +2,8 @@
 * @file llpacketbuffer.cpp
 * @brief implementation of LLPacketBuffer class for a packet.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llpacketbuffer.h b/linden/indra/llmessage/llpacketbuffer.h
index 17fe446..1e57517 100644
--- a/linden/indra/llmessage/llpacketbuffer.h
+++ b/linden/indra/llmessage/llpacketbuffer.h
@@ -3,6 +3,8 @@
 * @brief definition of LLPacketBuffer class for implementing a
 * resend, drop, or delay in packet transmissions.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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_LLPACKETBUFFER_H
diff --git a/linden/indra/llmessage/llpacketring.cpp b/linden/indra/llmessage/llpacketring.cpp
index e07c754..48a02fe 100644
--- a/linden/indra/llmessage/llpacketring.cpp
+++ b/linden/indra/llmessage/llpacketring.cpp
@@ -2,6 +2,8 @@
 * @file llpacketring.cpp
 * @brief implementation of LLPacketRing class for a packet.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llpacketring.h b/linden/indra/llmessage/llpacketring.h
index 1a0c0c6..109d5e6 100644
--- a/linden/indra/llmessage/llpacketring.h
+++ b/linden/indra/llmessage/llpacketring.h
@@ -3,6 +3,8 @@
 * @brief definition of LLPacketRing class for implementing a resend,
 * drop, or delay in packet transmissions
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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_LLPACKETRING_H
diff --git a/linden/indra/llmessage/llpartdata.cpp b/linden/indra/llmessage/llpartdata.cpp
index f46481e..0e1dc4a 100644
--- a/linden/indra/llmessage/llpartdata.cpp
+++ b/linden/indra/llmessage/llpartdata.cpp
@@ -2,6 +2,8 @@
 * @file llpartdata.cpp
 * @brief Particle system data packing
 *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
 * Copyright (c) 2003-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llpartdata.h b/linden/indra/llmessage/llpartdata.h
index 3177e84..4220f5d 100644
--- a/linden/indra/llmessage/llpartdata.h
+++ b/linden/indra/llmessage/llpartdata.h
@@ -2,6 +2,8 @@
 * @file llpartdata.h
 * @brief Particle system data packing
 *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
 * Copyright (c) 2003-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,13 +26,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$
 */
 #ifndef LL_LLPARTDATA_H
 #define LL_LLPARTDATA_H
-#include <stdio.h>
 #include "lluuid.h"
 #include "v3math.h"
 #include "v3dmath.h"
diff --git a/linden/indra/llmessage/llpumpio.cpp b/linden/indra/llmessage/llpumpio.cpp
index e76f3ea..ea7c06f 100644
--- a/linden/indra/llmessage/llpumpio.cpp
+++ b/linden/indra/llmessage/llpumpio.cpp
@@ -4,6 +4,8 @@
 * @date 2004-11-21
 * @brief Implementation of the i/o pump and related functions.
 *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
 * Copyright (c) 2004-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"
@@ -684,8 +687,9 @@ void LLPumpIO::initialize(apr_pool_t* pool)
        LLMemType m1(LLMemType::MTYPE_IO_PUMP);
        if(!pool) return;
 #if LL_THREADS_APR
-        apr_thread_mutex_create(&mChainsMutex, APR_THREAD_MUTEX_DEFAULT, pool);
+        // SJB: Windows defaults to NESTED and OSX defaults to UNNESTED, so use UNNESTED explicitly.
-        apr_thread_mutex_create(&mCallbackMutex, APR_THREAD_MUTEX_DEFAULT, pool);
+        apr_thread_mutex_create(&mChainsMutex, APR_THREAD_MUTEX_UNNESTED, pool);
+        apr_thread_mutex_create(&mCallbackMutex, APR_THREAD_MUTEX_UNNESTED, pool);
 #endif
        mPool = pool;
 }
diff --git a/linden/indra/llmessage/llpumpio.h b/linden/indra/llmessage/llpumpio.h
index 0f2bd48..4d865a8 100644
--- a/linden/indra/llmessage/llpumpio.h
+++ b/linden/indra/llmessage/llpumpio.h
@@ -4,6 +4,8 @@
 * @date 2004-11-19
 * @brief Declaration of pump class which manages io chains.
 *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
 * Copyright (c) 2004-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_LLPUMPIO_H
diff --git a/linden/indra/llmessage/llqueryflags.h b/linden/indra/llmessage/llqueryflags.h
index 9143995..9b3074e 100644
--- a/linden/indra/llmessage/llqueryflags.h
+++ b/linden/indra/llmessage/llqueryflags.h
@@ -2,6 +2,8 @@
 * @file llqueryflags.h
 * @brief Flags for directory queries
 *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
 * Copyright (c) 2003-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$
 */
 #ifndef LL_LLQUERYFLAGS_H
diff --git a/linden/indra/llmessage/llregionflags.h b/linden/indra/llmessage/llregionflags.h
index 8702277..72272c0 100644
--- a/linden/indra/llmessage/llregionflags.h
+++ b/linden/indra/llmessage/llregionflags.h
@@ -2,6 +2,8 @@
 * @file llregionflags.h
 * @brief Flags that are sent in the statistics message region_flags field.
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-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$
 */
 #ifndef LL_LLREGIONFLAGS_H
@@ -90,6 +93,8 @@ const U32 REGION_FLAGS_ABUSE_EMAIL_TO_ESTATE_OWNER = (1 << 27);
 const U32 REGION_FLAGS_ALLOW_VOICE = (1 << 28);
+const U32 REGION_FLAGS_BLOCK_PARCEL_SEARCH = (1 << 29);
 const U32 REGION_FLAGS_DEFAULT = REGION_FLAGS_ALLOW_LANDMARK |
                                                                 REGION_FLAGS_ALLOW_SET_HOME |
@@ -179,3 +184,4 @@ const U32 SWD_SCRIPTED_ONLY			= (1 << 2);
 #endif
diff --git a/linden/indra/llmessage/llregionhandle.h b/linden/indra/llmessage/llregionhandle.h
index ad4cf61..d9fcd82 100644
--- a/linden/indra/llmessage/llregionhandle.h
+++ b/linden/indra/llmessage/llregionhandle.h
@@ -2,6 +2,8 @@
 * @file llregionhandle.h
 * @brief Routines for converting positions to/from region handles.
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,13 +26,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$
 */
 #ifndef LL_LLREGIONHANDLE_H
 #define LL_LLREGIONHANDLE_H
-#include <math.h>
 #include "indra_constants.h"
 #include "v3math.h"
 #include "v3dmath.h"
diff --git a/linden/indra/llmessage/llsdappservices.cpp b/linden/indra/llmessage/llsdappservices.cpp
index ae1505b..88588df 100644
--- a/linden/indra/llmessage/llsdappservices.cpp
+++ b/linden/indra/llmessage/llsdappservices.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 "linden_common.h"
diff --git a/linden/indra/llmessage/llsdappservices.h b/linden/indra/llmessage/llsdappservices.h
index 0075b2e..089687b 100644
--- a/linden/indra/llmessage/llsdappservices.h
+++ b/linden/indra/llmessage/llsdappservices.h
@@ -4,6 +4,8 @@
 * @date 2006-09-12
 * @brief Header file to declare the /app common web services.
 *
+ * $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$
 */
 #ifndef LL_LLSDAPPSERVICES_H
diff --git a/linden/indra/llmessage/llsdhttpserver.cpp b/linden/indra/llmessage/llsdhttpserver.cpp
index 8ca7f14..41bc503 100644
--- a/linden/indra/llmessage/llsdhttpserver.cpp
+++ b/linden/indra/llmessage/llsdhttpserver.cpp
@@ -2,6 +2,8 @@
 * @file llsdhttpserver.cpp
 * @brief Standard LLSD services
 *
+ * $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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llsdhttpserver.h b/linden/indra/llmessage/llsdhttpserver.h
index b6904f3..e0e8853 100644
--- a/linden/indra/llmessage/llsdhttpserver.h
+++ b/linden/indra/llmessage/llsdhttpserver.h
@@ -2,6 +2,8 @@
 * @file llsdhttpserver.h
 * @brief Standard LLSD services
 *
+ * $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$
 */
 #ifndef LL_LLSDHTTPSERVER_H
diff --git a/linden/indra/llmessage/llsdmessagebuilder.cpp b/linden/indra/llmessage/llsdmessagebuilder.cpp
index f8fb30e..43fe7d6 100755
--- a/linden/indra/llmessage/llsdmessagebuilder.cpp
+++ b/linden/indra/llmessage/llsdmessagebuilder.cpp
@@ -2,7 +2,9 @@
 * @file llsdmessagebuilder.cpp
 * @brief LLSDMessageBuilder class implementation.
 *
- * 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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llsdmessagebuilder.h b/linden/indra/llmessage/llsdmessagebuilder.h
index 8ea7763..4cdae36 100755
--- a/linden/indra/llmessage/llsdmessagebuilder.h
+++ b/linden/indra/llmessage/llsdmessagebuilder.h
@@ -2,7 +2,9 @@
 * @file llsdmessagebuilder.h
 * @brief Declaration of LLSDMessageBuilder class.
 *
- * 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 LL_LLSDMESSAGEBUILDER_H
diff --git a/linden/indra/llmessage/llsdmessagereader.cpp b/linden/indra/llmessage/llsdmessagereader.cpp
index 6742edb..e69c3e3 100755
--- a/linden/indra/llmessage/llsdmessagereader.cpp
+++ b/linden/indra/llmessage/llsdmessagereader.cpp
@@ -2,7 +2,9 @@
 * @file llsdmessagereader.cpp
 * @brief LLSDMessageReader class implementation.
 *
- * 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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llsdmessagereader.h b/linden/indra/llmessage/llsdmessagereader.h
index d6d9f3d..66ac1d1 100755
--- a/linden/indra/llmessage/llsdmessagereader.h
+++ b/linden/indra/llmessage/llsdmessagereader.h
@@ -1,3 +1,34 @@
+/** 
+ * @file llsdmessagereader.h
+ * @brief LLSDMessageReader class Declaration
+ *
+ * $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
+ * 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$
+ */
 #ifndef LL_LLSDMESSAGEREADER_H
 #define LL_LLSDMESSAGEREADER_H
diff --git a/linden/indra/llmessage/llsdrpcclient.cpp b/linden/indra/llmessage/llsdrpcclient.cpp
index 64d4b98..0a12c47 100644
--- a/linden/indra/llmessage/llsdrpcclient.cpp
+++ b/linden/indra/llmessage/llsdrpcclient.cpp
@@ -4,6 +4,8 @@
 * @date 2005-11-05
 * @brief Implementation of the llsd client classes.
 *
+ * $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/llmessage/llsdrpcclient.h b/linden/indra/llmessage/llsdrpcclient.h
index 52439b9..4511d10 100644
--- a/linden/indra/llmessage/llsdrpcclient.h
+++ b/linden/indra/llmessage/llsdrpcclient.h
@@ -4,6 +4,8 @@
 * @date 2005-11-05
 * @brief Implementation and helpers for structure data RPC clients.
 *
+ * $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_LLSDRPCCLIENT_H
diff --git a/linden/indra/llmessage/llsdrpcserver.cpp b/linden/indra/llmessage/llsdrpcserver.cpp
index ed37181..13ed791 100644
--- a/linden/indra/llmessage/llsdrpcserver.cpp
+++ b/linden/indra/llmessage/llsdrpcserver.cpp
@@ -4,6 +4,8 @@
 * @date 2005-10-11
 * @brief Implementation of the LLSDRPCServer and related classes.
 *
+ * $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/llmessage/llsdrpcserver.h b/linden/indra/llmessage/llsdrpcserver.h
index 4007d6e..92992aa 100644
--- a/linden/indra/llmessage/llsdrpcserver.h
+++ b/linden/indra/llmessage/llsdrpcserver.h
@@ -4,6 +4,8 @@
 * @date 2005-10-11
 * @brief Declaration of the structured data remote procedure call server.
 *
+ * $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_LLSDRPCSERVER_H
diff --git a/linden/indra/llmessage/llservice.cpp b/linden/indra/llmessage/llservice.cpp
index 052524d..daa21b1 100644
--- a/linden/indra/llmessage/llservice.cpp
+++ b/linden/indra/llmessage/llservice.cpp
@@ -3,6 +3,8 @@
 * @author Phoenix
 * @date 2005-04-20
 *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
 * Copyright (c) 2005-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/llmessage/llservice.h b/linden/indra/llmessage/llservice.h
index 5744f75..254b2d5 100644
--- a/linden/indra/llmessage/llservice.h
+++ b/linden/indra/llmessage/llservice.h
@@ -4,6 +4,8 @@
 * @date 2004-11-21
 * @brief Declaration file for LLService and related classes.
 *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
 * Copyright (c) 2004-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_LLSERVICE_H
diff --git a/linden/indra/llmessage/llservicebuilder.cpp b/linden/indra/llmessage/llservicebuilder.cpp
index 0b35a69..4fb3530 100644
--- a/linden/indra/llmessage/llservicebuilder.cpp
+++ b/linden/indra/llmessage/llservicebuilder.cpp
@@ -2,28 +2,31 @@
 * @file llservicebuilder.cpp
 * @brief Implementation of the LLServiceBuilder class.
 *
-* Copyright (c) 2007-2007, Linden Research, Inc.
+* $LicenseInfo:firstyear=2007&license=viewergpl$
 * 
- * Second Life Viewer Source Code
+* Copyright (c) 2007, Linden Research, Inc.
- * 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
+* Second Life Viewer Source Code
- * ("GPL"), unless you have obtained a separate licensing agreement
+* The source code in this file ("Source Code") is provided by Linden Lab
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
+* to you under the terms of the GNU General Public License, version 2.0
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
+* ("GPL"), unless you have obtained a separate licensing agreement
- * online at http://secondlife.com/developers/opensource/gplv2
+* ("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
- * There are special exceptions to the terms and conditions of the GPL as
+* online at http://secondlife.com/developers/opensource/gplv2
- * 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
+* There are special exceptions to the terms and conditions of the GPL as
- * online at http://secondlife.com/developers/opensource/flossexception
+* 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
- * By copying, modifying or distributing this software, you acknowledge
+* online at http://secondlife.com/developers/opensource/flossexception
- * that you have read and understood your obligations described above,
+* 
- * and agree to abide by those obligations.
+* By copying, modifying or distributing this software, you acknowledge
- * 
+* that you have read and understood your obligations described above,
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* and agree to abide by those obligations.
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* 
- * COMPLETENESS OR PERFORMANCE.
+* 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"
@@ -138,16 +141,19 @@ std::string LLServiceBuilder::buildServiceURI(
                        {
                                std::string query_str = LLURI::mapToQueryString(
                                        (*option_itr).second);
-                                if(!query_str.empty())
+                                service_url.replace(
-                                {
+                                        find_pos,
-                                        service_url.replace(
+                                        variable_name.length(),
-                                                find_pos,
+                                        query_str);
-                                                variable_name.length(),
-                                                query_str);
-                                }
                        }
                }
        }
+        if (service_url.find('{') != std::string::npos)
+        {
+                llwarns << "Constructed a likely bogus service URL: " << service_url
+                                << llendl;
+        }
        return service_url;
 }
diff --git a/linden/indra/llmessage/llservicebuilder.h b/linden/indra/llmessage/llservicebuilder.h
index 817ea0c..2c00660 100644
--- a/linden/indra/llmessage/llservicebuilder.h
+++ b/linden/indra/llmessage/llservicebuilder.h
@@ -2,28 +2,31 @@
 * @file llservicebuilder.h
 * @brief Declaration of the LLServiceBuilder class.
 *
-* Copyright (c) 2007-2007, Linden Research, Inc.
+* $LicenseInfo:firstyear=2007&license=viewergpl$
 * 
- * Second Life Viewer Source Code
+* Copyright (c) 2007, Linden Research, Inc.
- * 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
+* Second Life Viewer Source Code
- * ("GPL"), unless you have obtained a separate licensing agreement
+* The source code in this file ("Source Code") is provided by Linden Lab
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
+* to you under the terms of the GNU General Public License, version 2.0
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
+* ("GPL"), unless you have obtained a separate licensing agreement
- * online at http://secondlife.com/developers/opensource/gplv2
+* ("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
- * There are special exceptions to the terms and conditions of the GPL as
+* online at http://secondlife.com/developers/opensource/gplv2
- * 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
+* There are special exceptions to the terms and conditions of the GPL as
- * online at http://secondlife.com/developers/opensource/flossexception
+* 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
- * By copying, modifying or distributing this software, you acknowledge
+* online at http://secondlife.com/developers/opensource/flossexception
- * that you have read and understood your obligations described above,
+* 
- * and agree to abide by those obligations.
+* By copying, modifying or distributing this software, you acknowledge
- * 
+* that you have read and understood your obligations described above,
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+* and agree to abide by those obligations.
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+* 
- * COMPLETENESS OR PERFORMANCE.
+* 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 LLSERVICEBUILDER_H
diff --git a/linden/indra/llmessage/lltaskname.h b/linden/indra/llmessage/lltaskname.h
index ac4fbd5..d5bcfbd 100644
--- a/linden/indra/llmessage/lltaskname.h
+++ b/linden/indra/llmessage/lltaskname.h
@@ -3,6 +3,8 @@
 * @brief This contains the current list of valid tasks and is inluded
 * into both simulator and viewer
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-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_LLTASKNAME_H
diff --git a/linden/indra/llmessage/llteleportflags.h b/linden/indra/llmessage/llteleportflags.h
index a40b081..c08c905 100644
--- a/linden/indra/llmessage/llteleportflags.h
+++ b/linden/indra/llmessage/llteleportflags.h
@@ -2,6 +2,8 @@
 * @file llteleportflags.h
 * @brief Teleport flags
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-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$
 */
 #ifndef LL_LLTELEPORTFLAGS_H
diff --git a/linden/indra/llmessage/lltemplatemessagebuilder.cpp b/linden/indra/llmessage/lltemplatemessagebuilder.cpp
index 9473343..70c306c 100644
--- a/linden/indra/llmessage/lltemplatemessagebuilder.cpp
+++ b/linden/indra/llmessage/lltemplatemessagebuilder.cpp
@@ -2,7 +2,9 @@
 * @file lltemplatemessagebuilder.cpp
 * @brief LLTemplateMessageBuilder class implementation.
 *
- * 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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/lltemplatemessagebuilder.h b/linden/indra/llmessage/lltemplatemessagebuilder.h
index 40a2f0d..af4657c 100644
--- a/linden/indra/llmessage/lltemplatemessagebuilder.h
+++ b/linden/indra/llmessage/lltemplatemessagebuilder.h
@@ -2,7 +2,9 @@
 * @file lltemplatemessagebuilder.h
 * @brief Declaration of LLTemplateMessageBuilder class.
 *
- * 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 LL_LLTEMPLATEMESSAGEBUILDER_H
diff --git a/linden/indra/llmessage/lltemplatemessagereader.cpp b/linden/indra/llmessage/lltemplatemessagereader.cpp
index 4cde483..114c312 100644
--- a/linden/indra/llmessage/lltemplatemessagereader.cpp
+++ b/linden/indra/llmessage/lltemplatemessagereader.cpp
@@ -2,7 +2,9 @@
 * @file lltemplatemessagereader.cpp
 * @brief LLTemplateMessageReader class implementation.
 *
- * 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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/lltemplatemessagereader.h b/linden/indra/llmessage/lltemplatemessagereader.h
index 687b75b..42cd90e 100644
--- a/linden/indra/llmessage/lltemplatemessagereader.h
+++ b/linden/indra/llmessage/lltemplatemessagereader.h
@@ -2,7 +2,9 @@
 * @file lltemplatemessagereader.h
 * @brief Declaration of LLTemplateMessageReader class.
 *
- * 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 LL_LLTEMPLATEMESSAGEREADER_H
diff --git a/linden/indra/llmessage/llthrottle.cpp b/linden/indra/llmessage/llthrottle.cpp
index de80dd0..c6a819b 100644
--- a/linden/indra/llmessage/llthrottle.cpp
+++ b/linden/indra/llmessage/llthrottle.cpp
@@ -2,6 +2,8 @@
 * @file llthrottle.cpp
 * @brief LLThrottle class used for network bandwidth control.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llthrottle.h b/linden/indra/llmessage/llthrottle.h
index a87834b..a999510 100644
--- a/linden/indra/llmessage/llthrottle.h
+++ b/linden/indra/llmessage/llthrottle.h
@@ -2,6 +2,8 @@
 * @file llthrottle.h
 * @brief LLThrottle class used for network bandwidth control
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 #ifndef LL_LLTHROTTLE_H
diff --git a/linden/indra/llmessage/lltransfermanager.cpp b/linden/indra/llmessage/lltransfermanager.cpp
index 3de08c6..e80bc8c 100644
--- a/linden/indra/llmessage/lltransfermanager.cpp
+++ b/linden/indra/llmessage/lltransfermanager.cpp
@@ -3,6 +3,8 @@
 * @brief Improved transfer mechanism for moving data through the
 * message system.
 *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
 * Copyright (c) 2004-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/llmessage/lltransfermanager.h b/linden/indra/llmessage/lltransfermanager.h
index d063156..1813dd0 100644
--- a/linden/indra/llmessage/lltransfermanager.h
+++ b/linden/indra/llmessage/lltransfermanager.h
@@ -3,6 +3,8 @@
 * @brief Improved transfer mechanism for moving data through the
 * message system.
 *
+ * $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_LLTRANSFERMANAGER_H
diff --git a/linden/indra/llmessage/lltransfersourceasset.cpp b/linden/indra/llmessage/lltransfersourceasset.cpp
index cfc7561..941c77e 100644
--- a/linden/indra/llmessage/lltransfersourceasset.cpp
+++ b/linden/indra/llmessage/lltransfersourceasset.cpp
@@ -2,6 +2,8 @@
 * @file lltransfersourceasset.cpp
 * @brief Transfer system for sending an asset.
 *
+ * $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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/lltransfersourceasset.h b/linden/indra/llmessage/lltransfersourceasset.h
index b953f78..4a15d5e 100644
--- a/linden/indra/llmessage/lltransfersourceasset.h
+++ b/linden/indra/llmessage/lltransfersourceasset.h
@@ -2,6 +2,8 @@
 * @file lltransfersourceasset.h
 * @brief Transfer system for sending an asset.
 *
+ * $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$
 */
 #ifndef LL_LLTRANSFERSOURCEASSET_H
diff --git a/linden/indra/llmessage/lltransfersourcefile.cpp b/linden/indra/llmessage/lltransfersourcefile.cpp
index 392349e..abbef1c 100644
--- a/linden/indra/llmessage/lltransfersourcefile.cpp
+++ b/linden/indra/llmessage/lltransfersourcefile.cpp
@@ -2,6 +2,8 @@
 * @file lltransfersourcefile.cpp
 * @brief Transfer system for sending a file.
 *
+ * $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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/lltransfersourcefile.h b/linden/indra/llmessage/lltransfersourcefile.h
index 21661b5..c3523b1 100644
--- a/linden/indra/llmessage/lltransfersourcefile.h
+++ b/linden/indra/llmessage/lltransfersourcefile.h
@@ -2,6 +2,8 @@
 * @file lltransfersourcefile.h
 * @brief Transfer system for sending a file.
 *
+ * $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$
 */
 #ifndef LL_LLTRANSFERSOURCEFILE_H
@@ -31,8 +34,6 @@
 #include "lltransfermanager.h"
-#include <stdio.h>
 class LLTransferSourceParamsFile : public LLTransferSourceParams
 {
 public:
diff --git a/linden/indra/llmessage/lltransfertargetfile.cpp b/linden/indra/llmessage/lltransfertargetfile.cpp
index 00af3ff..d05f808 100644
--- a/linden/indra/llmessage/lltransfertargetfile.cpp
+++ b/linden/indra/llmessage/lltransfertargetfile.cpp
@@ -2,6 +2,8 @@
 * @file lltransfertargetfile.cpp
 * @brief Transfer system for receiving a file.
 *
+ * $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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/lltransfertargetfile.h b/linden/indra/llmessage/lltransfertargetfile.h
index 50d617f..18b44e2 100644
--- a/linden/indra/llmessage/lltransfertargetfile.h
+++ b/linden/indra/llmessage/lltransfertargetfile.h
@@ -2,6 +2,8 @@
 * @file lltransfertargetfile.h
 * @brief Transfer system for receiving a file.
 *
+ * $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$
 */
 #ifndef LL_LLTRANSFERTARGETFILE_H
@@ -31,15 +34,13 @@
 #include "lltransfermanager.h"
-#include <stdio.h>
 typedef void (*LLTTFCompleteCallback)(const LLTSCode status, void *user_data);
 class LLTransferTargetParamsFile : public LLTransferTargetParams
 {
 public:
        LLTransferTargetParamsFile() : LLTransferTargetParams(LLTTT_FILE) {}
-        void setFilename(const char *filename)                  { mFilename = filename; }
+        void setFilename(const LLString& filename)      { mFilename = filename; }
        void setCallback(LLTTFCompleteCallback cb, void *user_data)             { mCompleteCallback = cb; mUserData = user_data; }
        friend class LLTransferTargetFile;
diff --git a/linden/indra/llmessage/lltransfertargetvfile.cpp b/linden/indra/llmessage/lltransfertargetvfile.cpp
index 6f2252d..4be0b65 100644
--- a/linden/indra/llmessage/lltransfertargetvfile.cpp
+++ b/linden/indra/llmessage/lltransfertargetvfile.cpp
@@ -2,6 +2,8 @@
 * @file lltransfertargetvfile.cpp
 * @brief Transfer system for receiving a vfile.
 *
+ * $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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/lltransfertargetvfile.h b/linden/indra/llmessage/lltransfertargetvfile.h
index 98fcbc9..041b7ea 100644
--- a/linden/indra/llmessage/lltransfertargetvfile.h
+++ b/linden/indra/llmessage/lltransfertargetvfile.h
@@ -2,6 +2,8 @@
 * @file lltransfertargetvfile.h
 * @brief Transfer system for receiving a vfile.
 *
+ * $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$
 */
 #ifndef LL_LLTRANSFERTARGETVFILE_H
diff --git a/linden/indra/llmessage/llurlrequest.cpp b/linden/indra/llmessage/llurlrequest.cpp
index 00c0577..857f804 100644
--- a/linden/indra/llmessage/llurlrequest.cpp
+++ b/linden/indra/llmessage/llurlrequest.cpp
@@ -4,6 +4,8 @@
 * @date 2005-04-28
 * @brief Implementation of the URLRequest class and related classes.
 *
+ * $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/llmessage/llurlrequest.h b/linden/indra/llmessage/llurlrequest.h
index 8aa1788..f335316 100644
--- a/linden/indra/llmessage/llurlrequest.h
+++ b/linden/indra/llmessage/llurlrequest.h
@@ -4,6 +4,8 @@
 * @date 2005-04-21
 * @brief Declaration of url based requests on pipes.
 *
+ * $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_LLURLREQUEST_H
diff --git a/linden/indra/llmessage/lluseroperation.cpp b/linden/indra/llmessage/lluseroperation.cpp
index f43e02a..9ba70cc 100644
--- a/linden/indra/llmessage/lluseroperation.cpp
+++ b/linden/indra/llmessage/lluseroperation.cpp
@@ -2,6 +2,8 @@
 * @file lluseroperation.cpp
 * @brief LLUserOperation class definition.
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/lluseroperation.h b/linden/indra/llmessage/lluseroperation.h
index 6ac2862..5006809 100644
--- a/linden/indra/llmessage/lluseroperation.h
+++ b/linden/indra/llmessage/lluseroperation.h
@@ -3,6 +3,8 @@
 * @brief LLUserOperation class header file - used for message based
 * transaction. For example, L$ transactions.
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-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_LLUSEROPERATION_H
diff --git a/linden/indra/llmessage/llvehicleparams.h b/linden/indra/llmessage/llvehicleparams.h
index 946f88c..bfc2a4a 100644
--- a/linden/indra/llmessage/llvehicleparams.h
+++ b/linden/indra/llmessage/llvehicleparams.h
@@ -3,6 +3,8 @@
 * @brief For parameter names that must be shared between the
 * scripting language and the LLVehicleAction class on the simulator.
 *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
 * Copyright (c) 2003-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_VEHICLE_PARAMS_H
diff --git a/linden/indra/llmessage/llxfer.cpp b/linden/indra/llmessage/llxfer.cpp
index 4647980..fefb6f9 100644
--- a/linden/indra/llmessage/llxfer.cpp
+++ b/linden/indra/llmessage/llxfer.cpp
@@ -2,6 +2,8 @@
 * @file llxfer.cpp
 * @brief implementation of LLXfer class for a single xfer.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llxfer.h b/linden/indra/llmessage/llxfer.h
index de93dba..017a521 100644
--- a/linden/indra/llmessage/llxfer.h
+++ b/linden/indra/llmessage/llxfer.h
@@ -2,6 +2,8 @@
 * @file llxfer.h
 * @brief definition of LLXfer class for a single xfer
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 #ifndef LL_LLXFER_H
diff --git a/linden/indra/llmessage/llxfer_file.cpp b/linden/indra/llmessage/llxfer_file.cpp
index 7478316..caa418e 100644
--- a/linden/indra/llmessage/llxfer_file.cpp
+++ b/linden/indra/llmessage/llxfer_file.cpp
@@ -2,6 +2,8 @@
 * @file llxfer_file.cpp
 * @brief implementation of LLXfer_File class for a single xfer (file)
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llxfer_file.h b/linden/indra/llmessage/llxfer_file.h
index 4d34acb..b87417d 100644
--- a/linden/indra/llmessage/llxfer_file.h
+++ b/linden/indra/llmessage/llxfer_file.h
@@ -2,6 +2,8 @@
 * @file llxfer_file.h
 * @brief definition of LLXfer_File class for a single xfer_file.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,13 +26,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$
 */
 #ifndef LL_LLXFER_FILE_H
 #define LL_LLXFER_FILE_H
-#include <stdio.h>
 #include "llxfer.h"
 #include "lldir.h"
diff --git a/linden/indra/llmessage/llxfer_mem.cpp b/linden/indra/llmessage/llxfer_mem.cpp
index 223ce08..4c3b1bb 100644
--- a/linden/indra/llmessage/llxfer_mem.cpp
+++ b/linden/indra/llmessage/llxfer_mem.cpp
@@ -2,6 +2,8 @@
 * @file llxfer_mem.cpp
 * @brief implementation of LLXfer_Mem class for a single xfer
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llxfer_mem.h b/linden/indra/llmessage/llxfer_mem.h
index 8523c7d..858b8d1 100644
--- a/linden/indra/llmessage/llxfer_mem.h
+++ b/linden/indra/llmessage/llxfer_mem.h
@@ -2,6 +2,8 @@
 * @file llxfer_mem.h
 * @brief definition of LLXfer_Mem class for a single xfer
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,13 +26,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$
 */
 #ifndef LL_LLXFER_MEM_H
 #define LL_LLXFER_MEM_H
-#include <stdio.h>
 #include "message.h"
 #include "lltimer.h"
 #include "llxfer.h"
diff --git a/linden/indra/llmessage/llxfer_vfile.cpp b/linden/indra/llmessage/llxfer_vfile.cpp
index 54b9683..b870e53 100644
--- a/linden/indra/llmessage/llxfer_vfile.cpp
+++ b/linden/indra/llmessage/llxfer_vfile.cpp
@@ -2,6 +2,8 @@
 * @file llxfer_vfile.cpp
 * @brief implementation of LLXfer_VFile class for a single xfer (vfile).
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llxfer_vfile.h b/linden/indra/llmessage/llxfer_vfile.h
index 1362749..5d57b08 100644
--- a/linden/indra/llmessage/llxfer_vfile.h
+++ b/linden/indra/llmessage/llxfer_vfile.h
@@ -2,6 +2,8 @@
 * @file llxfer_vfile.h
 * @brief definition of LLXfer_VFile class for a single xfer_vfile.
 *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
 * Copyright (c) 2002-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,13 +26,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$
 */
 #ifndef LL_LLXFER_VFILE_H
 #define LL_LLXFER_VFILE_H
-#include <stdio.h>
 #include "llxfer.h"
 #include "llassetstorage.h"
diff --git a/linden/indra/llmessage/llxfermanager.cpp b/linden/indra/llmessage/llxfermanager.cpp
index b9a2c3e..c4dd340 100644
--- a/linden/indra/llmessage/llxfermanager.cpp
+++ b/linden/indra/llmessage/llxfermanager.cpp
@@ -2,6 +2,8 @@
 * @file llxfermanager.cpp
 * @brief implementation of LLXferManager class for a collection of xfers
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llxfermanager.h b/linden/indra/llmessage/llxfermanager.h
index 62969d9..5d213bb 100644
--- a/linden/indra/llmessage/llxfermanager.h
+++ b/linden/indra/llmessage/llxfermanager.h
@@ -3,6 +3,8 @@
 * @brief definition of LLXferManager class for a keeping track of
 * multiple xfers
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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_LLXFERMANAGER_H
diff --git a/linden/indra/llmessage/llxorcipher.cpp b/linden/indra/llmessage/llxorcipher.cpp
index 042fbd4..c659d3f 100644
--- a/linden/indra/llmessage/llxorcipher.cpp
+++ b/linden/indra/llmessage/llxorcipher.cpp
@@ -2,6 +2,8 @@
 * @file llxorcipher.cpp
 * @brief Implementation of LLXORCipher
 *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
 * Copyright (c) 2003-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/llxorcipher.h b/linden/indra/llmessage/llxorcipher.h
index 16579a6..4c7a846 100644
--- a/linden/indra/llmessage/llxorcipher.h
+++ b/linden/indra/llmessage/llxorcipher.h
@@ -1,6 +1,8 @@
 /** 
 * @file llxorcipher.h
 *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
 * Copyright (c) 2003-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -23,6 +25,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 LLXORCIPHER_H
diff --git a/linden/indra/llmessage/machine.h b/linden/indra/llmessage/machine.h
index b28e621..b210250 100644
--- a/linden/indra/llmessage/machine.h
+++ b/linden/indra/llmessage/machine.h
@@ -2,6 +2,8 @@
 * @file machine.h
 * @brief LLMachine class header file
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 #ifndef LL_MACHINE_H
diff --git a/linden/indra/llmessage/mean_collision_data.h b/linden/indra/llmessage/mean_collision_data.h
index a319640..1643c30 100644
--- a/linden/indra/llmessage/mean_collision_data.h
+++ b/linden/indra/llmessage/mean_collision_data.h
@@ -3,6 +3,8 @@
 * @brief data type to log interactions between stuff and agents that
 * might be community standards violations
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -25,13 +27,14 @@
 * 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_MEAN_COLLISIONS_DATA_H
 #define LL_MEAN_COLLISIONS_DATA_H
-#include <time.h>
 #include "lldbstrings.h"
+#include "lluuid.h"
 const F32 MEAN_COLLISION_TIMEOUT = 5.f;
 const S32 MAX_MEAN_COLLISIONS = 5;
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index 70b8166..e2cd19b 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -2,6 +2,8 @@
 * @file message.cpp
 * @brief LLMessageSystem class implementation
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 #include "linden_common.h"
@@ -38,10 +41,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <cstring>
-#include <time.h>
 #include <iomanip>
 #include <iterator>
 #include <sstream>
@@ -375,8 +374,8 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
                return;
        }
-        LLString template_body;
+        std::string template_body;
-        if(!LLString::read(template_body, filename))
+        if(!_read_file_into_string(template_body, filename))
        {
                llwarns << "Failed to open template: " << filename << llendl;
                mbError = TRUE;
@@ -1155,9 +1154,11 @@ LLHTTPClient::ResponderPtr LLMessageSystem::createResponder(const std::string& n
        }
        else
        {
-                llwarns << "LLMessageSystem::sendMessage: Sending unreliable "
+                // These messages aren't really unreliable, they just weren't
-                                << mMessageBuilder->getMessageName() << " message via HTTP"
+                // explicitly sent as reliable, so they don't have a callback
-                                << llendl;
+//              llwarns << "LLMessageSystem::sendMessage: Sending unreliable "
+//                              << mMessageBuilder->getMessageName() << " message via HTTP"
+//                              << llendl;
                return new LLFnPtrResponder(NULL, NULL,
                                                                        mMessageBuilder->getMessageName());
        }
@@ -2403,8 +2404,8 @@ void dump_prehash_files()
                        " * @file message_prehash.h\n"
                        " * @brief header file of externs of prehashed variables plus defines.\n"
                        " *\n"
-                        " * Copyright (c) 2003-$CurrentYear$, Linden Research, Inc.\n"
+                        " * $LicenseInfo:firstyear=2003&license=viewergpl$"
-                        " * $License$\n"
+                        " * $/LicenseInfo$"
                        " */\n\n"
                        "#ifndef LL_MESSAGE_PREHASH_H\n#define LL_MESSAGE_PREHASH_H\n\n");
                fprintf(
@@ -2435,8 +2436,8 @@ void dump_prehash_files()
                        " * @file message_prehash.cpp\n"
                        " * @brief file of prehashed variables\n"
                        " *\n"
-                        " * Copyright (c) 2003-$CurrentYear$, Linden Research, Inc.\n"
+                        " * $LicenseInfo:firstyear=2003&license=viewergpl$"
-                        " * $License$\n"
+                        " * $/LicenseInfo$"
                        " */\n\n"
                        "/**\n"
                        " * Generated from message template version number %.3f\n"
diff --git a/linden/indra/llmessage/message.h b/linden/indra/llmessage/message.h
index d18bd09..4454b40 100644
--- a/linden/indra/llmessage/message.h
+++ b/linden/indra/llmessage/message.h
@@ -2,6 +2,8 @@
 * @file message.h
 * @brief LLMessageSystem class header file
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,14 +26,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$
 */
 #ifndef LL_MESSAGE_H
 #define LL_MESSAGE_H
 #include <cstring>
-#include <stdio.h>
-#include <map>
 #include <set>
 #if LL_LINUX
diff --git a/linden/indra/llmessage/message_prehash.cpp b/linden/indra/llmessage/message_prehash.cpp
index ce532e1..0185c0f 100644
--- a/linden/indra/llmessage/message_prehash.cpp
+++ b/linden/indra/llmessage/message_prehash.cpp
@@ -2,6 +2,8 @@
 * @file message_prehash.cpp
 * @brief file of prehashed variables
 *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
 * Copyright (c) 2003-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/llmessage/message_prehash.h b/linden/indra/llmessage/message_prehash.h
index 672cd14..2cea924 100644
--- a/linden/indra/llmessage/message_prehash.h
+++ b/linden/indra/llmessage/message_prehash.h
@@ -2,6 +2,8 @@
 * @file message_prehash.h
 * @brief header file of externs of prehashed variables plus defines.
 *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
 * Copyright (c) 2003-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$
 */
 #ifndef LL_MESSAGE_PREHASH_H
diff --git a/linden/indra/llmessage/message_string_table.cpp b/linden/indra/llmessage/message_string_table.cpp
index 2ae269b..bc44239 100644
--- a/linden/indra/llmessage/message_string_table.cpp
+++ b/linden/indra/llmessage/message_string_table.cpp
@@ -2,6 +2,8 @@
 * @file message_string_table.cpp
 * @brief static string table for message template
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/net.cpp b/linden/indra/llmessage/net.cpp
index 92efd15..50b3414 100644
--- a/linden/indra/llmessage/net.cpp
+++ b/linden/indra/llmessage/net.cpp
@@ -2,6 +2,8 @@
 * @file net.cpp
 * @brief Cross-platform routines for sending and receiving packets.
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-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$
 */
 #include "linden_common.h"
@@ -32,7 +35,6 @@
 // system library includes
 #include <stdexcept>
-#include <stdio.h>
 #if LL_WINDOWS
        #define WIN32_LEAN_AND_MEAN
diff --git a/linden/indra/llmessage/net.h b/linden/indra/llmessage/net.h
index cfc1f88..b6fa48d 100644
--- a/linden/indra/llmessage/net.h
+++ b/linden/indra/llmessage/net.h
@@ -2,6 +2,8 @@
 * @file net.h
 * @brief Cross platform UDP network code.
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-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$
 */
 #ifndef LL_NET_H                                        
diff --git a/linden/indra/llmessage/network.cpp b/linden/indra/llmessage/network.cpp
index 03aad63..ab3df02 100644
--- a/linden/indra/llmessage/network.cpp
+++ b/linden/indra/llmessage/network.cpp
@@ -2,6 +2,8 @@
 * @file network.cpp
 * @brief Legacy file
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,5 +26,6 @@
 * 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/llmessage/network.h b/linden/indra/llmessage/network.h
index 6c6577b..8a1111d 100644
--- a/linden/indra/llmessage/network.h
+++ b/linden/indra/llmessage/network.h
@@ -2,6 +2,8 @@
 * @file network.h
 * @brief Legacy file.
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-2007, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
@@ -24,5 +26,6 @@
 * 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/llmessage/partsyspacket.cpp b/linden/indra/llmessage/partsyspacket.cpp
index 4750faa..d27c069 100644
--- a/linden/indra/llmessage/partsyspacket.cpp
+++ b/linden/indra/llmessage/partsyspacket.cpp
@@ -3,6 +3,8 @@
 * @brief Object for packing particle system initialization parameters
 * before sending them over the network.
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-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/llmessage/partsyspacket.h b/linden/indra/llmessage/partsyspacket.h
index 5dbc41c..c7d001c 100644
--- a/linden/indra/llmessage/partsyspacket.h
+++ b/linden/indra/llmessage/partsyspacket.h
@@ -3,6 +3,8 @@
 * @brief Object for packing particle system initialization parameters
 * before sending them over the network
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-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_PARTSYSPACKET_H
diff --git a/linden/indra/llmessage/patch_code.cpp b/linden/indra/llmessage/patch_code.cpp
index c996899..cea8635 100644
--- a/linden/indra/llmessage/patch_code.cpp
+++ b/linden/indra/llmessage/patch_code.cpp
@@ -2,6 +2,8 @@
 * @file patch_code.cpp
 * @brief Encode patch DCT data into bitcode.
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/patch_code.h b/linden/indra/llmessage/patch_code.h
index ba3dea4..f8ee39c 100644
--- a/linden/indra/llmessage/patch_code.h
+++ b/linden/indra/llmessage/patch_code.h
@@ -2,6 +2,8 @@
 * @file patch_code.h
 * @brief Function declarations for encoding and decoding patches.
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-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$
 */
 #ifndef LL_PATCH_CODE_H
diff --git a/linden/indra/llmessage/patch_dct.cpp b/linden/indra/llmessage/patch_dct.cpp
index 0e8aa25..69f6a2d 100644
--- a/linden/indra/llmessage/patch_dct.cpp
+++ b/linden/indra/llmessage/patch_dct.cpp
@@ -2,6 +2,8 @@
 * @file patch_dct.cpp
 * @brief DCT patch.
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/patch_dct.h b/linden/indra/llmessage/patch_dct.h
index b69249e..b6e7ba4 100644
--- a/linden/indra/llmessage/patch_dct.h
+++ b/linden/indra/llmessage/patch_dct.h
@@ -2,6 +2,8 @@
 * @file patch_dct.h
 * @brief Function declarations for DCT and IDCT routines
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-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$
 */
 #ifndef LL_PATCH_DCT_H
diff --git a/linden/indra/llmessage/patch_idct.cpp b/linden/indra/llmessage/patch_idct.cpp
index 680003a..61c10bd 100644
--- a/linden/indra/llmessage/patch_idct.cpp
+++ b/linden/indra/llmessage/patch_idct.cpp
@@ -2,6 +2,8 @@
 * @file patch_idct.cpp
 * @brief IDCT patch.
 *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
 * Copyright (c) 2000-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$
 */
 #include "linden_common.h"
diff --git a/linden/indra/llmessage/sound_ids.h b/linden/indra/llmessage/sound_ids.h
index 2652778..a8efdae 100644
--- a/linden/indra/llmessage/sound_ids.h
+++ b/linden/indra/llmessage/sound_ids.h
@@ -2,6 +2,8 @@
 * @file sound_ids.h
 * @brief Temporary holder for sound IDs.
 *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
 * Copyright (c) 2001-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$
 */
 #ifndef LL_SOUND_IDS_H