Second Life viewer sources 1.18.4.0-RC

149 files changed, 2048 insertions, 162 deletions

diff --git a/linden/indra/llcommon/bitpack.h b/linden/indra/llcommon/bitpack.h
index 89af101..1a382ff 100644
--- a/linden/indra/llcommon/bitpack.h
+++ b/linden/indra/llcommon/bitpack.h
@@ -2,6 +2,8 @@
  * @file bitpack.h
  * @brief Convert data to packed bit stream
  *
+ * $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_BITPACK_H
diff --git a/linden/indra/llcommon/ctype_workaround.h b/linden/indra/llcommon/ctype_workaround.h
index 20dd6c6..7c730d9 100644
--- a/linden/indra/llcommon/ctype_workaround.h
+++ b/linden/indra/llcommon/ctype_workaround.h
@@ -3,6 +3,8 @@
  * @brief The workaround is to create some legacy symbols that point
  * to the correct symbols, which avoids link errors.
  *
+ * $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 _CTYPE_WORKAROUND_H_
@@ -38,7 +41,7 @@
  * -- Leviathan 20060113
 */
 
-#include <ctype.h>
+#include <cctype>
 
 __const unsigned short int *__ctype_b;
 __const __int32_t *__ctype_tolower;
diff --git a/linden/indra/llcommon/doublelinkedlist.h b/linden/indra/llcommon/doublelinkedlist.h
index 81891b3..11cfb48 100644
--- a/linden/indra/llcommon/doublelinkedlist.h
+++ b/linden/indra/llcommon/doublelinkedlist.h
@@ -2,6 +2,8 @@
  * @file doublelinkedlist.h
  * @brief Provides a standard doubly linked list for fun and profit.
  *
+ * $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_DOUBLELINKEDLIST_H
diff --git a/linden/indra/llcommon/files.lst b/linden/indra/llcommon/files.lst
index 0474cbb..f7bf5e3 100644
--- a/linden/indra/llcommon/files.lst
+++ b/linden/indra/llcommon/files.lst
@@ -1,5 +1,6 @@
 llcommon/llapp.cpp
 llcommon/llapr.cpp
+llcommon/llares.cpp
 llcommon/llassettype.cpp
 llcommon/llbase32.cpp
 llcommon/llbase64.cpp
diff --git a/linden/indra/llcommon/imageids.h b/linden/indra/llcommon/imageids.h
index 5c6ff08..cc7c70e 100644
--- a/linden/indra/llcommon/imageids.h
+++ b/linden/indra/llcommon/imageids.h
@@ -2,6 +2,8 @@
  * @file imageids.h
  * @brief Temporary holder for image 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_IMAGEIDS_H
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index bd591c5..b7d3578 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -2,6 +2,8 @@
  * @file indra_constants.h
  * @brief some useful short term constants for Indra
  *
+ * $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_INDRA_CONSTANTS_H
diff --git a/linden/indra/llcommon/linden_common.h b/linden/indra/llcommon/linden_common.h
index 24a346c..39ee014 100644
--- a/linden/indra/llcommon/linden_common.h
+++ b/linden/indra/llcommon/linden_common.h
@@ -2,6 +2,8 @@
  * @file linden_common.h
  * @brief Includes common headers that are always safe to include
  *
+ * $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_LINDEN_COMMON_H
@@ -31,34 +34,42 @@
 
 #include "llpreprocessor.h"
 
-#include <string.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cfloat>
+#include <climits>
+#include <cmath>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
+#include <iostream>
+#include <fstream>
 
 // Work around stupid Microsoft STL warning
 #ifdef LL_WINDOWS
 #pragma warning (disable : 4702) // warning C4702: unreachable code
 #endif  //      LL_WINDOWS
 
-#include <iostream>
-#include <fstream>
+#include <algorithm>
+#include <list>
+#include <map>
 #include <vector>
 #include <string>
-#include "llfile.h"
 
+#ifdef LL_WINDOWS
+#pragma warning (3 : 4702) // we like level 3, not 4
+#endif  //      LL_WINDOWS
+
+// Linden only libs in alpha-order other than stdtypes.h
 #include "stdtypes.h"
 #include "lldefs.h"
 #include "llerror.h"
 #include "llextendedstatus.h"
+#include "llfasttimer.h"
+#include "llfile.h"
 #include "llformat.h"
 #include "llstring.h"
-#include "lltimer.h"
-#include "llfasttimer.h"
 #include "llsys.h"
-
-#ifdef LL_WINDOWS
-#pragma warning (3 : 4702) // we like level 3, not 4
-#endif  //      LL_WINDOWS
+#include "lltimer.h"
 
 #endif
diff --git a/linden/indra/llcommon/linked_lists.h b/linden/indra/llcommon/linked_lists.h
index ab4a622..0162a07 100644
--- a/linden/indra/llcommon/linked_lists.h
+++ b/linden/indra/llcommon/linked_lists.h
@@ -2,6 +2,8 @@
  * @file linked_lists.h
  * @brief LLLinkedList class header amd implementation 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_LINKED_LISTS_H
diff --git a/linden/indra/llcommon/llagentconstants.h b/linden/indra/llcommon/llagentconstants.h
index 0e0fdb0..2989d6d 100644
--- a/linden/indra/llcommon/llagentconstants.h
+++ b/linden/indra/llcommon/llagentconstants.h
@@ -3,6 +3,8 @@
  * @author James Cook, Andrew Meadows, Richard Nelson
  * @brief Shared constants through the system for agents.
  *
+ * $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_LLAGENTCONSTANTS_H
diff --git a/linden/indra/llcommon/llapp.cpp b/linden/indra/llcommon/llapp.cpp
index 5edcb3c..b0751b8 100644
--- a/linden/indra/llcommon/llapp.cpp
+++ b/linden/indra/llcommon/llapp.cpp
@@ -2,6 +2,8 @@
  * @file llapp.cpp
  * @brief Implementation of the LLApp class.
  *
+ * $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/llcommon/llapp.h b/linden/indra/llcommon/llapp.h
index 599bd48..d64af62 100644
--- a/linden/indra/llcommon/llapp.h
+++ b/linden/indra/llcommon/llapp.h
@@ -2,6 +2,8 @@
  * @file llapp.h
  * @brief Declaration of the LLApp class.
  *
+ * $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_LLAPP_H
diff --git a/linden/indra/llcommon/llapr.cpp b/linden/indra/llcommon/llapr.cpp
index ee63497..be3a52d 100644
--- a/linden/indra/llcommon/llapr.cpp
+++ b/linden/indra/llcommon/llapr.cpp
@@ -4,6 +4,8 @@
  * @date 2004-11-28
  * @brief Helper functions for using the apache portable runtime library.
  *
+ * $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"
@@ -44,7 +47,7 @@ void ll_init_apr()
                 apr_pool_create(&gAPRPoolp, NULL);
 
                 // Initialize the logging mutex
-                apr_thread_mutex_create(&gLogMutexp, APR_THREAD_MUTEX_DEFAULT, gAPRPoolp);
+                apr_thread_mutex_create(&gLogMutexp, APR_THREAD_MUTEX_UNNESTED, gAPRPoolp);
         }
 }
 
diff --git a/linden/indra/llcommon/llapr.h b/linden/indra/llcommon/llapr.h
index 6edfc18..b6c3638 100644
--- a/linden/indra/llcommon/llapr.h
+++ b/linden/indra/llcommon/llapr.h
@@ -4,6 +4,8 @@
  * @date 2004-11-28
  * @brief Helper functions for using the apache portable runtime library.
  *
+ * $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_LLAPR_H
@@ -44,6 +47,7 @@
 #include "apr-1/apr_atomic.h"
 #include "llstring.h"
 
+extern apr_thread_mutex_t* gLogMutexp;
 
 /** 
  * @brief initialize the common apr constructs -- apr itself, the
diff --git a/linden/indra/llcommon/llares.cpp b/linden/indra/llcommon/llares.cpp
new file mode 100644
index 0000000..3118830
--- /dev/null
+++ b/linden/indra/llcommon/llares.cpp
@@ -0,0 +1,776 @@
+/** 
+ * @file llares.cpp
+ * @author Bryan O'Sullivan
+ * @date 2007-08-15
+ * @brief Wrapper for asynchronous DNS lookups.
+ *
+ * $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$
+ */
+
+#ifdef LL_STANDALONE
+# include <ares_dns.h>
+#else
+# include <ares/ares_dns.h>
+#endif
+
+#include "apr-1/apr_portable.h"
+#include "apr-1/apr_network_io.h"
+#include "apr-1/apr_poll.h"
+
+#include "linden_common.h"
+#include "llapr.h"
+#include "llares.h"
+
+#if defined(LL_WINDOWS)
+# define ns_c_in 1
+# define NS_HFIXEDSZ     12      /* #/bytes of fixed data in header */
+# define NS_QFIXEDSZ     4       /* #/bytes of fixed data in query */
+# define NS_RRFIXEDSZ    10      /* #/bytes of fixed data in r record */
+#else
+# include <arpa/nameser.h>
+#endif
+
+LLAres::HostResponder::~HostResponder()
+{
+}
+
+void LLAres::HostResponder::hostResult(const hostent *ent)
+{
+        llinfos << "LLAres::HostResponder::hostResult not implemented" << llendl;
+}
+
+void LLAres::HostResponder::hostError(int code)
+{
+        llinfos << "LLAres::HostResponder::hostError " << code << ": "
+                        << LLAres::strerror(code) << llendl;
+}
+
+LLAres::NameInfoResponder::~NameInfoResponder()
+{
+}
+
+void LLAres::NameInfoResponder::nameInfoResult(const char *node,
+                                                                                           const char *service)
+{
+        llinfos << "LLAres::NameInfoResponder::nameInfoResult not implemented"
+                        << llendl;
+}
+
+void LLAres::NameInfoResponder::nameInfoError(int code)
+{
+        llinfos << "LLAres::NameInfoResponder::nameInfoError " << code << ": "
+                        << LLAres::strerror(code) << llendl;
+}
+
+LLAres::QueryResponder::~QueryResponder()
+{
+}
+
+void LLAres::QueryResponder::queryResult(const char *buf, size_t len)
+{
+        llinfos << "LLAres::QueryResponder::queryResult not implemented"
+                        << llendl;
+}
+
+void LLAres::QueryResponder::queryError(int code)
+{
+        llinfos << "LLAres::QueryResponder::queryError " << code << ": "
+                        << LLAres::strerror(code) << llendl;
+}
+
+LLAres::LLAres()
+{
+        ares_init(&chan_);
+}
+
+LLAres::~LLAres()
+{
+        ares_destroy(chan_);
+}
+
+void LLAres::cancel()
+{
+        ares_cancel(chan_);
+}
+
+static void host_callback(void *arg, int status, struct hostent *ent)
+{
+        LLPointer<LLAres::HostResponder> *resp =
+                (LLPointer<LLAres::HostResponder> *) arg;
+
+        if (status == ARES_SUCCESS)
+        {
+                (*resp)->hostResult(ent);
+        } else {
+                (*resp)->hostError(status);
+        }
+
+        delete resp;
+}
+
+void LLAres::getHostByName(const char *name, HostResponder *resp,
+                                                   int family)
+{
+        ares_gethostbyname(chan_, name, family, host_callback,
+                                           new LLPointer<LLAres::HostResponder>(resp));
+}
+        
+void LLAres::getSrvRecords(const std::string &name, SrvResponder *resp)
+{
+        search(name, RES_SRV, resp);
+}
+        
+void LLAres::rewriteURI(const std::string &uri, UriRewriteResponder *resp)
+{
+        llinfos << "Rewriting " << uri << llendl;
+
+        resp->mUri = LLURI(uri);
+        search("_" + resp->mUri.scheme() + "._tcp." + resp->mUri.hostName(),
+                   RES_SRV, resp);
+}
+
+LLQueryResponder::LLQueryResponder()
+        : LLAres::QueryResponder(),
+          mResult(ARES_ENODATA)
+{
+}
+
+int LLQueryResponder::parseRR(const char *buf, size_t len, const char *&pos,
+                                                          LLPointer<LLDnsRecord> &r)
+{
+        std::string rrname;
+        size_t enclen;
+        int ret;
+
+        // RR name.
+
+        ret = LLAres::expandName(pos, buf, len, rrname, enclen);
+        if (ret != ARES_SUCCESS)
+        {
+                return ret;
+        }
+                
+        pos += enclen;
+
+        if (pos + NS_RRFIXEDSZ > buf + len)
+        {
+                return ARES_EBADRESP;
+        }
+
+        int rrtype = DNS_RR_TYPE(pos);
+        int rrclass = DNS_RR_CLASS(pos);
+        int rrttl = DNS_RR_TTL(pos);
+        int rrlen = DNS_RR_LEN(pos);
+                
+        if (rrclass != ns_c_in)
+        {
+                return ARES_EBADRESP;
+        }
+
+        pos += NS_RRFIXEDSZ;
+
+        if (pos + rrlen > buf + len)
+        {
+                return ARES_EBADRESP;
+        }
+
+        switch (rrtype)
+        {
+        case RES_A:
+                r = new LLARecord(rrname, rrttl);
+                break;
+        case RES_NS:
+                r = new LLNsRecord(rrname, rrttl);
+                break;
+        case RES_CNAME:
+                r = new LLCnameRecord(rrname, rrttl);
+                break;
+        case RES_PTR:
+                r = new LLPtrRecord(rrname, rrttl);
+                break;
+        case RES_AAAA:
+                r = new LLAaaaRecord(rrname, rrttl);
+                break;
+        case RES_SRV:
+                r = new LLSrvRecord(rrname, rrttl);
+                break;
+        default:
+                llinfos << "LLQueryResponder::parseRR got unknown RR type " << rrtype
+                                << llendl;
+                return ARES_EBADRESP;
+        }
+
+        ret = r->parse(buf, len, pos, rrlen);
+
+        if (ret == ARES_SUCCESS)
+        {
+                pos += rrlen;
+        } else {
+                r = NULL;
+        }
+                
+        return ret;
+}
+
+int LLQueryResponder::parseSection(const char *buf, size_t len,
+                                                                   size_t count, const char *&pos,
+                                                                   dns_rrs_t &rrs)
+{
+        int ret = ARES_SUCCESS;
+        
+        for (size_t i = 0; i < count; i++)
+        {
+                LLPointer<LLDnsRecord> r;
+                ret = parseRR(buf, len, pos, r);
+                if (ret != ARES_SUCCESS)
+                {
+                        break;
+                }
+                rrs.push_back(r);
+        }
+
+        return ret;
+}
+
+void LLQueryResponder::queryResult(const char *buf, size_t len)
+{
+        const char *pos = buf;
+        int qdcount = DNS_HEADER_QDCOUNT(pos);
+        int ancount = DNS_HEADER_ANCOUNT(pos);
+        int nscount = DNS_HEADER_NSCOUNT(pos);
+        int arcount = DNS_HEADER_ARCOUNT(pos);
+        int ret;
+
+        if (qdcount == 0 || ancount + nscount + arcount == 0)
+        {
+                ret = ARES_ENODATA;
+                goto bail;
+        }
+
+        pos += NS_HFIXEDSZ;
+
+        for (int i = 0; i < qdcount; i++)
+        {
+                std::string ignore;
+                size_t enclen;
+
+                ret = LLAres::expandName(pos, buf, len, i == 0 ? mQuery : ignore,
+                                                                 enclen);
+                if (ret != ARES_SUCCESS)
+                {
+                        goto bail;
+                }
+
+                pos += enclen;
+
+                if (i == 0)
+                {
+                        int t = DNS_QUESTION_TYPE(pos);
+                        switch (t)
+                        {
+                        case RES_A:
+                        case RES_NS:
+                        case RES_CNAME:
+                        case RES_PTR:
+                        case RES_AAAA:
+                        case RES_SRV:
+                                mType = (LLResType) t;
+                                break;
+                        default:
+                                llinfos << "Cannot grok query type " << t << llendl;
+                                ret = ARES_EBADQUERY;
+                                goto bail;
+                        }
+                }
+
+                pos += NS_QFIXEDSZ;
+                if (pos > buf + len)
+                {
+                        ret = ARES_EBADRESP;
+                        goto bail;
+                }
+        }
+        
+        ret = parseSection(buf, len, ancount, pos, mAnswers);
+        if (ret != ARES_SUCCESS)
+        {
+                goto bail;
+        }
+
+        ret = parseSection(buf, len, nscount, pos, mAuthorities);
+        if (ret != ARES_SUCCESS)
+        {
+                goto bail;
+        }
+
+        ret = parseSection(buf, len, arcount, pos, mAdditional);
+
+bail:
+        mResult = ret;
+        if (mResult == ARES_SUCCESS)
+        {
+                queryResult();
+        } else {
+                queryError(mResult);
+        }
+}
+
+void LLQueryResponder::queryResult()
+{
+        llinfos << "LLQueryResponder::queryResult not implemented" << llendl;
+}
+
+void LLAres::SrvResponder::queryResult()
+{
+        if (mType == RES_SRV)
+        {
+                srvResult(mAnswers);
+        } else {
+                srvError(ARES_EBADRESP);
+        }
+}
+
+void LLAres::SrvResponder::queryError(int code)
+{
+        srvError(code);
+}
+
+void LLAres::SrvResponder::srvResult(const dns_rrs_t &ents)
+{
+        llinfos << "LLAres::SrvResponder::srvResult not implemented" << llendl;
+
+        for (size_t i = 0; i < ents.size(); i++)
+        {
+                const LLSrvRecord *s = (const LLSrvRecord *) ents[i].get();
+
+                llinfos << "[" << i << "] " << s->host() << ":" << s->port()
+                                << " priority " << s->priority()
+                                << " weight " << s->weight()
+                                << llendl;
+        }
+}
+
+void LLAres::SrvResponder::srvError(int code)
+{
+        llinfos << "LLAres::SrvResponder::srvError " << code << ": "
+                        << LLAres::strerror(code) << llendl;
+}
+
+static void nameinfo_callback(void *arg, int status, char *node, char *service)
+{
+        LLPointer<LLAres::NameInfoResponder> *resp =
+                (LLPointer<LLAres::NameInfoResponder> *) arg;
+
+        if (status == ARES_SUCCESS)
+        {
+                (*resp)->nameInfoResult(node, service);
+        } else {
+                (*resp)->nameInfoError(status);
+        }
+
+        delete resp;
+}
+
+void LLAres::getNameInfo(const struct sockaddr &sa, socklen_t salen, int flags,
+                                                 NameInfoResponder *resp)
+{
+        ares_getnameinfo(chan_, &sa, salen, flags, nameinfo_callback,
+                                         new LLPointer<NameInfoResponder>(resp));
+}
+
+static void search_callback(void *arg, int status, unsigned char *abuf,
+                                                        int alen)
+{
+        LLPointer<LLAres::QueryResponder> *resp =
+                (LLPointer<LLAres::QueryResponder> *) arg;
+
+        if (status == ARES_SUCCESS)
+        {
+                (*resp)->queryResult((const char *) abuf, alen);
+        } else {
+                (*resp)->queryError(status);
+        }
+
+        delete resp;
+}
+
+void LLAres::search(const std::string &query, LLResType type,
+                                        QueryResponder *resp)
+{
+        ares_search(chan_, query.c_str(), ns_c_in, type, search_callback,
+                                new LLPointer<QueryResponder>(resp));
+}
+
+bool LLAres::process(U64 timeout)
+{
+        if (!gAPRPoolp)
+        {
+                ll_init_apr();
+        }
+
+        int socks[ARES_GETSOCK_MAXNUM];
+        apr_pollfd_t aprFds[ARES_GETSOCK_MAXNUM];
+        apr_int32_t nsds = 0;
+        apr_status_t status;
+        apr_pool_t *pool;
+        int nactive = 0;
+        int bitmask;
+
+        bitmask = ares_getsock(chan_, socks, ARES_GETSOCK_MAXNUM);
+
+        if (bitmask == 0)
+        {
+                goto bail;
+        }
+
+        status = apr_pool_create(&pool, gAPRPoolp);
+        ll_apr_assert_status(status);
+
+        for (int i = 0; i < ARES_GETSOCK_MAXNUM; i++)
+        {
+                if (ARES_GETSOCK_READABLE(bitmask, i))
+                {
+                        aprFds[nactive].reqevents = APR_POLLIN | APR_POLLERR;
+                }
+                else if (ARES_GETSOCK_WRITABLE(bitmask, i))
+                {
+                        aprFds[nactive].reqevents = APR_POLLOUT | APR_POLLERR;
+                } else {
+                        continue;
+                }
+
+                apr_socket_t *aprSock = NULL;
+
+                status = apr_os_sock_put(&aprSock, (apr_os_sock_t *) &socks[i], pool);
+                if (status != APR_SUCCESS)
+                {
+                        ll_apr_warn_status(status);
+                        goto bail_pool;
+                }
+
+                aprFds[nactive].desc.s = aprSock;
+                aprFds[nactive].desc_type = APR_POLL_SOCKET;
+                aprFds[nactive].p = pool;
+                aprFds[nactive].rtnevents = 0;
+                aprFds[nactive].client_data = &socks[i];
+
+                nactive++;
+        }
+
+        if (nactive > 0)
+        {
+                status = apr_poll(aprFds, nactive, &nsds, timeout);
+
+                if (status != APR_SUCCESS && status != APR_TIMEUP)
+                {
+                        ll_apr_warn_status(status);
+                }
+
+                for (int i = 0; i < nactive; i++)
+                {
+                        int evts = aprFds[i].rtnevents;
+                        int ifd = (evts & (APR_POLLIN | APR_POLLERR))
+                                ? *((int *) aprFds[i].client_data) : ARES_SOCKET_BAD;
+                        int ofd = (evts & (APR_POLLOUT | APR_POLLERR))
+                                ? *((int *) aprFds[i].client_data) : ARES_SOCKET_BAD;
+                                        
+                        ares_process_fd(chan_, ifd, ofd);
+                }
+        }
+
+bail_pool:
+        apr_pool_destroy(pool);
+
+bail:
+        return nsds > 0;
+}
+
+bool LLAres::processAll()
+{
+        bool anyProcessed = false, ret;
+
+        do {
+                timeval tv;
+
+                ret = ares_timeout(chan_, NULL, &tv) != NULL;
+
+                if (ret)
+                {
+                        ret = process(tv.tv_sec * 1000000LL + tv.tv_usec);
+                        anyProcessed |= ret;
+                }
+        } while (ret);
+
+        return anyProcessed;
+}
+
+int LLAres::expandName(const char *encoded, const char *abuf, size_t alen,
+                                           std::string &s, size_t &enclen)
+{
+        char *t;
+        int ret;
+        long e;
+        
+        ret = ares_expand_name((const unsigned char *) encoded,
+                                                   (const unsigned char *) abuf, alen, &t, &e);
+        if (ret == ARES_SUCCESS)
+        {
+                s.assign(t);
+                enclen = e;
+                ares_free_string(t);
+        }
+        return ret;
+}
+
+const char *LLAres::strerror(int code)
+{
+        return ares_strerror(code);
+}
+
+LLAres *gAres;
+
+LLAres *ll_init_ares()
+{
+        if (gAres == NULL)
+        {
+                gAres = new LLAres();
+        }
+        return gAres;
+}
+
+LLDnsRecord::LLDnsRecord(LLResType type, const std::string &name,
+                                                 unsigned ttl)
+        : LLRefCount(),
+          mType(type),
+          mName(name),
+          mTTL(ttl)
+{
+}
+
+LLHostRecord::LLHostRecord(LLResType type, const std::string &name,
+                                                   unsigned ttl)
+        : LLDnsRecord(type, name, ttl)
+{
+}
+
+int LLHostRecord::parse(const char *buf, size_t len, const char *pos,
+                                                size_t rrlen)
+{
+        int ret;
+
+        ret = LLAres::expandName(pos, buf, len, mHost);
+        if (ret != ARES_SUCCESS)
+        {
+                goto bail;
+        }
+        
+        ret = ARES_SUCCESS;
+
+bail:
+        return ret;
+}
+
+LLCnameRecord::LLCnameRecord(const std::string &name, unsigned ttl)
+        : LLHostRecord(RES_CNAME, name, ttl)
+{
+}
+
+LLPtrRecord::LLPtrRecord(const std::string &name, unsigned ttl)
+        : LLHostRecord(RES_PTR, name, ttl)
+{
+}
+
+LLAddrRecord::LLAddrRecord(LLResType type, const std::string &name,
+                                                   unsigned ttl)
+        : LLDnsRecord(type, name, ttl)
+{
+}
+
+LLARecord::LLARecord(const std::string &name, unsigned ttl)
+        : LLAddrRecord(RES_A, name, ttl)
+{
+}
+
+int LLARecord::parse(const char *buf, size_t len, const char *pos,
+                                         size_t rrlen)
+{
+        int ret;
+
+        if (rrlen != sizeof(mSA.sin.sin_addr.s_addr))
+        {
+                ret = ARES_EBADRESP;
+                goto bail;
+        }
+        
+        memset(&mSA, 0, sizeof(mSA));
+        memcpy(&mSA.sin.sin_addr.s_addr, pos, rrlen);
+        mSA.sin.sin_family = AF_INET6;
+        mSize = sizeof(mSA.sin);
+        
+        ret = ARES_SUCCESS;
+
+bail:
+        return ret;
+}
+
+LLAaaaRecord::LLAaaaRecord(const std::string &name, unsigned ttl)
+        : LLAddrRecord(RES_AAAA, name, ttl)
+{
+}
+
+int LLAaaaRecord::parse(const char *buf, size_t len, const char *pos,
+                                                size_t rrlen)
+{
+        int ret;
+
+        if (rrlen != sizeof(mSA.sin6.sin6_addr))
+        {
+                ret = ARES_EBADRESP;
+                goto bail;
+        }
+        
+        memset(&mSA, 0, sizeof(mSA));
+        memcpy(&mSA.sin6.sin6_addr.s6_addr, pos, rrlen);
+        mSA.sin6.sin6_family = AF_INET6;
+        mSize = sizeof(mSA.sin6);
+        
+        ret = ARES_SUCCESS;
+
+bail:
+        return ret;
+}
+
+LLSrvRecord::LLSrvRecord(const std::string &name, unsigned ttl)
+        : LLHostRecord(RES_SRV, name, ttl)
+{
+}
+
+int LLSrvRecord::parse(const char *buf, size_t len, const char *pos,
+                                           size_t rrlen)
+{
+        int ret;
+
+        if (rrlen < 6)
+        {
+                ret = ARES_EBADRESP;
+                goto bail;
+        }
+
+        memcpy(&mPriority, pos, 2);
+        memcpy(&mWeight, pos + 2, 2);
+        memcpy(&mPort, pos + 4, 2);
+
+        mPriority = ntohs(mPriority);
+        mWeight = ntohs(mWeight);
+        mPort = ntohs(mPort);
+
+        ret = LLHostRecord::parse(buf, len, pos + 6, rrlen - 6);
+        
+bail:
+        return ret;
+}
+
+LLNsRecord::LLNsRecord(const std::string &name, unsigned ttl)
+        : LLHostRecord(RES_NS, name, ttl)
+{
+}
+
+void LLAres::UriRewriteResponder::queryError(int code)
+{
+        std::vector<std::string> uris;
+        uris.push_back(mUri.asString());
+        rewriteResult(uris);
+}
+
+void LLAres::UriRewriteResponder::queryResult()
+{
+        std::vector<std::string> uris;
+
+        if (mType != RES_SRV)
+        {
+                goto bail;
+        }
+                
+        for (size_t i = 0; i < mAnswers.size(); i++)
+        {
+                const LLSrvRecord *r = (const LLSrvRecord *) mAnswers[i].get();
+
+                if (r->type() == RES_SRV)
+                {
+                        // Check the domain in the response to ensure that it's
+                        // the same as the domain in the request, so that bad guys
+                        // can't forge responses that point to their own login
+                        // servers with their own certificates.
+
+                        // Hard-coding the domain to check here is a bit of a
+                        // hack.  Hoist it to an outer caller if anyone ever needs
+                        // this functionality on other domains.
+
+                        static const std::string domain(".lindenlab.com");
+                        const std::string &host = r->host();
+
+                        std::string::size_type s = host.find(domain) + domain.length();
+                                
+                        if (s != host.length() && s != host.length() - 1)
+                        {
+                                continue;
+                        }
+                        
+                        LLURI uri(mUri.scheme(),
+                                          mUri.userName(),
+                                          mUri.password(),
+                                          r->host(),
+                                          mUri.defaultPort() ? r->port() : mUri.hostPort(),
+                                          mUri.escapedPath(),
+                                          mUri.escapedQuery());
+                        uris.push_back(uri.asString());
+                }
+        }
+
+        if (!uris.empty())
+        {
+                goto done;
+        }
+
+bail:
+        uris.push_back(mUri.asString());
+
+done:
+        rewriteResult(uris);
+}
+
+void LLAres::UriRewriteResponder::rewriteResult(
+        const std::vector<std::string> &uris)
+{
+        llinfos << "LLAres::UriRewriteResponder::rewriteResult not implemented"
+                        << llendl;
+
+        for (size_t i = 0; i < uris.size(); i++)
+        {
+                llinfos << "[" << i << "] " << uris[i] << llendl;
+        }
+}
diff --git a/linden/indra/llcommon/llares.h b/linden/indra/llcommon/llares.h
new file mode 100644
index 0000000..63bb3e3
--- /dev/null
+++ b/linden/indra/llcommon/llares.h
@@ -0,0 +1,572 @@
+/** 
+ * @file llares.h
+ * @author Bryan O'Sullivan
+ * @date 2007-08-15
+ * @brief Wrapper for asynchronous DNS lookups.
+ *
+ * $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_LLARES_H
+#define LL_LLARES_H
+
+#ifdef LL_WINDOWS
+# include <ws2tcpip.h>
+#endif
+
+#ifdef LL_STANDALONE
+# include <ares.h>
+#else
+# include <ares/ares.h>
+#endif
+
+#include "llmemory.h"
+#include "lluri.h"
+
+class LLQueryResponder;
+
+/**
+ * @brief Supported DNS RR types.
+ */
+enum LLResType
+{
+        RES_INVALID = 0,                        /**< Cookie. */
+        RES_A = 1,                                      /**< "A" record. IPv4 address. */
+        RES_NS = 2,                                     /**< "NS" record. Authoritative server. */
+        RES_CNAME = 5,                          /**< "CNAME" record. Canonical name. */
+        RES_PTR = 12,                           /**< "PTR" record. Domain name pointer. */
+        RES_AAAA = 28,                          /**< "AAAA" record. IPv6 Address. */
+        RES_SRV = 33,                           /**< "SRV" record. Server Selection. */
+        RES_MAX = 65536                         /**< Sentinel; RR types are 16 bits wide. */
+};
+
+/**
+ * @class LLDnsRecord
+ * @brief Base class for all DNS RR types.
+ */
+class LLDnsRecord : public LLRefCount
+{
+protected:
+        friend class LLQueryResponder;
+
+        LLResType mType;
+        std::string mName;
+        unsigned mTTL;
+        
+        virtual int parse(const char *buf, size_t len, const char *pos,
+                                          size_t rrlen) = 0;
+
+        LLDnsRecord(LLResType type, const std::string &name, unsigned ttl);
+        
+public:
+        /**
+         * @brief Record name.
+         */
+        const std::string &name() const { return mName; }
+
+        /**
+         * @brief Time-to-live value, in seconds.
+         */
+        unsigned ttl() const { return mTTL; }
+
+        /**
+         * @brief RR type.
+         */
+        LLResType type() const { return mType; }
+};
+
+/**
+ * @class LLAddrRecord
+ * @brief Base class for address-related RRs.
+ */
+class LLAddrRecord : public LLDnsRecord
+{
+protected:
+        friend class LLQueryResponder;
+
+        LLAddrRecord(LLResType type, const std::string &name, unsigned ttl);
+
+        union 
+        {
+                sockaddr sa;
+                sockaddr_in sin;
+                sockaddr_in6 sin6;
+        } mSA;
+
+        socklen_t mSize;
+
+public:
+        /**
+         * @brief Generic socket address.
+         */
+        const sockaddr &addr() const { return mSA.sa; }
+
+        /**
+         * @brief Size of the socket structure.
+         */
+        socklen_t size() const { return mSize; }
+};
+
+/**
+ * @class LLARecord
+ * @brief A RR, for IPv4 addresses.
+ */
+class LLARecord : public LLAddrRecord
+{
+protected:
+        friend class LLQueryResponder;
+
+        LLARecord(const std::string &name, unsigned ttl);
+
+        int parse(const char *buf, size_t len, const char *pos, size_t rrlen);
+
+public:
+        /**
+         * @brief Socket address.
+         */
+        const sockaddr_in &addr_in() const { return mSA.sin; }
+};
+
+/**
+ * @class LLAaaaRecord
+ * @brief AAAA RR, for IPv6 addresses.
+ */
+class LLAaaaRecord : public LLAddrRecord
+{
+protected:
+        friend class LLQueryResponder;
+
+        LLAaaaRecord(const std::string &name, unsigned ttl);
+
+        int parse(const char *buf, size_t len, const char *pos, size_t rrlen);
+
+public:
+        /**
+         * @brief Socket address.
+         */
+        const sockaddr_in6 &addr_in6() const { return mSA.sin6; }
+};
+        
+/**
+ * @class LLHostRecord
+ * @brief Base class for host-related RRs.
+ */
+class LLHostRecord : public LLDnsRecord
+{
+protected:
+        LLHostRecord(LLResType type, const std::string &name, unsigned ttl);
+
+        int parse(const char *buf, size_t len, const char *pos, size_t rrlen);
+
+        std::string mHost;
+
+public:
+        /**
+         * @brief Host name.
+         */
+        const std::string &host() const { return mHost; }
+};
+        
+/**
+ * @class LLCnameRecord
+ * @brief CNAME RR.
+ */
+class LLCnameRecord : public LLHostRecord
+{
+protected:
+        friend class LLQueryResponder;
+
+        LLCnameRecord(const std::string &name, unsigned ttl);
+};
+        
+/**
+ * @class LLPtrRecord
+ * @brief PTR RR.
+ */
+class LLPtrRecord : public LLHostRecord
+{
+protected:
+        friend class LLQueryResponder;
+
+        LLPtrRecord(const std::string &name, unsigned ttl);
+};
+
+/**
+ * @class LLSrvRecord
+ * @brief SRV RR.
+ */
+class LLSrvRecord : public LLHostRecord
+{
+protected:
+        U16 mPriority;
+        U16 mWeight;
+        U16 mPort;
+
+        int parse(const char *buf, size_t len, const char *pos, size_t rrlen);
+
+public:
+        LLSrvRecord(const std::string &name, unsigned ttl);
+
+        /**
+         * @brief Service priority.
+         */
+        U16 priority() const { return mPriority; }
+
+        /**
+         * @brief Service weight.
+         */
+        U16 weight() const { return mWeight; }
+
+        /**
+         * @brief Port number of service.
+         */
+        U16 port() const { return mPort; }
+
+        /**
+         * @brief Functor for sorting SRV records by priority.
+         */
+        struct ComparePriorityLowest
+        {
+                bool operator()(const LLSrvRecord& lhs, const LLSrvRecord& rhs)
+                {
+                        return lhs.mPriority < rhs.mPriority;
+                }
+        };
+};
+        
+/**
+ * @class LLNsRecord
+ * @brief NS RR.
+ */
+class LLNsRecord : public LLHostRecord
+{
+public:
+        LLNsRecord(const std::string &name, unsigned ttl);
+};
+
+class LLQueryResponder;
+
+/**
+ * @class LLAres
+ * @brief Asynchronous address resolver.
+ */
+class LLAres
+{
+public:
+    /**
+         * @class HostResponder
+         * @brief Base class for responding to hostname lookups.
+         * @see LLAres::getHostByName
+         */
+        class HostResponder : public LLRefCount
+        {
+        public:
+                virtual ~HostResponder();
+
+                virtual void hostResult(const hostent *ent);
+                virtual void hostError(int code);
+        };
+
+    /**
+         * @class NameInfoResponder
+         * @brief Base class for responding to address lookups.
+         * @see LLAres::getNameInfo
+         */
+        class NameInfoResponder : public LLRefCount
+        {
+        public:
+                virtual ~NameInfoResponder();
+
+                virtual void nameInfoResult(const char *node, const char *service);
+                virtual void nameInfoError(int code);
+        };
+
+    /**
+         * @class QueryResponder
+         * @brief Base class for responding to custom searches.
+         * @see LLAres::search
+         */
+        class QueryResponder : public LLRefCount
+        {
+        public:
+                virtual ~QueryResponder();
+
+                virtual void queryResult(const char *buf, size_t len);
+                virtual void queryError(int code);
+        };
+
+        class SrvResponder;
+        class UriRewriteResponder;
+                
+        LLAres();
+
+        ~LLAres();
+
+        /**
+         * Cancel all outstanding requests.  The error methods of the
+         * corresponding responders will be called, with ARES_ETIMEOUT.
+         */
+        void cancel();
+        
+        /**
+         * Look up the address of a host.
+         *
+         * @param name name of host to look up
+         * @param resp responder to call with result
+         * @param family AF_INET for IPv4 addresses, AF_INET6 for IPv6
+         */
+        void getHostByName(const std::string &name, HostResponder *resp,
+                                           int family = AF_INET) {
+                getHostByName(name.c_str(), resp, family);
+        }
+
+        /**
+         * Look up the address of a host.
+         *
+         * @param name name of host to look up
+         * @param resp responder to call with result
+         * @param family AF_INET for IPv4 addresses, AF_INET6 for IPv6
+         */
+        void getHostByName(const char *name, HostResponder *resp,
+                                           int family = PF_INET);
+
+        /**
+         * Look up the name associated with a socket address.
+         *
+         * @param sa socket address to look up
+         * @param salen size of socket address
+         * @param flags flags to use
+         * @param resp responder to call with result
+         */
+        void getNameInfo(const struct sockaddr &sa, socklen_t salen, int flags,
+                                         NameInfoResponder *resp);
+
+        /**
+         * Look up SRV (service location) records for a service name.
+         *
+         * @param name service name (e.g. "_https._tcp.login.agni.lindenlab.com")
+         * @param resp responder to call with result
+         */
+        void getSrvRecords(const std::string &name, SrvResponder *resp);
+
+        /**
+         * Rewrite a URI, using SRV (service location) records for its
+         * protocol if available.  If no SRV records are published, the
+         * existing URI is handed to the responder.
+         *
+         * @param uri URI to rewrite
+         * @param resp responder to call with result
+         */
+        void rewriteURI(const std::string &uri,
+                                        UriRewriteResponder *resp);
+
+        /**
+         * Start a custom search.
+         *
+         * @param query query to make
+         * @param type type of query to perform
+         * @param resp responder to call with result
+         */
+        void search(const std::string &query, LLResType type,
+                                QueryResponder *resp);
+
+        /**
+         * Process any outstanding queries.  This method takes an optional
+         * timeout parameter (specified in microseconds).  If provided, it
+         * will block the calling thread for that length of time to await
+         * possible responses. A timeout of zero will return immediately
+         * if there are no responses or timeouts to process.
+         *
+         * @param timeoutUsecs number of microseconds to block before timing out
+         * @return whether any responses were processed
+         */
+        bool process(U64 timeoutUsecs = 0);
+
+        /**
+         * Process all outstanding queries, blocking the calling thread
+         * until all have either been responded to or timed out.
+         *
+         * @return whether any responses were processed
+         */
+        bool processAll();
+        
+        /**
+         * Expand a DNS-encoded compressed string into a normal string.
+         *
+         * @param encoded the encoded name (null-terminated)
+         * @param abuf the response buffer in which the string is embedded
+         * @param alen the length of the response buffer
+         * @param s the string into which to place the result
+         * @return ARES_SUCCESS on success, otherwise an error indicator
+         */
+        static int expandName(const char *encoded, const char *abuf, size_t alen,
+                                                  std::string &s) {
+                size_t ignore;
+                return expandName(encoded, abuf, alen, s, ignore);
+        }
+        
+        static int expandName(const char *encoded, const char *abuf, size_t alen,
+                                                  std::string &s, size_t &enclen);
+
+        /**
+         * Return a string describing an error code.
+         */
+        static const char *strerror(int code);
+
+protected:
+        ares_channel chan_;
+
+};
+        
+/**
+ * An ordered collection of DNS resource records.
+ */
+typedef std::vector<LLPointer<LLDnsRecord> > dns_rrs_t;
+
+/**
+ * @class LLQueryResponder
+ * @brief Base class for friendly handling of DNS query responses.
+ *
+ * This class parses a DNS response and represents it in a friendly
+ * manner.
+ *
+ * @see LLDnsRecord
+ * @see LLARecord
+ * @see LLNsRecord
+ * @see LLCnameRecord
+ * @see LLPtrRecord
+ * @see LLAaaaRecord
+ * @see LLSrvRecord
+ */
+class LLQueryResponder : public LLAres::QueryResponder
+{
+protected:
+        int mResult;
+        std::string mQuery;
+        LLResType mType;
+        
+        dns_rrs_t mAnswers;
+        dns_rrs_t mAuthorities;
+        dns_rrs_t mAdditional;
+
+        /**
+         * Parse a single RR.
+         */
+        int parseRR(const char *buf, size_t len, const char *&pos,
+                                LLPointer<LLDnsRecord> &r);
+        /**
+         * Parse one section of a response.
+         */
+        int parseSection(const char *buf, size_t len,
+                                         size_t count, const char *& pos, dns_rrs_t &rrs);
+
+        void queryResult(const char *buf, size_t len);
+        virtual void queryResult();
+
+public:
+        LLQueryResponder();
+
+        /**
+         * Indicate whether the response could be parsed successfully.
+         */
+        bool valid() const { return mResult == ARES_SUCCESS; }
+
+        /**
+         * The more detailed result of parsing the response.
+         */
+        int result() const { return mResult; }
+        
+        /**
+         * Return the query embedded in the response.
+         */
+        const std::string &query() const { return mQuery; }
+
+        /**
+         * Return the contents of the "answers" section of the response.
+         */
+        const dns_rrs_t &answers() const { return mAnswers; }
+
+        /**
+         * Return the contents of the "authorities" section of the
+         * response.
+         */
+        const dns_rrs_t &authorities() const { return mAuthorities; }
+
+        /**
+         * Return the contents of the "additional records" section of the
+         * response.
+         */
+        const dns_rrs_t &additional() const { return mAdditional; }
+};
+
+/**
+ * @class LLAres::SrvResponder
+ * @brief Class for handling SRV query responses.
+ */
+class LLAres::SrvResponder : public LLQueryResponder
+{
+public:
+        friend void LLAres::getSrvRecords(const std::string &name,
+                                                                          SrvResponder *resp);
+        void queryResult();
+        void queryError(int code);
+
+        virtual void srvResult(const dns_rrs_t &ents);
+        virtual void srvError(int code);
+};
+
+/**
+ * @class LLAres::UriRewriteResponder
+ * @brief Class for handling URI rewrites based on SRV records.
+ */
+class LLAres::UriRewriteResponder : public LLQueryResponder
+{
+protected:
+        LLURI mUri;
+
+public:
+        friend void LLAres::rewriteURI(const std::string &uri,
+                                                                   UriRewriteResponder *resp);
+        void queryResult();
+        void queryError(int code);
+
+        virtual void rewriteResult(const std::vector<std::string> &uris);
+};
+        
+/**
+ * Singleton responder.
+ */
+extern LLAres *gAres;
+
+/**
+ * Set up the singleton responder.  It's safe to call this more than
+ * once from within a single thread, but this function is not
+ * thread safe.
+ */
+extern LLAres *ll_init_ares();
+
+#endif // LL_LLARES_H
diff --git a/linden/indra/llcommon/llassettype.cpp b/linden/indra/llcommon/llassettype.cpp
index 0bbef8c..06504b5 100644
--- a/linden/indra/llcommon/llassettype.cpp
+++ b/linden/indra/llcommon/llassettype.cpp
@@ -2,6 +2,8 @@
  * @file llassettype.cpp
  * @brief Implementatino of LLAssetType functionality.
  *
+ * $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$
  */
 
 #include "linden_common.h"
 
 #include "llassettype.h"
 
-#include <time.h>
-
 #include "llstring.h"
 #include "lltimer.h"
 
diff --git a/linden/indra/llcommon/llassettype.h b/linden/indra/llcommon/llassettype.h
index 5fe6b16..f71e0b9 100644
--- a/linden/indra/llcommon/llassettype.h
+++ b/linden/indra/llcommon/llassettype.h
@@ -2,6 +2,8 @@
  * @file llassettype.h
  * @brief Declaration of LLAssetType.
  *
+ * $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_LLASSETTYPE
diff --git a/linden/indra/llcommon/llassoclist.h b/linden/indra/llcommon/llassoclist.h
index 417e347..974bc1e 100644
--- a/linden/indra/llcommon/llassoclist.h
+++ b/linden/indra/llcommon/llassoclist.h
@@ -2,6 +2,8 @@
  * @file llassoclist.h
  * @brief LLAssocList 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_LLASSOCLIST_H
diff --git a/linden/indra/llcommon/llavatarconstants.h b/linden/indra/llcommon/llavatarconstants.h
index ab49368..c62cae2 100644
--- a/linden/indra/llcommon/llavatarconstants.h
+++ b/linden/indra/llcommon/llavatarconstants.h
@@ -2,6 +2,8 @@
  * @file llavatarconstants.h
  * @brief some useful short term constants for Indra
  *
+ * $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_AVATAR_CONSTANTS_H
diff --git a/linden/indra/llcommon/llbase32.cpp b/linden/indra/llcommon/llbase32.cpp
index 27f7284..50f789e 100644
--- a/linden/indra/llcommon/llbase32.cpp
+++ b/linden/indra/llcommon/llbase32.cpp
@@ -7,7 +7,9 @@
  * http://ghostwhitecrab.com/bitter/
  *
  * Some parts of this file are:
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -29,6 +31,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 /**
diff --git a/linden/indra/llcommon/llbase32.h b/linden/indra/llcommon/llbase32.h
index 198c5c6..5254d0a 100644
--- a/linden/indra/llcommon/llbase32.h
+++ b/linden/indra/llcommon/llbase32.h
@@ -3,7 +3,9 @@
  * @brief base32 encoding that returns a std::string
  * @author James Cook
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LLBASE32_H
diff --git a/linden/indra/llcommon/llbase64.cpp b/linden/indra/llcommon/llbase64.cpp
index 18aefea..207b367 100644
--- a/linden/indra/llcommon/llbase64.cpp
+++ b/linden/indra/llcommon/llbase64.cpp
@@ -3,7 +3,9 @@
  * @brief Wrapper for apr base64 encoding that returns a std::string
  * @author James Cook
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llcommon/llbase64.h b/linden/indra/llcommon/llbase64.h
index 995ac04..c3d1a11 100644
--- a/linden/indra/llcommon/llbase64.h
+++ b/linden/indra/llcommon/llbase64.h
@@ -3,7 +3,9 @@
  * @brief Wrapper for apr base64 encoding that returns a std::string
  * @author James Cook
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LLBASE64_H
diff --git a/linden/indra/llcommon/llboost.h b/linden/indra/llcommon/llboost.h
index 45d5eb2..14cc97c 100644
--- a/linden/indra/llcommon/llboost.h
+++ b/linden/indra/llcommon/llboost.h
@@ -2,6 +2,8 @@
  * @file llboost.h
  * @brief helper object & functions for use with boost
  *
+ * $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_LLBOOST_H
diff --git a/linden/indra/llcommon/llchat.h b/linden/indra/llcommon/llchat.h
index 7339e9a..0ae1638 100644
--- a/linden/indra/llcommon/llchat.h
+++ b/linden/indra/llcommon/llchat.h
@@ -3,6 +3,8 @@
  * @author James Cook
  * @brief Chat constants and data structures.
  *
+ * $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_LLCHAT_H
diff --git a/linden/indra/llcommon/llclickaction.h b/linden/indra/llcommon/llclickaction.h
index e45ad90..be343c6 100644
--- a/linden/indra/llcommon/llclickaction.h
+++ b/linden/indra/llcommon/llclickaction.h
@@ -3,6 +3,8 @@
  * @author James Cook
  * @brief Constants for single-click actions on objects
  *
+ * $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_LLCLICKACTION_H
diff --git a/linden/indra/llcommon/llcommon.cpp b/linden/indra/llcommon/llcommon.cpp
index 993da7d..0069d03 100644
--- a/linden/indra/llcommon/llcommon.cpp
+++ b/linden/indra/llcommon/llcommon.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file llcommon.cpp
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llcommon/llcommon.h b/linden/indra/llcommon/llcommon.h
index 443870e..3f48763 100644
--- a/linden/indra/llcommon/llcommon.h
+++ b/linden/indra/llcommon/llcommon.h
@@ -1,6 +1,8 @@
 /** 
  * @file llcommon.h
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-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 LL_COMMON_H
diff --git a/linden/indra/llcommon/llcommon.vcproj b/linden/indra/llcommon/llcommon.vcproj
index 70006e0..80704af 100644
--- a/linden/indra/llcommon/llcommon.vcproj
+++ b/linden/indra/llcommon/llcommon.vcproj
@@ -161,6 +161,9 @@
                                 RelativePath=".\llapr.cpp">
                         </File>
                         <File
+                                RelativePath=".\llares.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\llassettype.cpp">
                         </File>
                         <File
diff --git a/linden/indra/llcommon/llcommon_vc8.vcproj b/linden/indra/llcommon/llcommon_vc8.vcproj
index 28f45ca..1687a89 100644
--- a/linden/indra/llcommon/llcommon_vc8.vcproj
+++ b/linden/indra/llcommon/llcommon_vc8.vcproj
@@ -237,6 +237,10 @@
                                 >

                         </File>

                         <File

+                                RelativePath=".\llares.cpp"

+                                >

+                        </File>

+                        <File

                                 RelativePath=".\llassettype.cpp"

                                 >

                         </File>

@@ -447,6 +451,10 @@
                                 >

                         </File>

                         <File

+                                RelativePath=".\llares.h"

+                                >

+                        </File>

+                        <File

                                 RelativePath=".\llassettype.h"

                                 >

                         </File>

diff --git a/linden/indra/llcommon/llcriticaldamp.cpp b/linden/indra/llcommon/llcriticaldamp.cpp
index f574550..9522573 100644
--- a/linden/indra/llcommon/llcriticaldamp.cpp
+++ b/linden/indra/llcommon/llcriticaldamp.cpp
@@ -2,6 +2,8 @@
  * @file llcriticaldamp.cpp
  * @brief Implementation of the critical damping functionality.
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,10 +26,10 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
-#include <math.h>
 
 #include "llcriticaldamp.h"
 
diff --git a/linden/indra/llcommon/llcriticaldamp.h b/linden/indra/llcommon/llcriticaldamp.h
index 6a35e5e..e0b3df9 100644
--- a/linden/indra/llcommon/llcriticaldamp.h
+++ b/linden/indra/llcommon/llcriticaldamp.h
@@ -3,6 +3,8 @@
  * @brief A lightweight class that calculates critical damping constants once
  * per frame.  
  *
+ * $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_LLCRITICALDAMP_H
diff --git a/linden/indra/llcommon/lldarray.h b/linden/indra/llcommon/lldarray.h
index 7942e77..3b46706 100644
--- a/linden/indra/llcommon/lldarray.h
+++ b/linden/indra/llcommon/lldarray.h
@@ -2,6 +2,8 @@
  * @file lldarray.h
  * @brief Wrapped std::vector for backward compatibility.
  *
+ * $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_LLDARRAY_H
diff --git a/linden/indra/llcommon/lldarrayptr.h b/linden/indra/llcommon/lldarrayptr.h
index 308101c..d04bffe 100644
--- a/linden/indra/llcommon/lldarrayptr.h
+++ b/linden/indra/llcommon/lldarrayptr.h
@@ -2,6 +2,8 @@
  * @file lldarrayptr.h
  * @brief Wrapped std::vector for backward compatibility.
  *
+ * $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_LLDARRAYPTR_H
 #define LL_LLDARRAYPTR_H
diff --git a/linden/indra/llcommon/lldate.cpp b/linden/indra/llcommon/lldate.cpp
index 47e5370..37b912d 100644
--- a/linden/indra/llcommon/lldate.cpp
+++ b/linden/indra/llcommon/lldate.cpp
@@ -4,6 +4,8 @@
  * @date 2006-02-05
  * @brief Implementation of the date class
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
@@ -61,6 +64,8 @@ LLDate::LLDate(const std::string& iso8601_date)
 {
         if(!fromString(iso8601_date))
         {
+                llwarns << "date " << iso8601_date << " failed to parse; "
+                        << "ZEROING IT OUT" << llendl;
                 mSecondsSinceEpoch = DATE_EPOCH;
         }
 }
@@ -212,7 +217,7 @@ bool LLDate::fromStream(std::istream& s)
                 s >> fractional;
                 seconds_since_epoch += fractional;
         }
-        s.get(); // skip the Z
+        c = s.get(); // skip the Z
         if (c != 'Z') { return false; }
 
         mSecondsSinceEpoch = seconds_since_epoch;
diff --git a/linden/indra/llcommon/lldate.h b/linden/indra/llcommon/lldate.h
index 5d90a54..7bff18d 100644
--- a/linden/indra/llcommon/lldate.h
+++ b/linden/indra/llcommon/lldate.h
@@ -4,6 +4,8 @@
  * @date 2006-02-05
  * @brief Declaration of a simple date class.
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLDATE_H
diff --git a/linden/indra/llcommon/lldefs.h b/linden/indra/llcommon/lldefs.h
index 25f4e73..cd8c79a 100644
--- a/linden/indra/llcommon/lldefs.h
+++ b/linden/indra/llcommon/lldefs.h
@@ -2,6 +2,8 @@
  * @file lldefs.h
  * @brief Various generic constant definitions.
  *
+ * $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_LLDEFS_H
diff --git a/linden/indra/llcommon/lldepthstack.h b/linden/indra/llcommon/lldepthstack.h
index f3ea709..dbde295 100644
--- a/linden/indra/llcommon/lldepthstack.h
+++ b/linden/indra/llcommon/lldepthstack.h
@@ -2,6 +2,8 @@
  * @file lldepthstack.h
  * @brief Declaration of the LLDepthStack class
  *
+ * $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_LLDEPTHSTACK_H
diff --git a/linden/indra/llcommon/lldlinked.h b/linden/indra/llcommon/lldlinked.h
index 0e39f69..d37d11e 100644
--- a/linden/indra/llcommon/lldlinked.h
+++ b/linden/indra/llcommon/lldlinked.h
@@ -2,6 +2,8 @@
  * @file lldlinked.h
  * @brief Declaration of the LLDLinked class.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,12 +26,11 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 #ifndef LL_LLDLINKED_H
 #define LL_LLDLINKED_H
 
-#include <stdlib.h>
-
 template <class Type> class LLDLinked
 {
         LLDLinked* mNextp;
diff --git a/linden/indra/llcommon/lldqueueptr.h b/linden/indra/llcommon/lldqueueptr.h
index aca73d9..06eee34 100644
--- a/linden/indra/llcommon/lldqueueptr.h
+++ b/linden/indra/llcommon/lldqueueptr.h
@@ -2,6 +2,8 @@
  * @file lldqueueptr.h
  * @brief LLDynamicQueuePtr declaration
  *
+ * $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_LLDQUEUEPTR_H
 #define LL_LLDQUEUEPTR_H
diff --git a/linden/indra/llcommon/llendianswizzle.h b/linden/indra/llcommon/llendianswizzle.h
index d06af70..d2a9e40 100644
--- a/linden/indra/llcommon/llendianswizzle.h
+++ b/linden/indra/llcommon/llendianswizzle.h
@@ -2,6 +2,8 @@
  * @file llendianswizzle.h
  * @brief Functions for in-place bit swizzling
  *
+ * $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_LLENDIANSWIZZLE_H
diff --git a/linden/indra/llcommon/llenum.h b/linden/indra/llcommon/llenum.h
index 3e75a22..53db01d 100644
--- a/linden/indra/llcommon/llenum.h
+++ b/linden/indra/llcommon/llenum.h
@@ -3,6 +3,8 @@
  * @author Tom Yedwab
  * @brief Utility class for storing enum value <-> string lookup.
  *
+ * $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_LLENUM_H
diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp
index 714a265..22b2c9d 100644
--- a/linden/indra/llcommon/llerror.cpp
+++ b/linden/indra/llcommon/llerror.cpp
@@ -3,6 +3,8 @@
  * @date   December 2006
  * @brief error 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$
  */
 
 #include "linden_common.h"
@@ -32,34 +35,28 @@
 #include "llerror.h"
 #include "llerrorcontrol.h"
 
-#include "llapp.h"
-#include "llapr.h"
-extern apr_thread_mutex_t *gLogMutexp;
-#include "llfile.h"
-#include "llfixedbuffer.h"
-#include "lllivefile.h"
-#include "llsd.h"
-#include "llsdserialize.h"
-#include "llstl.h"
-
-#include <algorithm>
 #include <cctype>
-#include <map>
+#ifdef __GNUC__
+#include <cxxabi.h>
+#endif
 #include <sstream>
 #if !LL_WINDOWS
-#include <stdio.h>
 #include <syslog.h>
 #endif
-#include <time.h>
 #if LL_WINDOWS
 #include <windows.h>
 #endif
 #include <vector>
 
+#include "llapp.h"
+#include "llapr.h"
+#include "llfile.h"
+#include "llfixedbuffer.h"
+#include "lllivefile.h"
+#include "llsd.h"
+#include "llsdserialize.h"
+#include "llstl.h"
 
-#ifdef __GNUC__
-#include <cxxabi.h>
-#endif
 
 namespace {
 #if !LL_WINDOWS
diff --git a/linden/indra/llcommon/llerror.h b/linden/indra/llcommon/llerror.h
index 9c8d018..ae41cd5 100644
--- a/linden/indra/llcommon/llerror.h
+++ b/linden/indra/llcommon/llerror.h
@@ -3,6 +3,8 @@
  * @date   December 2006
  * @brief error 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_LLERROR_H
diff --git a/linden/indra/llcommon/llerrorcontrol.h b/linden/indra/llcommon/llerrorcontrol.h
index c09a180..528704d 100644
--- a/linden/indra/llcommon/llerrorcontrol.h
+++ b/linden/indra/llcommon/llerrorcontrol.h
@@ -3,7 +3,9 @@
  * @date   December 2006
  * @brief error message system control
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLERRORCONTROL_H
diff --git a/linden/indra/llcommon/llerrorlegacy.h b/linden/indra/llcommon/llerrorlegacy.h
index 1671d0f..cef3455 100644
--- a/linden/indra/llcommon/llerrorlegacy.h
+++ b/linden/indra/llcommon/llerrorlegacy.h
@@ -3,7 +3,9 @@
  * @date   January 2007
  * @brief old things from the older error system
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLERRORLEGACY_H
diff --git a/linden/indra/llcommon/llerrorthread.cpp b/linden/indra/llcommon/llerrorthread.cpp
index 5f7d448..66806b4 100644
--- a/linden/indra/llcommon/llerrorthread.cpp
+++ b/linden/indra/llcommon/llerrorthread.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file llerrorthread.cpp
  *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
  * Copyright (c) 2004-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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llcommon/llerrorthread.h b/linden/indra/llcommon/llerrorthread.h
index 61bcf4c..714f014 100644
--- a/linden/indra/llcommon/llerrorthread.h
+++ b/linden/indra/llcommon/llerrorthread.h
@@ -2,6 +2,8 @@
  * @file llerrorthread.h
  * @brief Specialized thread to handle runtime errors.
  *
+ * $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_LLERRORTHREAD_H
diff --git a/linden/indra/llcommon/llevent.cpp b/linden/indra/llcommon/llevent.cpp
index 9c736c8..292d090 100644
--- a/linden/indra/llcommon/llevent.cpp
+++ b/linden/indra/llcommon/llevent.cpp
@@ -2,6 +2,8 @@
  * @file llevent.cpp
  * @brief LLEvent and LLEventListener base classes.
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llcommon/llevent.h b/linden/indra/llcommon/llevent.h
index cab8817..3018cc6 100644
--- a/linden/indra/llcommon/llevent.h
+++ b/linden/indra/llcommon/llevent.h
@@ -3,6 +3,8 @@
  * @author Tom Yedwab
  * @brief LLEvent and LLEventListener base classes.
  *
+ * $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_EVENT_H
diff --git a/linden/indra/llcommon/lleventemitter.h b/linden/indra/llcommon/lleventemitter.h
index 6390d34..4129dab 100644
--- a/linden/indra/llcommon/lleventemitter.h
+++ b/linden/indra/llcommon/lleventemitter.h
@@ -2,6 +2,8 @@
  * @file lleventemitter.h
  * @brief General event emitter class
  *
+ * $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$
  */
 
 // header guard
diff --git a/linden/indra/llcommon/llextendedstatus.h b/linden/indra/llcommon/llextendedstatus.h
index a1c998f..e4266f6 100644
--- a/linden/indra/llcommon/llextendedstatus.h
+++ b/linden/indra/llcommon/llextendedstatus.h
@@ -3,7 +3,9 @@
  * @date   August 2007
  * @brief extended status codes for curl/vfs/resident asset storage and delivery
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,6 +27,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLEXTENDEDSTATUS_H
diff --git a/linden/indra/llcommon/llfasttimer.cpp b/linden/indra/llcommon/llfasttimer.cpp
index 6c0f9ac..9dc5e17 100644
--- a/linden/indra/llcommon/llfasttimer.cpp
+++ b/linden/indra/llcommon/llfasttimer.cpp
@@ -2,6 +2,8 @@
  * @file llfasttimer.cpp
  * @brief Implementation of the fast timer.
  *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
  * Copyright (c) 2004-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,25 +26,23 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 #include "linden_common.h"
 
 #include "llfasttimer.h"
+
 #include "llprocessor.h"
 
-#if LL_WINDOWS
-#include <time.h>
 
+#if LL_WINDOWS
 #elif LL_LINUX || LL_SOLARIS
-#include <time.h>
 #include <sys/time.h>
 #include <sched.h>
-
 #elif LL_DARWIN
-#       include <time.h>
-#       include <sys/time.h>
+#include <sys/time.h>
 #else 
-#       error "architecture not supported"
+#error "architecture not supported"
 #endif
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/llcommon/llfasttimer.h b/linden/indra/llcommon/llfasttimer.h
index 4182500..08edce4 100644
--- a/linden/indra/llcommon/llfasttimer.h
+++ b/linden/indra/llcommon/llfasttimer.h
@@ -2,6 +2,8 @@
  * @file llfasttimer.h
  * @brief Declaration of a fast timer.
  *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
  * Copyright (c) 2004-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_LLFASTTIMER_H
 #define LL_LLFASTTIMER_H
 
-#include "lltimer.h"
-
 #define FAST_TIMER_ON 1
 
 U64 get_cpu_clock_count();
diff --git a/linden/indra/llcommon/llfile.cpp b/linden/indra/llcommon/llfile.cpp
index 6fcfc42..eb76b20 100644
--- a/linden/indra/llcommon/llfile.cpp
+++ b/linden/indra/llcommon/llfile.cpp
@@ -5,6 +5,8 @@
  * @brief Implementation of cross-platform POSIX file buffer and c++
  * stream classes.
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llcommon/llfile.h b/linden/indra/llcommon/llfile.h
index 9e1a98a..f51cea9 100644
--- a/linden/indra/llcommon/llfile.h
+++ b/linden/indra/llcommon/llfile.h
@@ -5,6 +5,8 @@
  * @brief Declaration of cross-platform POSIX file buffer and c++
  * stream classes.
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-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_LLFILE_H
@@ -37,12 +40,6 @@
  * Attempts to mostly mirror the POSIX style IO functions.
  */
 
-#include <string>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <fstream>
-#include "stdtypes.h"
-
 typedef FILE    LLFILE;
 
 #ifdef LL_WINDOWS
@@ -56,6 +53,7 @@ typedef FILE	LLFILE;
 // windows version of stat function and stat data structure are called _stat
 typedef struct _stat    llstat;
 #else
+#include <sys/stat.h>
 typedef struct stat             llstat;
 #endif
 
diff --git a/linden/indra/llcommon/llfixedbuffer.cpp b/linden/indra/llcommon/llfixedbuffer.cpp
index 6defd92..44bb953 100644
--- a/linden/indra/llcommon/llfixedbuffer.cpp
+++ b/linden/indra/llcommon/llfixedbuffer.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file llfixedbuffer.cpp
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-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$
  */
 #include "linden_common.h"
 
diff --git a/linden/indra/llcommon/llfixedbuffer.h b/linden/indra/llcommon/llfixedbuffer.h
index fbf2338..148c0e6 100644
--- a/linden/indra/llcommon/llfixedbuffer.h
+++ b/linden/indra/llcommon/llfixedbuffer.h
@@ -2,6 +2,8 @@
  * @file llfixedbuffer.h
  * @brief A fixed size buffer of lines.
  *
+ * $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_LLFIXEDBUFFER_H
diff --git a/linden/indra/llcommon/llformat.cpp b/linden/indra/llcommon/llformat.cpp
index 6a5b531..bb0f467 100644
--- a/linden/indra/llcommon/llformat.cpp
+++ b/linden/indra/llcommon/llformat.cpp
@@ -3,7 +3,9 @@
  * @date   January 2007
  * @brief string formatting utility
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,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$
  */
 
 #include "linden_common.h"
 
 #include "llformat.h"
 
-#include <stdarg.h>
+#include <cstdarg>
 
 std::string llformat(const char *fmt, ...)
 {
diff --git a/linden/indra/llcommon/llformat.h b/linden/indra/llcommon/llformat.h
index b338591..8b8c4a4 100644
--- a/linden/indra/llcommon/llformat.h
+++ b/linden/indra/llcommon/llformat.h
@@ -3,7 +3,9 @@
  * @date   January 2007
  * @brief string formatting utility
  *
- * Copyright (c) 2007-2007, Linden Research, Inc.
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -25,13 +27,12 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLFORMAT_H
 #define LL_LLFORMAT_H
 
-#include <string>
-
 // Use as follows:
 // llinfos << llformat("Test:%d (%.2f %.2f)", idx, x, y) << llendl;
 //
diff --git a/linden/indra/llcommon/llframetimer.cpp b/linden/indra/llcommon/llframetimer.cpp
index 2b53e8c..23d8775 100644
--- a/linden/indra/llcommon/llframetimer.cpp
+++ b/linden/indra/llcommon/llframetimer.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file llframetimer.cpp
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llcommon/llframetimer.h b/linden/indra/llcommon/llframetimer.h
index de550e2..9d55fd1 100644
--- a/linden/indra/llcommon/llframetimer.h
+++ b/linden/indra/llcommon/llframetimer.h
@@ -3,6 +3,8 @@
  * @brief A lightweight timer that measures seconds and is only
  * updated once per frame.
  *
+ * $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_LLFRAMETIMER_H
diff --git a/linden/indra/llcommon/llhash.h b/linden/indra/llcommon/llhash.h
index 793783f..f4b0586 100644
--- a/linden/indra/llcommon/llhash.h
+++ b/linden/indra/llcommon/llhash.h
@@ -2,6 +2,8 @@
  * @file llhash.h
  * @brief Wrapper for a hash function.
  *
+ * $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_LLHASH_H
diff --git a/linden/indra/llcommon/llindexedqueue.h b/linden/indra/llcommon/llindexedqueue.h
index 13e9f7a..d689f1c 100644
--- a/linden/indra/llcommon/llindexedqueue.h
+++ b/linden/indra/llcommon/llindexedqueue.h
@@ -3,6 +3,8 @@
  * @brief An indexed FIFO queue, where only one element with each key
  * can be in the queue.
  *
+ * $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_LLINDEXEDQUEUE_H
diff --git a/linden/indra/llcommon/lllinkedqueue.h b/linden/indra/llcommon/lllinkedqueue.h
index 9ce5a1b..dcd13a2 100644
--- a/linden/indra/llcommon/lllinkedqueue.h
+++ b/linden/indra/llcommon/lllinkedqueue.h
@@ -2,6 +2,8 @@
  * @file lllinkedqueue.h
  * @brief Declaration of linked queue classes.
  *
+ * $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_LLLINKEDQUEUE_H
diff --git a/linden/indra/llcommon/llliveappconfig.cpp b/linden/indra/llcommon/llliveappconfig.cpp
index 7923126..7643277 100644
--- a/linden/indra/llcommon/llliveappconfig.cpp
+++ b/linden/indra/llcommon/llliveappconfig.cpp
@@ -2,6 +2,8 @@
  * @file llliveappconfig.cpp
  * @brief Configuration information for an LLApp that overrides indra.xml
  *
+ * $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/llcommon/llliveappconfig.h b/linden/indra/llcommon/llliveappconfig.h
index f5c73d0..dd6dbfb 100644
--- a/linden/indra/llcommon/llliveappconfig.h
+++ b/linden/indra/llcommon/llliveappconfig.h
@@ -2,6 +2,8 @@
  * @file llliveappconfig.h
  * @brief Configuration information for an LLApp that overrides indra.xml
  *
+ * $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 LLLIVEAPPCONFIG_H
diff --git a/linden/indra/llcommon/lllivefile.cpp b/linden/indra/llcommon/lllivefile.cpp
index 17fe210..cb3ce0f 100644
--- a/linden/indra/llcommon/lllivefile.cpp
+++ b/linden/indra/llcommon/lllivefile.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file lllivefile.cpp
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llcommon/lllivefile.h b/linden/indra/llcommon/lllivefile.h
index d8381bf..689590e 100644
--- a/linden/indra/llcommon/lllivefile.h
+++ b/linden/indra/llcommon/lllivefile.h
@@ -2,6 +2,8 @@
  * @file lllivefile.h
  * @brief Automatically reloads a file whenever it changes or is removed.
  *
+ * $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_LLLIVEFILE_H
diff --git a/linden/indra/llcommon/lllocalidhashmap.h b/linden/indra/llcommon/lllocalidhashmap.h
index aae0bd9..12df73d 100644
--- a/linden/indra/llcommon/lllocalidhashmap.h
+++ b/linden/indra/llcommon/lllocalidhashmap.h
@@ -2,6 +2,8 @@
  * @file lllocalidhashmap.h
  * @brief Map specialized for dealing with local ids
  *
+ * $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_LLLOCALIDHASHMAP_H
diff --git a/linden/indra/llcommon/lllslconstants.h b/linden/indra/llcommon/lllslconstants.h
index 372c54e..c970161 100644
--- a/linden/indra/llcommon/lllslconstants.h
+++ b/linden/indra/llcommon/lllslconstants.h
@@ -3,6 +3,8 @@
  * @author James Cook
  * @brief Constants used in lsl.
  *
+ * $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_LLLSLCONSTANTS_H
diff --git a/linden/indra/llcommon/llmap.h b/linden/indra/llcommon/llmap.h
index 65e3da7..9ad93b2 100644
--- a/linden/indra/llcommon/llmap.h
+++ b/linden/indra/llcommon/llmap.h
@@ -2,6 +2,8 @@
  * @file llmap.h
  * @brief LLMap class header file
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,15 +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_LLMAP_H
 #define LL_LLMAP_H
 
-#include <stdio.h>
-#include <utility>
-#include <map>
-
 // llmap uses the fast stl library code in a manner consistant with LLSkipMap, et. al. 
 
 template<class INDEX_TYPE, class MAPPED_TYPE> class LLMap
diff --git a/linden/indra/llcommon/llmemory.cpp b/linden/indra/llcommon/llmemory.cpp
index 65f3409..e52a137 100644
--- a/linden/indra/llcommon/llmemory.cpp
+++ b/linden/indra/llcommon/llmemory.cpp
@@ -2,6 +2,8 @@
  * @file llmemory.cpp
  * @brief Very special memory allocation/deallocation stuff here
  *
+ * $LicenseInfo:firstyear=2002&license=viewergpl$
+ * 
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,10 +26,26 @@
  * 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"
 
+#if defined(LL_WINDOWS)
+# include <windows.h>
+# include <psapi.h>
+#elif defined(LL_DARWIN)
+# include <sys/types.h>
+# include <sys/sysctl.h>
+# include <mach/task.h>
+# include <mach/vm_map.h>
+# include <mach/mach_init.h>
+# include <mach/vm_region.h>
+# include <mach/mach_port.h>
+#elif defined(LL_LINUX)
+# include <unistd.h>
+#endif
+
 #include "llmemory.h"
 #include "llmemtype.h"
 
@@ -278,3 +296,131 @@ LLRefCount::~LLRefCount()
         
 //----------------------------------------------------------------------------
 
+#if defined(LL_WINDOWS)
+
+U64 getCurrentRSS()
+{
+        HANDLE self = GetCurrentProcess();
+        PROCESS_MEMORY_COUNTERS counters;
+        
+        if (!GetProcessMemoryInfo(self, &counters, sizeof(counters)))
+        {
+                llwarns << "GetProcessMemoryInfo failed" << llendl;
+                return 0;
+        }
+
+        return counters.WorkingSetSize;
+}
+
+#elif defined(LL_DARWIN)
+
+static U32 getPageSize()
+{
+        int ctl[2] = { CTL_HW, HW_PAGESIZE };
+        int page_size;
+        size_t size = sizeof(page_size);
+
+        if (sysctl(ctl, 2, &page_size, &size, NULL, 0) == -1)
+        {
+                llwarns << "Couldn't get page size" << llendl;
+                return 0;
+        } else {
+                return page_size;
+        }
+}
+
+U64 getCurrentRSS()
+{
+        task_t task = mach_task_self();
+        vm_address_t addr = VM_MIN_ADDRESS;
+        vm_size_t size = 0;
+        U64 residentPages = 0;
+
+        while (true)
+        {
+                mach_msg_type_number_t bcount = VM_REGION_BASIC_INFO_COUNT;
+                vm_region_basic_info binfo;
+                mach_port_t bobj;
+                kern_return_t ret;
+                
+                addr += size;
+                
+                ret = vm_region(task, &addr, &size, VM_REGION_BASIC_INFO,
+                                                (vm_region_info_t) &binfo, &bcount, &bobj);
+                
+                if (ret != KERN_SUCCESS)
+                {
+                        break;
+                }
+                
+                if (bobj != MACH_PORT_NULL)
+                {
+                        mach_port_deallocate(task, bobj);
+                }
+                
+                mach_msg_type_number_t ecount = VM_REGION_EXTENDED_INFO_COUNT;
+                vm_region_extended_info einfo;
+                mach_port_t eobj;
+
+                ret = vm_region(task, &addr, &size, VM_REGION_EXTENDED_INFO,
+                                                (vm_region_info_t) &einfo, &ecount, &eobj);
+
+                if (ret != KERN_SUCCESS)
+                {
+                        llwarns << "vm_region failed" << llendl;
+                        return 0;
+                }
+                
+                if (eobj != MACH_PORT_NULL)
+                {
+                        mach_port_deallocate(task, eobj);
+                }
+
+                residentPages += einfo.pages_resident;
+        }
+
+        return residentPages * getPageSize();
+}
+
+#elif defined(LL_LINUX)
+
+U64 getCurrentRSS()
+{
+        static const char statPath[] = "/proc/self/stat";
+        FILE *fp = fopen(statPath, "r");
+        U64 rss = 0;
+
+        if (fp == NULL)
+        {
+                llwarns << "couldn't open " << statPath << llendl;
+                goto bail;
+        }
+
+        // Eee-yew!      See Documentation/filesystems/proc.txt in your
+        // nearest friendly kernel tree for details.
+        
+        {
+                int ret = fscanf(fp, "%*d (%*[^)]) %*c %*d %*d %*d %*d %*d %*d %*d "
+                                                 "%*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %Lu",
+                                                 &rss);
+                if (ret != 1)
+                {
+                        llwarns << "couldn't parse contents of " << statPath << llendl;
+                        rss = 0;
+                }
+        }
+        
+        fclose(fp);
+
+bail:
+        return rss;
+}
+
+#else
+
+U64 getCurrentRSS()
+{
+        return 0;
+}
+
+#endif
diff --git a/linden/indra/llcommon/llmemory.h b/linden/indra/llcommon/llmemory.h
index b6f42e3..b72046c 100644
--- a/linden/indra/llcommon/llmemory.h
+++ b/linden/indra/llcommon/llmemory.h
@@ -2,6 +2,8 @@
  * @file llmemory.h
  * @brief Memory allocation/deallocation header-stuff goes here.
  *
+ * $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_MEMORY_H
 #define LL_MEMORY_H
@@ -415,5 +418,8 @@ public:
 
 //----------------------------------------------------------------------------
 
-#endif
+// Return the resident set size of the current process, in bytes.
+// Return value is zero if not known.
+U64 getCurrentRSS();
 
+#endif
diff --git a/linden/indra/llcommon/llmemorystream.cpp b/linden/indra/llcommon/llmemorystream.cpp
index ac9e61c..e487252 100644
--- a/linden/indra/llcommon/llmemorystream.cpp
+++ b/linden/indra/llcommon/llmemorystream.cpp
@@ -4,6 +4,8 @@
  * @date 2005-06-03
  * @brief Buffer and stream for a fixed linear memory segment.
  *
+ * $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/llcommon/llmemorystream.h b/linden/indra/llcommon/llmemorystream.h
index f00bc28..317e86d 100644
--- a/linden/indra/llcommon/llmemorystream.h
+++ b/linden/indra/llcommon/llmemorystream.h
@@ -4,6 +4,8 @@
  * @date 2005-06-03
  * @brief Implementation of a simple fixed memory stream
  *
+ * $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_LLMEMORYSTREAM_H
diff --git a/linden/indra/llcommon/llmemtype.h b/linden/indra/llcommon/llmemtype.h
index 9bab72e..9bf6cad 100644
--- a/linden/indra/llcommon/llmemtype.h
+++ b/linden/indra/llcommon/llmemtype.h
@@ -2,6 +2,8 @@
  * @file llmemtype.h
  * @brief Runtime memory usage debugging utilities.
  *
+ * $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_MEMTYPE_H
diff --git a/linden/indra/llcommon/llmetrics.cpp b/linden/indra/llcommon/llmetrics.cpp
index 74bd13d..90a0517 100644
--- a/linden/indra/llcommon/llmetrics.cpp
+++ b/linden/indra/llcommon/llmetrics.cpp
@@ -4,7 +4,9 @@
  * @date 2007-05-25
  * @brief Metrics accumulation and associated functions
  *
- * 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/llcommon/llmetrics.h b/linden/indra/llcommon/llmetrics.h
index 2c216c3..f19bce5 100644
--- a/linden/indra/llcommon/llmetrics.h
+++ b/linden/indra/llcommon/llmetrics.h
@@ -4,7 +4,9 @@
  * @date 2007-05-25
  * @brief Declaration of metrics accumulation and associated functions
  *
- * 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$
  */
 
 #ifndef LL_LLMETRICS_H
diff --git a/linden/indra/llcommon/llmortician.cpp b/linden/indra/llcommon/llmortician.cpp
index be362bf..cab3a7f 100644
--- a/linden/indra/llcommon/llmortician.cpp
+++ b/linden/indra/llcommon/llmortician.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file llmortician.cpp
  *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
  * Copyright (c) 2005-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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llcommon/llmortician.h b/linden/indra/llcommon/llmortician.h
index 353f263..24a3852 100644
--- a/linden/indra/llcommon/llmortician.h
+++ b/linden/indra/llcommon/llmortician.h
@@ -2,6 +2,8 @@
  * @file llmortician.h
  * @brief Base class for delayed deletions.
  *
+ * $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 LLMORTICIAN_H
diff --git a/linden/indra/llcommon/llnametable.h b/linden/indra/llcommon/llnametable.h
index c3bdfbd..fd6f879 100644
--- a/linden/indra/llcommon/llnametable.h
+++ b/linden/indra/llcommon/llnametable.h
@@ -2,6 +2,8 @@
  * @file llnametable.h
  * @brief LLNameTable class is a table to associate pointers with string names
  *
+ * $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_LLNAMETABLE_H
diff --git a/linden/indra/llcommon/llpreprocessor.h b/linden/indra/llcommon/llpreprocessor.h
index f19d5a0..b3b79d0 100644
--- a/linden/indra/llcommon/llpreprocessor.h
+++ b/linden/indra/llcommon/llpreprocessor.h
@@ -3,6 +3,8 @@
  * @brief This file should be included in all Linden Lab files and
  * should only contain special preprocessor directives
  *
+ * $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 LLPREPROCESSOR_H
diff --git a/linden/indra/llcommon/llpriqueuemap.h b/linden/indra/llcommon/llpriqueuemap.h
index deda338..96da935 100644
--- a/linden/indra/llcommon/llpriqueuemap.h
+++ b/linden/indra/llcommon/llpriqueuemap.h
@@ -2,6 +2,8 @@
  * @file llpriqueuemap.h
  * @brief Priority queue implementation
  *
+ * $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_LLPRIQUEUEMAP_H
 #define LL_LLPRIQUEUEMAP_H
diff --git a/linden/indra/llcommon/llprocessor.cpp b/linden/indra/llcommon/llprocessor.cpp
index 4d00ab5..4977ead 100644
--- a/linden/indra/llcommon/llprocessor.cpp
+++ b/linden/indra/llcommon/llprocessor.cpp
@@ -2,6 +2,8 @@
  * @file llprocessor.cpp
  * @brief Code to figure out the processor. Originally by Benjamin Jurke.
  *
+ * $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$
  */
 
 // Filename: Processor.cpp
@@ -48,9 +51,7 @@
 
 #include "processor.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <memory.h>
+#include <memory>
 
 #if LL_WINDOWS
 #       define WIN32_LEAN_AND_MEAN
diff --git a/linden/indra/llcommon/llprocessor.h b/linden/indra/llcommon/llprocessor.h
index 79dd1e8..6b966c5 100644
--- a/linden/indra/llcommon/llprocessor.h
+++ b/linden/indra/llcommon/llprocessor.h
@@ -2,6 +2,8 @@
  * @file llprocessor.h
  * @brief Code to figure out the processor. Originally by Benjamin Jurke.
  *
+ * $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$
  */
 
 // Author: Benjamin Jurke
diff --git a/linden/indra/llcommon/llptrskiplist.h b/linden/indra/llcommon/llptrskiplist.h
index f695f88..81c8ca3 100644
--- a/linden/indra/llcommon/llptrskiplist.h
+++ b/linden/indra/llcommon/llptrskiplist.h
@@ -2,6 +2,8 @@
  * @file llptrskiplist.h
  * @brief Skip list 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$
  */
 
 #ifndef LL_LLPTRSKIPLIST_H
diff --git a/linden/indra/llcommon/llptrskipmap.h b/linden/indra/llcommon/llptrskipmap.h
index e2fdc7f..e505004 100644
--- a/linden/indra/llcommon/llptrskipmap.h
+++ b/linden/indra/llcommon/llptrskipmap.h
@@ -3,6 +3,8 @@
  * @brief Just like a LLSkipMap, but since it's pointers, you can call
  * deleteAllData
  *
+ * $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_LLPTRSKIPMAP_H
 #define LL_LLPTRSKIPMAP_H
diff --git a/linden/indra/llcommon/llqueuedthread.cpp b/linden/indra/llcommon/llqueuedthread.cpp
index 7eaaf68..8dfba0b 100644
--- a/linden/indra/llcommon/llqueuedthread.cpp
+++ b/linden/indra/llcommon/llqueuedthread.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file llqueuedthread.cpp
  *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
  * Copyright (c) 2004-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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llcommon/llqueuedthread.h b/linden/indra/llcommon/llqueuedthread.h
index 18a44c5..a5919c8 100644
--- a/linden/indra/llcommon/llqueuedthread.h
+++ b/linden/indra/llcommon/llqueuedthread.h
@@ -2,6 +2,8 @@
  * @file llqueuedthread.h
  * @brief
  *
+ * $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_LLQUEUEDTHREAD_H
diff --git a/linden/indra/llcommon/llrun.cpp b/linden/indra/llcommon/llrun.cpp
index 131030e..5d0e98a 100644
--- a/linden/indra/llcommon/llrun.cpp
+++ b/linden/indra/llcommon/llrun.cpp
@@ -4,6 +4,8 @@
  * @date 2006-02-16
  * @brief Implementation of the LLRunner and related classes
  *
+ * $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/llcommon/llrun.h b/linden/indra/llcommon/llrun.h
index 649c7b0..1c9f6c1 100644
--- a/linden/indra/llcommon/llrun.h
+++ b/linden/indra/llcommon/llrun.h
@@ -4,6 +4,8 @@
  * @date 2006-02-16
  * @brief Declaration of LLRunner and LLRunnable classes.
  *
+ * $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_LLRUN_H
diff --git a/linden/indra/llcommon/llsd.cpp b/linden/indra/llcommon/llsd.cpp
index f6d8d0e..305531b 100644
--- a/linden/indra/llcommon/llsd.cpp
+++ b/linden/indra/llcommon/llsd.cpp
@@ -2,6 +2,8 @@
  * @file llsd.cpp
  * @brief LLSD flexible data system
  *
+ * $LicenseInfo:firstyear=2005&license=viewergpl$
+ * 
  * Copyright (c) 2005-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$
  */
 
 #include "linden_common.h"
 #include "llsd.h"
 
-#include <sstream>
-#include <math.h>
-
 #include "llerror.h"
 #include "../llmath/llmath.h"
 #include "llformat.h"
diff --git a/linden/indra/llcommon/llsd.h b/linden/indra/llcommon/llsd.h
index bd24ecf..1fb917f 100644
--- a/linden/indra/llcommon/llsd.h
+++ b/linden/indra/llcommon/llsd.h
@@ -2,6 +2,8 @@
  * @file llsd.h
  * @brief LLSD flexible data system.
  *
+ * $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_LLSD_NEW_H
diff --git a/linden/indra/llcommon/llsdserialize.cpp b/linden/indra/llcommon/llsdserialize.cpp
index d262ca1..a7470be 100644
--- a/linden/indra/llcommon/llsdserialize.cpp
+++ b/linden/indra/llcommon/llsdserialize.cpp
@@ -4,6 +4,8 @@
  * @date 2006-03-05
  * @brief Implementation of LLSD parsers and formatters
  *
+ * $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/llcommon/llsdserialize.h b/linden/indra/llcommon/llsdserialize.h
index 4a73b60..b4d6683 100644
--- a/linden/indra/llcommon/llsdserialize.h
+++ b/linden/indra/llcommon/llsdserialize.h
@@ -4,6 +4,8 @@
  * @date 2006-02-26
  * @brief Declaration of parsers and formatters for LLSD
  *
+ * $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_LLSDSERIALIZE_H
diff --git a/linden/indra/llcommon/llsdserialize_xml.cpp b/linden/indra/llcommon/llsdserialize_xml.cpp
index 6d2f583..6232622 100644
--- a/linden/indra/llcommon/llsdserialize_xml.cpp
+++ b/linden/indra/llcommon/llsdserialize_xml.cpp
@@ -2,6 +2,8 @@
  * @file llsdserialize_xml.cpp
  * @brief XML parsers and formatters for LLSD
  *
+ * $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/llcommon/llsdserialize_xml.h b/linden/indra/llcommon/llsdserialize_xml.h
index 0546ea4..bb55a46 100644
--- a/linden/indra/llcommon/llsdserialize_xml.h
+++ b/linden/indra/llcommon/llsdserialize_xml.h
@@ -2,6 +2,8 @@
  * @file llsdserialize_xml.h
  * @brief XML parsers and formatters for LLSD
  *
+ * $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_LLSDSERIALIZE_XML_H
diff --git a/linden/indra/llcommon/llsdutil.cpp b/linden/indra/llcommon/llsdutil.cpp
index 0e23054..a0f337c 100644
--- a/linden/indra/llcommon/llsdutil.cpp
+++ b/linden/indra/llcommon/llsdutil.cpp
@@ -4,6 +4,8 @@
  * @date 2006-05-24
  * @brief Implementation of classes, functions, etc, for using structured data.
  *
+ * $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/llcommon/llsdutil.h b/linden/indra/llcommon/llsdutil.h
index 38a7b83..699d509 100644
--- a/linden/indra/llcommon/llsdutil.h
+++ b/linden/indra/llcommon/llsdutil.h
@@ -4,6 +4,8 @@
  * @date 2006-05-24
  * @brief Utility classes, functions, etc, for using structured data.
  *
+ * $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_LLSDUTIL_H
diff --git a/linden/indra/llcommon/llsecondlifeurls.cpp b/linden/indra/llcommon/llsecondlifeurls.cpp
index 53a1906..4417b09 100644
--- a/linden/indra/llcommon/llsecondlifeurls.cpp
+++ b/linden/indra/llcommon/llsecondlifeurls.cpp
@@ -2,6 +2,8 @@
  * @file llsecondlifeurls.cpp
  * @brief Urls used in the product
  *
+ * $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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llcommon/llsecondlifeurls.h b/linden/indra/llcommon/llsecondlifeurls.h
index d4d296b..0eb3d64 100644
--- a/linden/indra/llcommon/llsecondlifeurls.h
+++ b/linden/indra/llcommon/llsecondlifeurls.h
@@ -2,6 +2,8 @@
  * @file llsecondlifeurls.h
  * @brief Global URLs to pages on our web site
  *
+ * $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_LLSECONDLIFEURLS_H
diff --git a/linden/indra/llcommon/llsimplehash.h b/linden/indra/llcommon/llsimplehash.h
index 4e0d5ea..ae5a31e 100644
--- a/linden/indra/llcommon/llsimplehash.h
+++ b/linden/indra/llcommon/llsimplehash.h
@@ -1,6 +1,8 @@
 /** 
  * @file llsimplehash.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 LL_LLSIMPLEHASH_H
diff --git a/linden/indra/llcommon/llskiplist.h b/linden/indra/llcommon/llskiplist.h
index 40d0c8a..314043e 100644
--- a/linden/indra/llcommon/llskiplist.h
+++ b/linden/indra/llcommon/llskiplist.h
@@ -2,6 +2,8 @@
  * @file llskiplist.h
  * @brief skip list 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$
  */
 #ifndef LL_LLSKIPLIST_H
 #define LL_LLSKIPLIST_H
diff --git a/linden/indra/llcommon/llskipmap.h b/linden/indra/llcommon/llskipmap.h
index c2c0092..65e1617 100644
--- a/linden/indra/llcommon/llskipmap.h
+++ b/linden/indra/llcommon/llskipmap.h
@@ -2,6 +2,8 @@
  * @file llskipmap.h
  * @brief Associative container based on the skiplist algorithm.
  *
+ * $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_LLSKIPMAP_H
diff --git a/linden/indra/llcommon/llstack.h b/linden/indra/llcommon/llstack.h
index 36c2e1e..5fb65f2 100644
--- a/linden/indra/llcommon/llstack.h
+++ b/linden/indra/llcommon/llstack.h
@@ -2,6 +2,8 @@
  * @file llstack.h
  * @brief LLStack template class
  *
+ * $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_LLSTACK_H
diff --git a/linden/indra/llcommon/llstat.cpp b/linden/indra/llcommon/llstat.cpp
index 7e6090f..e999934 100644
--- a/linden/indra/llcommon/llstat.cpp
+++ b/linden/indra/llcommon/llstat.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file llstat.cpp
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llcommon/llstat.h b/linden/indra/llcommon/llstat.h
index 9266b60..e20c01f 100644
--- a/linden/indra/llcommon/llstat.h
+++ b/linden/indra/llcommon/llstat.h
@@ -2,6 +2,8 @@
  * @file llstat.h
  * @brief Runtime statistics accumulation.
  *
+ * $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_LLSTAT_H
diff --git a/linden/indra/llcommon/llstatenums.h b/linden/indra/llcommon/llstatenums.h
index fc618df..e9876f8 100644
--- a/linden/indra/llcommon/llstatenums.h
+++ b/linden/indra/llcommon/llstatenums.h
@@ -1,6 +1,8 @@
 /** 
  * @file llstatenums.h
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-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 LL_LLSTATENUMS_H
diff --git a/linden/indra/llcommon/llstl.h b/linden/indra/llcommon/llstl.h
index 06980a1..b692dae 100644
--- a/linden/indra/llcommon/llstl.h
+++ b/linden/indra/llcommon/llstl.h
@@ -2,6 +2,8 @@
  * @file llstl.h
  * @brief helper object & functions for use with the stl.
  *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
  * Copyright (c) 2003-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,21 +26,16 @@
  * 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_LLSTL_H
 #define LL_LLSTL_H
 
 #include <functional>
-#include <algorithm>
-#include <map>
-#include <vector>
 #include <set>
 #include <deque>
 
-#include <stdio.h>
-#include <stdarg.h>
-
 // Use to compare the first element only of a pair
 // e.g. typedef std::set<std::pair<int, Data*>, compare_pair<int, Data*> > some_pair_set_t; 
 template <typename T1, typename T2>
diff --git a/linden/indra/llcommon/llstreamtools.cpp b/linden/indra/llcommon/llstreamtools.cpp
index e6cd909..bfe1765 100644
--- a/linden/indra/llcommon/llstreamtools.cpp
+++ b/linden/indra/llcommon/llstreamtools.cpp
@@ -2,6 +2,8 @@
  * @file llstreamtools.cpp
  * @brief some helper functions for parsing legacy simstate and asset files.
  *
+ * $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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llcommon/llstreamtools.h b/linden/indra/llcommon/llstreamtools.h
index d64bd57..0708447 100644
--- a/linden/indra/llcommon/llstreamtools.h
+++ b/linden/indra/llcommon/llstreamtools.h
@@ -2,6 +2,8 @@
  * @file llstreamtools.h
  * @brief some helper functions for parsing legacy simstate and asset files.
  *
+ * $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_STREAM_TOOLS_H
diff --git a/linden/indra/llcommon/llstrider.h b/linden/indra/llcommon/llstrider.h
index 707d10e..e619ceb 100644
--- a/linden/indra/llcommon/llstrider.h
+++ b/linden/indra/llcommon/llstrider.h
@@ -1,6 +1,8 @@
 /** 
  * @file llstrider.h
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-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 LL_LLSTRIDER_H
diff --git a/linden/indra/llcommon/llstring.cpp b/linden/indra/llcommon/llstring.cpp
index b5e307f..6dab598 100644
--- a/linden/indra/llcommon/llstring.cpp
+++ b/linden/indra/llcommon/llstring.cpp
@@ -2,6 +2,8 @@
  * @file llstring.cpp
  * @brief String utility functions and the LLString class.
  *
+ * $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"
@@ -55,6 +58,26 @@ U8 hex_as_nybble(char hex)
 }
 
 
+bool _read_file_into_string(std::string& str, const char* filename)
+{
+        llifstream ifs(filename, llifstream::binary);
+        if (!ifs.is_open())
+        {
+                llinfos << "Unable to open file" << filename << llendl;
+                return false;
+        }
+
+        std::ostringstream oss;
+
+        oss << ifs.rdbuf();
+        str = oss.str();
+        ifs.close();
+        return true;
+}
+
+
+
+
 // See http://www.unicode.org/Public/BETA/CVTUTF-1-2/ConvertUTF.c
 // for the Unicode implementation - this doesn't match because it was written before finding
 // it.
diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index 5f48580..70f7d54 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -2,6 +2,8 @@
  * @file llstring.h
  * @brief String utility functions and LLString class.
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,22 +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_LLSTRING_H
 #define LL_LLSTRING_H
 
-#include "stdtypes.h"
-#include "llerror.h"
-#include "llfile.h"
-#include <algorithm>
-#include <map>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <math.h>
-#include <stdarg.h> /* for vsnprintf */
 #if LL_LINUX || LL_SOLARIS
 #include <wctype.h>
 #include <wchar.h>
@@ -280,9 +272,6 @@ public:
          */
         static void _makeASCII(std::basic_string<T>& string);
 
-        static BOOL     read(std::basic_string<T>& string, const char* filename);        /*Flawfinder: ignore*/
-        static BOOL     write(std::basic_string<T>& string, const char* filename);
-
         // Conversion to other data types
         static BOOL     convertToBOOL(const std::basic_string<T>& string, BOOL& value);
         static BOOL     convertToU8(const std::basic_string<T>& string, U8& value);
@@ -332,6 +321,18 @@ template<class T> LLStringBase<T> LLStringBase<T>::null;
 typedef LLStringBase<char> LLString;
 typedef LLStringBase<llwchar> LLWString;
 
+//@ Use this where we want to disallow input in the form of "foo"
+//  This is used to catch places where english text is embedded in the code
+//  instead of in a translatable XUI file.
+class LLStringExplicit : public LLString
+{
+public:
+        explicit LLStringExplicit(const char* s) : LLString(s) {}
+        LLStringExplicit(const LLString& s) : LLString(s) {}
+        LLStringExplicit(const std::string& s) : LLString(s) {}
+        LLStringExplicit(const std::string& s, size_type pos, size_type n = std::string::npos) : LLString(s, pos, n) {}
+};
+
 struct LLDictionaryLess
 {
 public:
@@ -347,7 +348,7 @@ public:
  */
 
 /**
- * @breif chop off the trailing characters in a string.
+ * @brief chop off the trailing characters in a string.
  *
  * This function works on bytes rather than glyphs, so this will
  * incorrectly truncate non-single byte strings.
@@ -373,6 +374,16 @@ std::string ll_safe_string(const char* in);
  */
 U8 hex_as_nybble(char hex);
 
+/**
+ * @brief read the contents of a file into a string.
+ *
+ * Since this function has no concept of character encoding, most
+ * anything you do with this method ill-advised. Please avoid.
+ * @param str [out] The string which will have.
+ * @param filename The full name of the file to read.
+ * @return Returns true on success. If false, str is unmodified.
+ */
+bool _read_file_into_string(std::string& str, const char* filename);
 
 /**
  * Unicode support
@@ -933,8 +944,6 @@ void LLStringBase<T>::replaceNonstandardASCII( std::basic_string<T>& string, T r
 template<class T> 
 void LLStringBase<T>::replaceTabsWithSpaces( std::basic_string<T>& str, size_type spaces_per_tab )
 {
-        llassert( spaces_per_tab >= 0 );
-
         const T TAB = '\t';
         const T SPACE = ' ';
 
@@ -1037,11 +1046,10 @@ void LLStringBase<T>::copy( T* dst, const T* src, size_type dst_size )
 template<class T> 
 void LLStringBase<T>::copyInto(std::basic_string<T>& dst, const std::basic_string<T>& src, size_type offset)
 {
-        llassert( offset <= dst.length() );
-
-        // special case - append to end of string and avoid expensive (when strings are large) string manipulations
         if ( offset == dst.length() )
         {
+                // special case - append to end of string and avoid expensive
+                // (when strings are large) string manipulations
                 dst += src;
         }
         else
@@ -1070,48 +1078,6 @@ BOOL LLStringBase<T>::isHead( const std::basic_string<T>& string, const T* s )
         }
 }
 
-//static
-template<class T> 
-BOOL LLStringBase<T>::read(std::basic_string<T>& string, const char* filename)   /*Flawfinder: ignore*/
-{
-        llifstream ifs(filename, llifstream::binary);
-        if (!ifs.is_open())
-        {
-                llinfos << "Unable to open file" << filename << llendl;
-                return FALSE;
-        }
-
-        std::basic_ostringstream<T> oss;
-
-        oss << ifs.rdbuf();
-
-        string = oss.str();
-
-        ifs.close();
-        return TRUE;
-}
-
-//static
-template<class T> 
-BOOL LLStringBase<T>::write(std::basic_string<T>& string, const char* filename)
-{
-#if LL_LINUX  || LL_SOLARIS
-    printf("STUBBED: LLStringBase<T>::write at %s:%d\n", __FILE__, __LINE__);
-#else
-        llofstream ofs(filename, llofstream::binary);
-        if (!ofs.is_open())
-        {
-                llinfos << "Unable to open file" << filename << llendl;
-                return FALSE;
-        }
-
-        ofs << string;
-
-        ofs.close();
-#endif
-        return TRUE;
-}
-
 template<class T> 
 BOOL LLStringBase<T>::convertToBOOL(const std::basic_string<T>& string, BOOL& value)
 {
diff --git a/linden/indra/llcommon/llstringtable.cpp b/linden/indra/llcommon/llstringtable.cpp
index 30db4f7..f6da802 100644
--- a/linden/indra/llcommon/llstringtable.cpp
+++ b/linden/indra/llcommon/llstringtable.cpp
@@ -3,6 +3,8 @@
  * @brief The LLStringTable class provides a _fast_ method for finding
  * unique copies of strings.
  *
+ * $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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llcommon/llstringtable.h b/linden/indra/llcommon/llstringtable.h
index 8d91680..b7412ef 100644
--- a/linden/indra/llcommon/llstringtable.h
+++ b/linden/indra/llcommon/llstringtable.h
@@ -3,6 +3,8 @@
  * @brief The LLStringTable class provides a _fast_ method for finding
  * unique copies of strings.
  *
+ * $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_STRING_TABLE_H
diff --git a/linden/indra/llcommon/llsys.cpp b/linden/indra/llcommon/llsys.cpp
index 95b6b55..3b57db7 100644
--- a/linden/indra/llcommon/llsys.cpp
+++ b/linden/indra/llcommon/llsys.cpp
@@ -2,6 +2,8 @@
  * @file llsys.cpp
  * @brief Impelementation of the basic system query functions.
  *
+ * $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"
@@ -44,10 +47,12 @@
 #       include <winsock2.h>
 #       include <windows.h>
 #elif LL_DARWIN
+#       include <errno.h>
 #       include <sys/sysctl.h>
 #       include <sys/utsname.h>
 #       include <stdint.h>
 #elif LL_LINUX
+#       include <errno.h>
 #       include <sys/utsname.h>
 #       include <unistd.h>
 #       include <sys/sysinfo.h>
diff --git a/linden/indra/llcommon/llsys.h b/linden/indra/llcommon/llsys.h
index 66a3465..fc4e027 100644
--- a/linden/indra/llcommon/llsys.h
+++ b/linden/indra/llcommon/llsys.h
@@ -2,6 +2,8 @@
  * @file llsys.h
  * @brief System information debugging classes.
  *
+ * $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_SYS_H
diff --git a/linden/indra/llcommon/llthread.cpp b/linden/indra/llcommon/llthread.cpp
index d261c8b..ea877bd 100644
--- a/linden/indra/llcommon/llthread.cpp
+++ b/linden/indra/llcommon/llthread.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file llthread.cpp
  *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
  * Copyright (c) 2004-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$
  */
 
 #include "linden_common.h"
@@ -266,7 +269,7 @@ LLMutex::LLMutex(apr_pool_t *poolp) :
                 mIsLocalPool = TRUE;
                 apr_pool_create(&mAPRPoolp, NULL); // Create a subpool for this thread
         }
-        apr_thread_mutex_create(&mAPRMutexp, APR_THREAD_MUTEX_DEFAULT, mAPRPoolp);
+        apr_thread_mutex_create(&mAPRMutexp, APR_THREAD_MUTEX_UNNESTED, mAPRPoolp);
 }
 
 
diff --git a/linden/indra/llcommon/llthread.h b/linden/indra/llcommon/llthread.h
index d700592..8106c08 100644
--- a/linden/indra/llcommon/llthread.h
+++ b/linden/indra/llcommon/llthread.h
@@ -2,6 +2,8 @@
  * @file llthread.h
  * @brief Base classes for thread, mutex and condition handling.
  *
+ * $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_LLTHREAD_H
diff --git a/linden/indra/llcommon/lltimer.cpp b/linden/indra/llcommon/lltimer.cpp
index 177f1de..9786d44 100644
--- a/linden/indra/llcommon/lltimer.cpp
+++ b/linden/indra/llcommon/lltimer.cpp
@@ -2,6 +2,8 @@
  * @file lltimer.cpp
  * @brief Cross-platform objects for doing timing 
  *
+ * $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"
@@ -36,13 +39,10 @@
 #       define WIN32_LEAN_AND_MEAN
 #       include <winsock2.h>
 #       include <windows.h>
-#       include <time.h>
 #elif LL_LINUX || LL_SOLARIS
-#       include <time.h>
 #       include <sys/time.h>
 #       include <sched.h>
 #elif LL_DARWIN
-#       include <time.h>
 #       include <sys/time.h>
 #else 
 #       error "architecture not supported"
diff --git a/linden/indra/llcommon/lltimer.h b/linden/indra/llcommon/lltimer.h
index 35f0a7b..4ffb9c8 100644
--- a/linden/indra/llcommon/lltimer.h
+++ b/linden/indra/llcommon/lltimer.h
@@ -2,6 +2,8 @@
  * @file lltimer.h
  * @brief Cross-platform objects for doing timing 
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,18 +26,16 @@
  * 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_TIMER_H                                      
 #define LL_TIMER_H
 
 #if LL_LINUX || LL_DARWIN
-#               include <time.h>
-#               include <sys/time.h>
+#include <sys/time.h>
 #endif
 
-#include <list>
-
 // units conversions
 #ifndef USEC_PER_SEC
     const U32   USEC_PER_SEC    = 1000000;
diff --git a/linden/indra/llcommon/lluri.cpp b/linden/indra/llcommon/lluri.cpp
index 892ac02..df79043 100644
--- a/linden/indra/llcommon/lluri.cpp
+++ b/linden/indra/llcommon/lluri.cpp
@@ -4,6 +4,8 @@
  * @date 2006-02-08
  * @brief Implementation of the LLURI class.
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llcommon/lluri.h b/linden/indra/llcommon/lluri.h
index 1044c48..3246dcd 100644
--- a/linden/indra/llcommon/lluri.h
+++ b/linden/indra/llcommon/lluri.h
@@ -4,6 +4,8 @@
  * @date 2006-02-05
  * @brief Declaration of the URI class.
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_LLURI_H
diff --git a/linden/indra/llcommon/lluuidhashmap.h b/linden/indra/llcommon/lluuidhashmap.h
index 77609e0..d8d3cff 100644
--- a/linden/indra/llcommon/lluuidhashmap.h
+++ b/linden/indra/llcommon/lluuidhashmap.h
@@ -2,6 +2,8 @@
  * @file lluuidhashmap.h
  * @brief A uuid based hash map.
  *
+ * $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_LLUUIDHASHMAP_H
diff --git a/linden/indra/llcommon/llversionserver.h b/linden/indra/llcommon/llversionserver.h
index 0680501..8891b47 100644
--- a/linden/indra/llcommon/llversionserver.h
+++ b/linden/indra/llcommon/llversionserver.h
@@ -2,6 +2,8 @@
  * @file llversionserver.h
  * @brief
  *
+ * $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_LLVERSIONSERVER_H
@@ -31,7 +34,7 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 18;
-const S32 LL_VERSION_PATCH = 2;
+const S32 LL_VERSION_PATCH = 4;
 const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Server";
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 747381f..46573f4 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -2,6 +2,8 @@
  * @file llversionviewer.h
  * @brief
  *
+ * $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_LLVERSIONVIEWER_H
@@ -31,8 +34,8 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 18;
-const S32 LL_VERSION_PATCH = 3;
-const S32 LL_VERSION_BUILD = 5;
+const S32 LL_VERSION_PATCH = 4;
+const S32 LL_VERSION_BUILD = 0;
 
 const char * const LL_CHANNEL = "Second Life Release";
 
diff --git a/linden/indra/llcommon/llworkerthread.cpp b/linden/indra/llcommon/llworkerthread.cpp
index b4d9485..d828ed9 100644
--- a/linden/indra/llcommon/llworkerthread.cpp
+++ b/linden/indra/llcommon/llworkerthread.cpp
@@ -1,6 +1,8 @@
 /** 
  * @file llworkerthread.cpp
  *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
  * Copyright (c) 2004-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$
  */
 
 #include "linden_common.h"
diff --git a/linden/indra/llcommon/llworkerthread.h b/linden/indra/llcommon/llworkerthread.h
index 278f8e0..be06bc2 100644
--- a/linden/indra/llcommon/llworkerthread.h
+++ b/linden/indra/llcommon/llworkerthread.h
@@ -1,6 +1,8 @@
 /** 
  * @file llworkerthread.h
  *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
  * Copyright (c) 2004-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 LL_LLWORKERTHREAD_H
diff --git a/linden/indra/llcommon/metaclass.cpp b/linden/indra/llcommon/metaclass.cpp
index e545411..aa62cef 100644
--- a/linden/indra/llcommon/metaclass.cpp
+++ b/linden/indra/llcommon/metaclass.cpp
@@ -4,6 +4,8 @@
  * @date 2006-05-15
  * @brief Implementation of LLMetaClass
  *
+ * $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/llcommon/metaclass.h b/linden/indra/llcommon/metaclass.h
index 1e255b0..fa22107 100644
--- a/linden/indra/llcommon/metaclass.h
+++ b/linden/indra/llcommon/metaclass.h
@@ -4,6 +4,8 @@
  * @date 2006-05-15
  * @brief Reflective meta information describing a class.
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_METACLASS_H
diff --git a/linden/indra/llcommon/metaclasst.h b/linden/indra/llcommon/metaclasst.h
index 5a110ba..d8d10bd 100644
--- a/linden/indra/llcommon/metaclasst.h
+++ b/linden/indra/llcommon/metaclasst.h
@@ -1,6 +1,8 @@
 /** 
  * @file metaclasst.h
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-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 LL_METACLASST_H
diff --git a/linden/indra/llcommon/metaproperty.cpp b/linden/indra/llcommon/metaproperty.cpp
index 221f7a7..fb4720f 100644
--- a/linden/indra/llcommon/metaproperty.cpp
+++ b/linden/indra/llcommon/metaproperty.cpp
@@ -4,6 +4,8 @@
  * @date 2006-05-15
  * @brief Implementation of LLMetaProperty.
  *
+ * $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/llcommon/metaproperty.h b/linden/indra/llcommon/metaproperty.h
index d8272fe..9664e99 100644
--- a/linden/indra/llcommon/metaproperty.h
+++ b/linden/indra/llcommon/metaproperty.h
@@ -4,6 +4,8 @@
  * @date 2006-05-15
  * @brief Reflective meta information describing a property of a class.
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -26,6 +28,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 #ifndef LL_METAPROPERTY_H
diff --git a/linden/indra/llcommon/metapropertyt.h b/linden/indra/llcommon/metapropertyt.h
index 1b444bd..488a60c 100644
--- a/linden/indra/llcommon/metapropertyt.h
+++ b/linden/indra/llcommon/metapropertyt.h
@@ -1,6 +1,8 @@
 /** 
  * @file metapropertyt.h
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-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 LL_METAPROPERTYT_H
diff --git a/linden/indra/llcommon/processor.h b/linden/indra/llcommon/processor.h
index 34d970e..af8af40 100644
--- a/linden/indra/llcommon/processor.h
+++ b/linden/indra/llcommon/processor.h
@@ -2,6 +2,8 @@
  * @file processor.h
  * @brief Legacy wrapper header.
  *
+ * $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 "llprocessor.h"
diff --git a/linden/indra/llcommon/reflective.cpp b/linden/indra/llcommon/reflective.cpp
index c8050e0..942ed0e 100644
--- a/linden/indra/llcommon/reflective.cpp
+++ b/linden/indra/llcommon/reflective.cpp
@@ -4,6 +4,8 @@
  * @date 2006-05-15
  * @brief Implementation of LLReflective.
  *
+ * $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/llcommon/reflective.h b/linden/indra/llcommon/reflective.h
index 10cecb0..6ed2b43 100644
--- a/linden/indra/llcommon/reflective.h
+++ b/linden/indra/llcommon/reflective.h
@@ -4,6 +4,8 @@
  * @date 2006-05-15
  * @brief Interface that must be implemented by all reflective classes.
  *
+ * $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_REFLECTIVE_H
diff --git a/linden/indra/llcommon/reflectivet.h b/linden/indra/llcommon/reflectivet.h
index e81d76a..85c7206 100644
--- a/linden/indra/llcommon/reflectivet.h
+++ b/linden/indra/llcommon/reflectivet.h
@@ -1,6 +1,8 @@
 /** 
  * @file reflectivet.h
  *
+ * $LicenseInfo:firstyear=2006&license=viewergpl$
+ * 
  * Copyright (c) 2006-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 LL_REFLECTIVET_H
diff --git a/linden/indra/llcommon/roles_constants.h b/linden/indra/llcommon/roles_constants.h
index 3c885ab..54e6827 100644
--- a/linden/indra/llcommon/roles_constants.h
+++ b/linden/indra/llcommon/roles_constants.h
@@ -2,6 +2,8 @@
  * @file roles_constants.h
  * @brief General Roles Constants
  *
+ * $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_ROLES_CONSTANTS_H
diff --git a/linden/indra/llcommon/stdenums.h b/linden/indra/llcommon/stdenums.h
index b910570..92de405 100644
--- a/linden/indra/llcommon/stdenums.h
+++ b/linden/indra/llcommon/stdenums.h
@@ -2,6 +2,8 @@
  * @file stdenums.h
  * @brief Enumerations for indra.
  *
+ * $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_STDENUMS_H
diff --git a/linden/indra/llcommon/stdtypes.h b/linden/indra/llcommon/stdtypes.h
index 118278f..f8982d7 100644
--- a/linden/indra/llcommon/stdtypes.h
+++ b/linden/indra/llcommon/stdtypes.h
@@ -2,6 +2,8 @@
  * @file stdtypes.h
  * @brief Basic type declarations for cross platform compatibility.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,13 +26,11 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 #ifndef LL_STDTYPES_H
 #define LL_STDTYPES_H
 
-#include <limits.h>
-#include <float.h>
-
 typedef signed char                     S8;
 typedef unsigned char                   U8;
 typedef signed short                    S16;
diff --git a/linden/indra/llcommon/string_table.h b/linden/indra/llcommon/string_table.h
index 3d30c9f..f057007 100644
--- a/linden/indra/llcommon/string_table.h
+++ b/linden/indra/llcommon/string_table.h
@@ -2,6 +2,8 @@
  * @file string_table.h
  * @brief Legacy wrapper header.
  *
+ * $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$
  */
 #include "llstringtable.h"
diff --git a/linden/indra/llcommon/timer.h b/linden/indra/llcommon/timer.h
index 3a098ec..ec3b62f 100644
--- a/linden/indra/llcommon/timer.h
+++ b/linden/indra/llcommon/timer.h
@@ -2,6 +2,8 @@
  * @file timer.h
  * @brief Legacy wrapper header.
  *
+ * $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$
  */
 #include "lltimer.h"
diff --git a/linden/indra/llcommon/timing.cpp b/linden/indra/llcommon/timing.cpp
index 0737beb..4115932 100644
--- a/linden/indra/llcommon/timing.cpp
+++ b/linden/indra/llcommon/timing.cpp
@@ -2,6 +2,8 @@
  * @file timing.cpp
  * @brief This file will be deprecated in the future.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,4 +26,5 @@
  * 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/llcommon/timing.h b/linden/indra/llcommon/timing.h
index b799001..3ea2a0e 100644
--- a/linden/indra/llcommon/timing.h
+++ b/linden/indra/llcommon/timing.h
@@ -2,6 +2,8 @@
  * @file timing.h
  * @brief Cross-platform routines for doing timing.
  *
+ * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * 
  * Copyright (c) 2000-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,15 +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_TIMING_H                                     
 #define LL_TIMING_H
 
-#include <time.h>
 
 #if LL_LINUX || LL_DARWIN || LL_SOLARIS
-#               include <sys/time.h>
+#include <sys/time.h>
 #endif
 
 
diff --git a/linden/indra/llcommon/u64.cpp b/linden/indra/llcommon/u64.cpp
index 204c6c8..f2efef1 100644
--- a/linden/indra/llcommon/u64.cpp
+++ b/linden/indra/llcommon/u64.cpp
@@ -2,6 +2,8 @@
  * @file u64.cpp
  * @brief Utilities to deal with U64s.
  *
+ * $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/llcommon/u64.h b/linden/indra/llcommon/u64.h
index da83e28..ad93ebf 100644
--- a/linden/indra/llcommon/u64.h
+++ b/linden/indra/llcommon/u64.h
@@ -2,6 +2,8 @@
  * @file u64.h
  * @brief Utilities to deal with U64s.
  *
+ * $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_U64_H