73 files changed, 2422 insertions, 3268 deletions
diff --git a/linden/indra/llmessage/CMakeLists.txt b/linden/indra/llmessage/CMakeLists.txt
new file mode 100644
index 0000000..ba17265
--- /dev/null
+++ b/linden/indra/llmessage/CMakeLists.txt
@@ -0,0 +1,191 @@
+# -*- cmake -*-
+project(llmessage)
+include(00-Common)
+include(LLCommon)
+include(LLMath)
+include(LLMessage)
+include(LLVFS)
+include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(
+    ${LLCOMMON_INCLUDE_DIRS}
+    ${LLMATH_INCLUDE_DIRS}
+    ${LLMESSAGE_INCLUDE_DIRS}
+    ${LLVFS_INCLUDE_DIRS}
+    )
+set(llmessage_SOURCE_FILES
+    llares.cpp
+    llassetstorage.cpp
+    llblowfishcipher.cpp
+    llbuffer.cpp
+    llbufferstream.cpp
+    llcachename.cpp
+    llchainio.cpp
+    llcircuit.cpp
+    llclassifiedflags.cpp
+    llcurl.cpp
+    lldatapacker.cpp
+    lldispatcher.cpp
+    llfiltersd2xmlrpc.cpp
+    llhost.cpp
+    llhttpassetstorage.cpp
+    llhttpclient.cpp
+    llhttpnode.cpp
+    llhttpsender.cpp
+    llinstantmessage.cpp
+    lliobuffer.cpp
+    lliohttpserver.cpp
+    lliopipe.cpp
+    lliosocket.cpp
+    llioutil.cpp
+    llmail.cpp
+    llmessagebuilder.cpp
+    llmessageconfig.cpp
+    llmessagereader.cpp
+    llmessagetemplate.cpp
+    llmessagetemplateparser.cpp
+    llmessagethrottle.cpp
+    llmime.cpp
+    llnamevalue.cpp
+    llnullcipher.cpp
+    llpacketack.cpp
+    llpacketbuffer.cpp
+    llpacketring.cpp
+    llpartdata.cpp
+    llpumpio.cpp
+    llsdappservices.cpp
+    llsdhttpserver.cpp
+    llsdmessagebuilder.cpp
+    llsdmessagereader.cpp
+    llsdrpcclient.cpp
+    llsdrpcserver.cpp
+    llservicebuilder.cpp
+    llservice.cpp
+    lltemplatemessagebuilder.cpp
+    lltemplatemessagereader.cpp
+    llthrottle.cpp
+    lltransfermanager.cpp
+    lltransfersourceasset.cpp
+    lltransfersourcefile.cpp
+    lltransfertargetfile.cpp
+    lltransfertargetvfile.cpp
+    llurlrequest.cpp
+    lluseroperation.cpp
+    llxfer.cpp
+    llxfer_file.cpp
+    llxfermanager.cpp
+    llxfer_mem.cpp
+    llxfer_vfile.cpp
+    llxorcipher.cpp
+    message.cpp
+    message_prehash.cpp
+    message_string_table.cpp
+    net.cpp
+    network.cpp
+    partsyspacket.cpp
+    patch_code.cpp
+    patch_dct.cpp
+    patch_idct.cpp
+    )
+set(llmessage_HEADER_FILES
+    CMakeLists.txt
+    llares.h
+    llassetstorage.h
+    llblowfishcipher.h
+    llbuffer.h
+    llbufferstream.h
+    llcachename.h
+    llchainio.h
+    llcipher.h
+    llcircuit.h
+    llclassifiedflags.h
+    llcurl.h
+    lldatapacker.h
+    lldbstrings.h
+    lldispatcher.h
+    lleventflags.h
+    llfiltersd2xmlrpc.h
+    llfollowcamparams.h
+    llhost.h
+    llhttpassetstorage.h
+    llhttpclient.h
+    llhttpnode.h
+    llhttpsender.h
+    llinstantmessage.h
+    llinvite.h
+    lliobuffer.h
+    lliohttpserver.h
+    lliopipe.h
+    lliosocket.h
+    llioutil.h
+    llloginflags.h
+    llmail.h
+    llmessagebuilder.h
+    llmessageconfig.h
+    llmessagereader.h
+    llmessagetemplate.h
+    llmessagetemplateparser.h
+    llmessagethrottle.h
+    llmime.h
+    llmsgvariabletype.h
+    llnamevalue.h
+    llnullcipher.h
+    llpacketack.h
+    llpacketbuffer.h
+    llpacketring.h
+    llpartdata.h
+    llpumpio.h
+    llqueryflags.h
+    llregionflags.h
+    llregionhandle.h
+    llsdappservices.h
+    llsdhttpserver.h
+    llsdmessagebuilder.h
+    llsdmessagereader.h
+    llsdrpcclient.h
+    llsdrpcserver.h
+    llservice.h
+    llservicebuilder.h
+    lltaskname.h
+    llteleportflags.h
+    lltemplatemessagebuilder.h
+    lltemplatemessagereader.h
+    llthrottle.h
+    lltransfermanager.h
+    lltransfersourceasset.h
+    lltransfersourcefile.h
+    lltransfertargetfile.h
+    lltransfertargetvfile.h
+    llurlrequest.h
+    lluseroperation.h
+    llvehicleparams.h
+    llxfer.h
+    llxfermanager.h
+    llxfer_file.h
+    llxfer_mem.h
+    llxfer_vfile.h
+    llxorcipher.h
+    machine.h
+    mean_collision_data.h
+    message.h
+    message_prehash.h
+    net.h
+    network.h
+    partsyspacket.h
+    patch_code.h
+    patch_dct.h
+    sound_ids.h
+    )
+set_source_files_properties(${llmessage_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+list(APPEND llmessage_SOURCE_FILES ${llmessage_HEADER_FILES})
+add_library (llmessage ${llmessage_SOURCE_FILES})
diff --git a/linden/indra/llmessage/files.lst b/linden/indra/llmessage/files.lst
deleted file mode 100644
index 690cc37..0000000
--- a/linden/indra/llmessage/files.lst
+++ /dev/null
@@ -1,71 +0,0 @@
-llmessage/llassetstorage.cpp
-llmessage/llblowfishcipher.cpp
-llmessage/llbuffer.cpp
-llmessage/llbufferstream.cpp
-llmessage/llcachename.cpp
-llmessage/llchainio.cpp
-llmessage/llcircuit.cpp
-llmessage/llclassifiedflags.cpp
-llmessage/llcurl.cpp
-llmessage/lldatapacker.cpp
-llmessage/lldispatcher.cpp
-llmessage/llfiltersd2xmlrpc.cpp
-llmessage/llhost.cpp
-llmessage/llhttpassetstorage.cpp
-llmessage/llhttpclient.cpp
-llmessage/llhttpnode.cpp
-llmessage/llhttpsender.cpp
-llmessage/llinstantmessage.cpp
-llmessage/lliobuffer.cpp
-llmessage/lliohttpserver.cpp
-llmessage/lliopipe.cpp
-llmessage/lliosocket.cpp
-llmessage/llioutil.cpp
-llmessage/llmail.cpp
-llmessage/llmessagebuilder.cpp
-llmessage/llmessageconfig.cpp
-llmessage/llmessagereader.cpp
-llmessage/llmessagetemplate.cpp
-llmessage/llmessagetemplateparser.cpp
-llmessage/llmessagethrottle.cpp
-llmessage/llmime.cpp
-llmessage/llnamevalue.cpp
-llmessage/llnullcipher.cpp
-llmessage/llpacketack.cpp
-llmessage/llpacketbuffer.cpp
-llmessage/llpacketring.cpp
-llmessage/llpartdata.cpp
-llmessage/llpumpio.cpp
-llmessage/llsdappservices.cpp
-llmessage/llsdhttpserver.cpp
-llmessage/llsdmessagereader.cpp
-llmessage/llsdmessagebuilder.cpp
-llmessage/llsdrpcclient.cpp
-llmessage/llsdrpcserver.cpp
-llmessage/llservice.cpp
-llmessage/llservicebuilder.cpp
-llmessage/lltemplatemessagebuilder.cpp
-llmessage/lltemplatemessagereader.cpp
-llmessage/llthrottle.cpp
-llmessage/lltransfermanager.cpp
-llmessage/lltransfersourceasset.cpp
-llmessage/lltransfersourcefile.cpp
-llmessage/lltransfertargetfile.cpp
-llmessage/lltransfertargetvfile.cpp
-llmessage/llurlrequest.cpp
-llmessage/lluseroperation.cpp
-llmessage/llxfer.cpp
-llmessage/llxfer_file.cpp
-llmessage/llxfermanager.cpp
-llmessage/llxfer_mem.cpp
-llmessage/llxfer_vfile.cpp
-llmessage/llxorcipher.cpp
-llmessage/message.cpp
-llmessage/message_prehash.cpp
-llmessage/message_string_table.cpp
-llmessage/net.cpp
-llmessage/network.cpp
-llmessage/partsyspacket.cpp
-llmessage/patch_code.cpp
-llmessage/patch_dct.cpp
-llmessage/patch_idct.cpp
diff --git a/linden/indra/llmessage/llares.cpp b/linden/indra/llmessage/llares.cpp
new file mode 100644
index 0000000..5a310b3
--- /dev/null
+++ b/linden/indra/llmessage/llares.cpp
@@ -0,0 +1,804 @@
+/** 
+ * @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-2008, 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://secondlifegrid.net/programs/open_source/licensing/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://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+#include "linden_common.h"
+#include <ares_dns.h>
+#include <ares_version.h>
+#include "apr_portable.h"
+#include "apr_network_io.h"
+#include "apr_poll.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_1_5(void *arg, int status, int timeouts,
+                                                          struct hostent *ent)
+{
+        LLPointer<LLAres::HostResponder> *resp =
+                (LLPointer<LLAres::HostResponder> *) arg;
+        if (status == ARES_SUCCESS)
+        {
+                (*resp)->hostResult(ent);
+        } else {
+                (*resp)->hostError(status);
+        }
+        delete resp;
+}
+#if ARES_VERSION_MAJOR == 1 && ARES_VERSION_MINOR == 4
+static void host_callback(void *arg, int status, struct hostent *ent)
+{
+        host_callback_1_5(arg, status, 0, ent);
+}
+#else
+# define host_callback host_callback_1_5
+#endif
+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)
+        {
+                querySuccess();
+        } else {
+                queryError(mResult);
+        }
+}
+void LLQueryResponder::querySuccess()
+{
+        llinfos << "LLQueryResponder::queryResult not implemented" << llendl;
+}
+void LLAres::SrvResponder::querySuccess()
+{
+        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_1_5(void *arg, int status, int timeouts,
+                                                                  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;
+}
+#if ARES_VERSION_MAJOR == 1 && ARES_VERSION_MINOR == 4
+static void nameinfo_callback(void *arg, int status, char *node, char *service)
+{
+        nameinfo_callback_1_5(arg, status, 0, node, service);
+}
+#else
+# define nameinfo_callback nameinfo_callback_1_5
+#endif
+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_1_5(void *arg, int status, int timeouts,
+                                                                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;
+}
+#if ARES_VERSION_MAJOR == 1 && ARES_VERSION_MINOR == 4
+static void search_callback(void *arg, int status, unsigned char *abuf,
+                                                        int alen)
+{
+        search_callback_1_5(arg, status, 0, abuf, alen);
+}
+#else
+# define search_callback search_callback_1_5
+#endif
+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::querySuccess()
+{
+        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/llmessage/llares.h b/linden/indra/llmessage/llares.h
new file mode 100644
index 0000000..5d72170
--- /dev/null
+++ b/linden/indra/llmessage/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-2008, 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://secondlifegrid.net/programs/open_source/licensing/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://secondlifegrid.net/programs/open_source/licensing/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 querySuccess();
+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 querySuccess();
+        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 querySuccess();
+        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/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp
index a6077e5..fa14a2b 100644
--- a/linden/indra/llmessage/llassetstorage.cpp
+++ b/linden/indra/llmessage/llassetstorage.cpp
@@ -42,6 +42,7 @@
 #include "llstring.h"
 #include "lldir.h"
 #include "llsd.h"
+#include "llframetimer.h"
 // this library includes
 #include "message.h"
@@ -58,7 +59,10 @@
 LLAssetStorage *gAssetStorage = NULL;
 LLMetrics *LLAssetStorage::metric_recipient = NULL;
-const LLUUID CATEGORIZE_LOST_AND_FOUND_ID("00000000-0000-0000-0000-000000000010");
+const LLUUID CATEGORIZE_LOST_AND_FOUND_ID(std::string("00000000-0000-0000-0000-000000000010"));
+const U64 TOXIC_ASSET_LIFETIME = (120 * 1000000);               // microseconds
 ///----------------------------------------------------------------------------
 /// LLAssetInfo
@@ -133,20 +137,20 @@ void LLAssetInfo::setFromNameValue( const LLNameValue& nv )
        str.assign( nv.mName );
        pos1 = str.find('|');
        buf.assign( str, 0, pos1++ );
-        mType = LLAssetType::lookup( buf.c_str() );
+        mType = LLAssetType::lookup( buf );
        buf.assign( str, pos1, std::string::npos );
-        mUuid.set( buf.c_str() );
+        mUuid.set( buf );
        // convert the value to useful information
        str.assign( nv.getAsset() );
        pos1 = str.find('|');
        buf.assign( str, 0, pos1++ );
-        mCreatorID.set( buf.c_str() );
+        mCreatorID.set( buf );
        pos2 = str.find( '|', pos1 );
        buf.assign( str, pos1, (pos2++) - pos1 );
-        setName( buf.c_str() );
+        setName( buf );
        buf.assign( str, pos2, std::string::npos );
-        setDescription( buf.c_str() );
+        setDescription( buf );
        llinfos << "uuid: " << mUuid << llendl;
        llinfos << "creator: " << mCreatorID << llendl;
 }
@@ -314,6 +318,9 @@ LLAssetStorage::~LLAssetStorage()
                // unregister our callbacks with the message system
                gMessageSystem->setHandlerFuncFast(_PREHASH_AssetUploadComplete, NULL, NULL);
        }
+        // Clear the toxic asset map
+        mToxicAssetMap.clear();
 }
 void LLAssetStorage::setUpstream(const LLHost &upstream_host)
@@ -1231,16 +1238,20 @@ void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, vo
 void LLAssetStorage::legacyGetDataCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 status, LLExtStat ext_status)
 {
        LLLegacyAssetRequest *legacy = (LLLegacyAssetRequest *)user_data;
-        char filename[LL_MAX_PATH] = "";        /* Flawfinder: ignore */ 
+        std::string filename;
+        // Check if the asset is marked toxic, and don't load bad stuff
+        BOOL toxic = gAssetStorage->isAssetToxic( uuid );
-        if (! status)
+        if ( !status
+                && !toxic )
        {
                LLVFile file(vfs, uuid, type);
-                char uuid_str[UUID_STR_LENGTH]; /* Flawfinder: ignore */ 
+                std::string uuid_str;
                uuid.toString(uuid_str);
-                snprintf(filename,sizeof(filename),"%s.%s",gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str(),LLAssetType::lookup(type));   /* Flawfinder: ignore */
+                filename = llformat("%s.%s",gDirUtilp->getExpandedFilename(LL_PATH_CACHE,uuid_str).c_str(),LLAssetType::lookup(type));
                LLFILE* fp = LLFile::fopen(filename, "wb");     /* Flawfinder: ignore */ 
                if (fp)
@@ -1264,7 +1275,7 @@ void LLAssetStorage::legacyGetDataCallback(LLVFS *vfs, const LLUUID &uuid, LLAss
                }
        }
-        legacy->mDownCallback(filename, uuid, legacy->mUserData, status, ext_status);
+        legacy->mDownCallback(filename.c_str(), uuid, legacy->mUserData, status, ext_status);
        delete legacy;
 }
@@ -1283,7 +1294,7 @@ void LLAssetStorage::storeAssetData(
 {
        llwarns << "storeAssetData: wrong version called" << llendl;
        // LLAssetStorage metric: Virtual base call
-        reportMetric( LLUUID::null, asset_type, NULL, LLUUID::null, 0, MR_BAD_FUNCTION, __FILE__, __LINE__, "Illegal call to base: LLAssetStorage::storeAssetData 1" );
+        reportMetric( LLUUID::null, asset_type, LLStringUtil::null, LLUUID::null, 0, MR_BAD_FUNCTION, __FILE__, __LINE__, "Illegal call to base: LLAssetStorage::storeAssetData 1" );
 }
 // virtual
@@ -1302,13 +1313,13 @@ void LLAssetStorage::storeAssetData(
 {
        llwarns << "storeAssetData: wrong version called" << llendl;
        // LLAssetStorage metric: Virtual base call
-        reportMetric( asset_id, asset_type, NULL, requesting_agent_id, 0, MR_BAD_FUNCTION, __FILE__, __LINE__, "Illegal call to base: LLAssetStorage::storeAssetData 2" );
+        reportMetric( asset_id, asset_type, LLStringUtil::null, requesting_agent_id, 0, MR_BAD_FUNCTION, __FILE__, __LINE__, "Illegal call to base: LLAssetStorage::storeAssetData 2" );
 }
 // virtual
 // this does nothing, viewer and sim both override this.
 void LLAssetStorage::storeAssetData(
-        const char* filename,
+        const std::string& filename,
        const LLUUID& asset_id,
        LLAssetType::EType asset_type,
        LLStoreAssetCallback callback,
@@ -1320,13 +1331,13 @@ void LLAssetStorage::storeAssetData(
 {
        llwarns << "storeAssetData: wrong version called" << llendl;
        // LLAssetStorage metric: Virtual base call
-        reportMetric( asset_id, asset_type, NULL, LLUUID::null, 0, MR_BAD_FUNCTION, __FILE__, __LINE__, "Illegal call to base: LLAssetStorage::storeAssetData 3" );
+        reportMetric( asset_id, asset_type, LLStringUtil::null, LLUUID::null, 0, MR_BAD_FUNCTION, __FILE__, __LINE__, "Illegal call to base: LLAssetStorage::storeAssetData 3" );
 }
 // virtual
 // this does nothing, viewer and sim both override this.
 void LLAssetStorage::storeAssetData(
-        const char* filename,
+        const std::string& filename,
        const LLTransactionID &transactoin_id,
        LLAssetType::EType asset_type,
        LLStoreAssetCallback callback,
@@ -1338,7 +1349,7 @@ void LLAssetStorage::storeAssetData(
 {
        llwarns << "storeAssetData: wrong version called" << llendl;
        // LLAssetStorage metric: Virtual base call
-        reportMetric( LLUUID::null, asset_type, NULL, LLUUID::null, 0, MR_BAD_FUNCTION, __FILE__, __LINE__, "Illegal call to base: LLAssetStorage::storeAssetData 4" );
+        reportMetric( LLUUID::null, asset_type, LLStringUtil::null, LLUUID::null, 0, MR_BAD_FUNCTION, __FILE__, __LINE__, "Illegal call to base: LLAssetStorage::storeAssetData 4" );
 }
 // static
@@ -1385,9 +1396,9 @@ void LLAssetStorage::clearTempAssetData()
 { }
 // static
-void LLAssetStorage::reportMetric( const LLUUID& asset_id, const LLAssetType::EType asset_type, const char *filename,
+void LLAssetStorage::reportMetric( const LLUUID& asset_id, const LLAssetType::EType asset_type, const std::string& in_filename,
                                                                   const LLUUID& agent_id, S32 asset_size, EMetricResult result,
-                                                                   const char *file, const S32 line, const char *message )
+                                                                   const char *file, const S32 line, const std::string& in_message )
 {
        if( !metric_recipient )
        {
@@ -1395,18 +1406,13 @@ void LLAssetStorage::reportMetric( const LLUUID& asset_id, const LLAssetType::ET
                return;
        }
-        filename = filename ? filename : "";
+        std::string filename(in_filename);
-        file = file ? file : "";
+        if (filename.empty())
+                filename = ll_safe_string(file);
-        // Create revised message - message = "message :: file:line"
+        
-        std::string new_message; //( message );
+        // Create revised message - new_message = "in_message :: file:line"
-        new_message = message; // << " " << file << " " << line;
+        std::stringstream new_message;
-        new_message += " :: ";
+        new_message << in_message << " :: " << filename << ":" << line;
-        new_message += filename;
-        char line_string[16];
-        sprintf( line_string, ":%d", line );
-        new_message += line_string;
-        message = new_message.c_str();
        // Change always_report to true if debugging... do not check it in this way
        static bool always_report = false;
@@ -1419,15 +1425,68 @@ void LLAssetStorage::reportMetric( const LLUUID& asset_id, const LLAssetType::ET
                LLSD stats;
                stats["asset_id"] = asset_id;
                stats["asset_type"] = asset_type;
-                stats["filename"] = filename? filename : "";
+                stats["filename"] = filename;
                stats["agent_id"] = agent_id;
                stats["asset_size"] = (S32)asset_size;
                stats["result"] = (S32)result;
-                metric_recipient->recordEventDetails( metric_name, message, success, stats);
+                metric_recipient->recordEventDetails( metric_name, new_message.str(), success, stats);
        }
        else
        {
-                metric_recipient->recordEvent(metric_name, message, success);
+                metric_recipient->recordEvent(metric_name, new_message.str(), success);
+        }
+}
+// Check if an asset is in the toxic map.  If it is, the entry is updated
+BOOL    LLAssetStorage::isAssetToxic( const LLUUID& uuid )
+{
+        BOOL is_toxic = FALSE;
+        if ( !uuid.isNull() )
+        {
+                toxic_asset_map_t::iterator iter = mToxicAssetMap.find( uuid );
+                if ( iter != mToxicAssetMap.end() )
+                {       // Found toxic asset
+                        (*iter).second = LLFrameTimer::getTotalTime() + TOXIC_ASSET_LIFETIME;
+                        is_toxic = TRUE;
+                } 
        }
+        return is_toxic;
 }
+// Clean the toxic asset list, remove old entries
+void    LLAssetStorage::flushOldToxicAssets( BOOL force_it )
+{
+        // Scan and look for old entries
+        U64 now = LLFrameTimer::getTotalTime();
+        toxic_asset_map_t::iterator iter = mToxicAssetMap.begin();
+        while ( iter != mToxicAssetMap.end() )
+        {
+                if ( force_it
+                        || (*iter).second < now )
+                {       // Too old - remove it
+                        mToxicAssetMap.erase( iter++ );
+                }
+                else
+                {
+                        iter++;
+                }
+        }
+}
+// Add an item to the toxic asset map
+void    LLAssetStorage::markAssetToxic( const LLUUID& uuid )
+{       
+        if ( !uuid.isNull() )
+        {
+                // Set the value to the current time.  Creates a new entry if needed
+                mToxicAssetMap[ uuid ] = LLFrameTimer::getTotalTime() + TOXIC_ASSET_LIFETIME;
+        }
+}
diff --git a/linden/indra/llmessage/llassetstorage.h b/linden/indra/llmessage/llassetstorage.h
index 739242a..86bf66a 100644
--- a/linden/indra/llmessage/llassetstorage.h
+++ b/linden/indra/llmessage/llassetstorage.h
@@ -197,7 +197,8 @@ public:
 };
+// Map of known bad assets
+typedef std::map<LLUUID,U64,lluuid_less> toxic_asset_map_t;
 typedef void (*LLGetAssetCallback)(LLVFS *vfs, const LLUUID &asset_id,
                                                                                 LLAssetType::EType asset_type, void *user_data, S32 status, LLExtStat ext_status);
@@ -231,6 +232,9 @@ protected:
        request_list_t mPendingUploads;
        request_list_t mPendingLocalUploads;
        
+        // Map of toxic assets - these caused problems when recently rezzed, so avoid them
+        toxic_asset_map_t       mToxicAssetMap;         // Objects in this list are known to cause problems and are not loaded
 public:
        LLAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
                                   LLVFS *vfs, const LLHost &upstream_host);
@@ -291,6 +295,15 @@ public:
                                                 const LLUUID &asset_id, LLAssetType::EType atype,
                                                 LLGetAssetCallback cb, void *user_data, BOOL is_priority = FALSE); // Get a particular inventory item.
+        // Check if an asset is in the toxic map.  If it is, the entry is updated
+        BOOL            isAssetToxic( const LLUUID& uuid );
+        // Clean the toxic asset list, remove old entries
+        void            flushOldToxicAssets( BOOL force_it );
+        // Add an item to the toxic asset map
+        void            markAssetToxic( const LLUUID& uuid );
 protected:
        virtual LLSD getPendingDetails(const request_list_t* requests,
                                        LLAssetType::EType asset_type,
@@ -365,7 +378,7 @@ public:
         * AssetID version.
         */
        virtual void storeAssetData(
-                const char* filename,
+                const std::string& filename,
                const LLUUID& asset_id,
                LLAssetType::EType type,
                LLStoreAssetCallback callback,
@@ -379,7 +392,7 @@ public:
         * TransactionID version
         */
        virtual void storeAssetData(
-                const char * filename,
+                const std::string& filename,
                const LLTransactionID &transaction_id,
                LLAssetType::EType type,
                LLStoreAssetCallback callback,
@@ -438,9 +451,9 @@ protected:
        static class LLMetrics *metric_recipient;
-        static void reportMetric( const LLUUID& asset_id, const LLAssetType::EType asset_type, const char *filename,
+        static void reportMetric( const LLUUID& asset_id, const LLAssetType::EType asset_type, const std::string& filename,
-                                           const LLUUID& agent_id, S32 asset_size, EMetricResult result,
+                                                          const LLUUID& agent_id, S32 asset_size, EMetricResult result,
-                                           const char *file, const S32 line, const char *message ); 
+                                                          const char* file, const S32 line, const std::string& message ); 
 public:
        static void setMetricRecipient( LLMetrics *recip )
        {
diff --git a/linden/indra/llmessage/llcachename.cpp b/linden/indra/llmessage/llcachename.cpp
index 9adf10d..70e1ccf 100644
--- a/linden/indra/llmessage/llcachename.cpp
+++ b/linden/indra/llmessage/llcachename.cpp
@@ -43,10 +43,9 @@
 #include "message.h"
 // Constants
-// probably need a setUIString() call in the interface
+static const std::string CN_WAITING("(Loading...)"); // *TODO: translate
-const char* const CN_WAITING = "(Loading...)"; // *TODO: translate
+static const std::string CN_NOBODY("(nobody)"); // *TODO: translate
-const char* const CN_NOBODY = "(nobody)"; // *TODO: translate
+static const std::string CN_NONE("(none)"); // *TODO: translate
-const char* const CN_NONE = "(none)"; // *TODO: translate
 // llsd serialization constants
 static const std::string AGENTS("agents");
@@ -78,16 +77,13 @@ public:
 public:
        bool mIsGroup;
        U32 mCreateTime;        // unix time_t
-        char mFirstName[DB_FIRST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
+        std::string mFirstName;
-        char mLastName[DB_LAST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
+        std::string mLastName;
-        char mGroupName[DB_GROUP_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
+        std::string mGroupName;
 };
 LLCacheNameEntry::LLCacheNameEntry()
 {
-        mFirstName[0] = '\0';
-        mLastName[0]  = '\0';
-        mGroupName[0] = '\0';
 }
@@ -235,7 +231,7 @@ public:
        static void handleUUIDGroupNameRequest(LLMessageSystem* msg, void** userdata);
        static void handleUUIDGroupNameReply(LLMessageSystem* msg, void** userdata);
-        void notifyObservers(const LLUUID& id, const char* first, const char* last, BOOL group);
+        void notifyObservers(const LLUUID& id, const std::string& first, const std::string& last, BOOL group);
 };
@@ -390,8 +386,8 @@ void LLCacheName::importFile(LLFILE* fp)
                LLCacheNameEntry* entry = new LLCacheNameEntry();
                entry->mIsGroup = false;
                entry->mCreateTime = create_time;
-                LLString::copy(entry->mFirstName, firstname, DB_FIRST_NAME_BUF_SIZE);
+                entry->mFirstName = firstname;
-                LLString::copy(entry->mLastName, lastname, DB_LAST_NAME_BUF_SIZE);
+                entry->mLastName = lastname;
                impl.mCache[id] = entry;
                count++;
@@ -426,12 +422,8 @@ bool LLCacheName::importFile(std::istream& istr)
                LLCacheNameEntry* entry = new LLCacheNameEntry();
                entry->mIsGroup = false;
                entry->mCreateTime = ctime;
-                std::string first = agent[FIRST].asString();
+                entry->mFirstName = agent[FIRST].asString();
-                first.copy(entry->mFirstName, DB_FIRST_NAME_BUF_SIZE, 0);
+                entry->mLastName = agent[LAST].asString();
-                entry->mFirstName[llmin(first.size(),(std::string::size_type)DB_FIRST_NAME_BUF_SIZE-1)] = '\0';
-                std::string last = agent[LAST].asString();
-                last.copy(entry->mLastName, DB_LAST_NAME_BUF_SIZE, 0);
-                entry->mLastName[llmin(last.size(),(std::string::size_type)DB_LAST_NAME_BUF_SIZE-1)] = '\0';
                impl.mCache[id] = entry;
                ++count;
        }
@@ -451,9 +443,7 @@ bool LLCacheName::importFile(std::istream& istr)
                LLCacheNameEntry* entry = new LLCacheNameEntry();
                entry->mIsGroup = true;
                entry->mCreateTime = ctime;
-                std::string name = group[NAME].asString();
+                entry->mGroupName = group[NAME].asString();
-                name.copy(entry->mGroupName, DB_GROUP_NAME_BUF_SIZE, 0);
-                entry->mGroupName[llmin(name.size(), (std::string::size_type)DB_GROUP_NAME_BUF_SIZE-1)] = '\0';
                impl.mCache[id] = entry;
                ++count;
        }
@@ -471,8 +461,8 @@ void LLCacheName::exportFile(std::ostream& ostr)
                // Only write entries for which we have valid data.
                LLCacheNameEntry* entry = iter->second;
                if(!entry
-                   || (NULL != strchr(entry->mFirstName, '?'))
+                   || (std::string::npos != entry->mFirstName.find('?'))
-                   || (NULL != strchr(entry->mGroupName, '?')))
+                   || (std::string::npos != entry->mGroupName.find('?')))
                {
                        continue;
                }
@@ -480,13 +470,13 @@ void LLCacheName::exportFile(std::ostream& ostr)
                // store it
                LLUUID id = iter->first;
                std::string id_str = id.asString();
-                if(entry->mFirstName[0] && entry->mLastName[0])
+                if(!entry->mFirstName.empty() && !entry->mLastName.empty())
                {
                        data[AGENTS][id_str][FIRST] = entry->mFirstName;
                        data[AGENTS][id_str][LAST] = entry->mLastName;
                        data[AGENTS][id_str][CTIME] = (S32)entry->mCreateTime;
                }
-                else if(entry->mIsGroup && entry->mGroupName[0])
+                else if(entry->mIsGroup && !entry->mGroupName.empty())
                {
                        data[GROUPS][id_str][NAME] = entry->mGroupName;
                        data[GROUPS][id_str][CTIME] = (S32)entry->mCreateTime;
@@ -534,16 +524,6 @@ BOOL LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
        return res;
 }
-// *TODO: Deprecate
-BOOL LLCacheName::getName(const LLUUID& id, char* first, char* last)
-{
-        std::string first_name, last_name;
-        BOOL res = getName(id, first_name, last_name);
-        strcpy(first, first_name.c_str());
-        strcpy(last, last_name.c_str());
-        return res;
-}
 BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
 {
        if(id.isNull())
@@ -553,7 +533,7 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
        }
        LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache,id);
-        if (entry && !entry->mGroupName[0])
+        if (entry && entry->mGroupName.empty())
        {
                // COUNTER-HACK to combat James' HACK in exportFile()...
                // this group name was loaded from a name cache that did not
@@ -578,16 +558,6 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
        }
 }
-// *TODO: Deprecate
-BOOL LLCacheName::getGroupName(const LLUUID& id, char* group)
-{
-        std::string group_name;
-        BOOL res = getGroupName(id, group_name);
-        strcpy(group, group_name.c_str());
-        return res;
-}
 // TODO: Make the cache name callback take a SINGLE std::string,
 // not a separate first and last name.
 void LLCacheName::get(const LLUUID& id, BOOL is_group, LLCacheNameCallback callback, void* user_data)
@@ -716,9 +686,9 @@ void LLCacheName::dumpStats()
 }
 //static 
-LLString LLCacheName::getDefaultName()
+std::string LLCacheName::getDefaultName()
 {
-        return LLString(CN_WAITING);
+        return CN_WAITING;
 }
 void LLCacheName::Impl::processPendingAsks()
@@ -813,7 +783,7 @@ void LLCacheName::Impl::sendRequest(
 }
 void LLCacheName::Impl::notifyObservers(const LLUUID& id,
-        const char* first, const char* last, BOOL is_group)
+        const std::string& first, const std::string& last, BOOL is_group)
 {
        for (Observers::const_iterator i = mObservers.begin(),
                                                                   end = mObservers.end();
@@ -917,19 +887,17 @@ void LLCacheName::Impl::processUUIDReply(LLMessageSystem* msg, bool isGroup)
                entry->mCreateTime = (U32)time(NULL);
                if (!isGroup)
                {
-                        msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_FirstName, DB_FIRST_NAME_BUF_SIZE, entry->mFirstName, i);
+                        msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_FirstName, entry->mFirstName, i);
-                        msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_LastName,  DB_LAST_NAME_BUF_SIZE, entry->mLastName, i);
+                        msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_LastName,  entry->mLastName, i);
                }
                else
                {
-                        msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_GroupName, DB_GROUP_NAME_BUF_SIZE, entry->mGroupName, i);
+                        msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_GroupName, entry->mGroupName, i);
                }
                if (!isGroup)
                {
-                        notifyObservers(id,
+                        notifyObservers(id, entry->mFirstName, entry->mLastName, FALSE);
-                                                        entry->mFirstName, entry->mLastName,
-                                                        FALSE);
                }
                else
                {
diff --git a/linden/indra/llmessage/llcachename.h b/linden/indra/llmessage/llcachename.h
index e7d5a44..965b4ba 100644
--- a/linden/indra/llmessage/llcachename.h
+++ b/linden/indra/llmessage/llcachename.h
@@ -37,7 +37,7 @@ class LLHost;
 class LLUUID;
 // agent_id/group_id, first_name, last_name, is_group, user_data
-typedef void (*LLCacheNameCallback)(const LLUUID&, const char*, const char*, BOOL, void*);
+typedef void (*LLCacheNameCallback)(const LLUUID&, const std::string&, const std::string&, BOOL, void*);
 // Here's the theory:
 // If you request a name that isn't in the cache, it returns "waiting"
@@ -75,7 +75,6 @@ public:
        // last must be at least DB_LAST_NAME_BUF_SIZE characters.
        // If not available, copies the string "waiting".
        // Returns TRUE iff available.
-        BOOL getName(const LLUUID& id, char* first, char* last);
        BOOL getName(const LLUUID& id, std::string& first, std::string& last);
        BOOL getFullName(const LLUUID& id, std::string& fullname);
        
@@ -83,7 +82,6 @@ public:
        // provided. The caller must allocate at least
        // DB_GROUP_NAME_BUF_SIZE characters. If not available, this
        // method copies the string "waiting". Returns TRUE iff available.
-        BOOL getGroupName(const LLUUID& id, char* group);
        BOOL getGroupName(const LLUUID& id, std::string& group);
        // Call the callback with the group or avatar name.
@@ -107,7 +105,7 @@ public:
        void dump();            // Dumps the contents of the cache
        void dumpStats();       // Dumps the sizes of the cache and associated queues.
-        static LLString getDefaultName();
+        static std::string getDefaultName();
 private:
diff --git a/linden/indra/llmessage/llcircuit.cpp b/linden/indra/llmessage/llcircuit.cpp
index 7b369cb..12a1520 100644
--- a/linden/indra/llmessage/llcircuit.cpp
+++ b/linden/indra/llmessage/llcircuit.cpp
@@ -184,7 +184,7 @@ LLCircuitData::~LLCircuitData()
                std::ostream_iterator<TPACKETID> append(str, " ");
                str << "MSG: -> " << mHost << "\tABORTING RELIABLE:\t";
                std::copy(doomed.begin(), doomed.end(), append);
-                llinfos << str.str().c_str() << llendl;
+                llinfos << str.str() << llendl;
        }
 }
@@ -204,7 +204,7 @@ void LLCircuitData::ackReliablePacket(TPACKETID packet_num)
                        std::ostringstream str;
                        str << "MSG: <- " << packetp->mHost << "\tRELIABLE ACKED:\t"
                                << packetp->mPacketID;
-                        llinfos << str.str().c_str() << llendl;
+                        llinfos << str.str() << llendl;
                }
                if (packetp->mCallback)
                {
@@ -238,7 +238,7 @@ void LLCircuitData::ackReliablePacket(TPACKETID packet_num)
                        std::ostringstream str;
                        str << "MSG: <- " << packetp->mHost << "\tRELIABLE ACKED:\t"
                                << packetp->mPacketID;
-                        llinfos << str.str().c_str() << llendl;
+                        llinfos << str.str() << llendl;
                }
                if (packetp->mCallback)
                {
@@ -342,7 +342,7 @@ S32 LLCircuitData::resendUnackedPackets(const F64 now)
                                std::ostringstream str;
                                str << "MSG: -> " << packetp->mHost
                                        << "\tRESENDING RELIABLE:\t" << packetp->mPacketID;
-                                llinfos << str.str().c_str() << llendl;
+                                llinfos << str.str() << llendl;
                        }
                        packetp->mBuffer[0] |= LL_RESENT_FLAG;  // tag packet id as being a resend      
@@ -403,7 +403,7 @@ S32 LLCircuitData::resendUnackedPackets(const F64 now)
                                std::ostringstream str;
                                str << "MSG: -> " << packetp->mHost << "\tABORTING RELIABLE:\t"
                                        << packetp->mPacketID;
-                                llinfos << str.str().c_str() << llendl;
+                                llinfos << str.str() << llendl;
                        }
                        if (packetp->mCallback)
@@ -710,7 +710,7 @@ void LLCircuitData::checkPacketInID(TPACKETID id, BOOL receive_resent)
                        {
                                std::ostringstream str;
                                str << "MSG: <- " << mHost << "\tRECOVERING LOST:\t" << id;
-                                llinfos << str.str().c_str() << llendl;
+                                llinfos << str.str() << llendl;
                        }
                        //                      llinfos << "removing potential lost: " << id << llendl;
                        mPotentialLostPackets.erase(id);
@@ -729,7 +729,7 @@ void LLCircuitData::checkPacketInID(TPACKETID id, BOOL receive_resent)
                                                std::ostringstream str;
                                                str << "MSG: <- " << mHost << "\tPACKET GAP:\t"
                                                        << index;
-                                                llinfos << str.str().c_str() << llendl;
+                                                llinfos << str.str() << llendl;
                                        }
 //                                              llinfos << "adding potential lost: " << index << llendl;
@@ -747,7 +747,7 @@ void LLCircuitData::checkPacketInID(TPACKETID id, BOOL receive_resent)
                                        std::ostringstream str;
                                        str << "MSG: <- " << mHost << "\tPACKET GAP:\t"
                                                << id << " expected " << index;
-                                        llinfos << str.str().c_str() << llendl;
+                                        llinfos << str.str() << llendl;
                                }
                        }
                                
@@ -969,7 +969,7 @@ BOOL LLCircuitData::updateWatchDogTimers(LLMessageSystem *msgsys)
                                std::ostringstream str;
                                str << "MSG: <- " << mHost << "\tLOST PACKET:\t"
                                        << (*it).first;
-                                llinfos << str.str().c_str() << llendl;
+                                llinfos << str.str() << llendl;
                        }
                        mPotentialLostPackets.erase(it++);
                }
@@ -1114,7 +1114,7 @@ void LLCircuit::sendAcks()
                                str << "MSG: -> " << cd->mHost << "\tPACKET ACKS:\t";
                                std::ostream_iterator<TPACKETID> append(str, " ");
                                std::copy(cd->mAcks.begin(), cd->mAcks.end(), append);
-                                llinfos << str.str().c_str() << llendl;
+                                llinfos << str.str() << llendl;
                        }
                        // empty out the acks list
diff --git a/linden/indra/llmessage/llcurl.cpp b/linden/indra/llmessage/llcurl.cpp
index f03cebc..834ec4b 100644
--- a/linden/indra/llmessage/llcurl.cpp
+++ b/linden/indra/llmessage/llcurl.cpp
@@ -101,6 +101,12 @@ void LLCurl::setCAFile(const std::string& file)
        sCAFile = file;
 }
+//static
+std::string LLCurl::getVersionString()
+{
+        return std::string(curl_version());
+}
 //////////////////////////////////////////////////////////////////////////////
 LLCurl::Responder::Responder()
@@ -113,6 +119,15 @@ LLCurl::Responder::~Responder()
 }
 // virtual
+void LLCurl::Responder::error(
+        U32 status,
+        const std::string& reason,
+        const LLSD&)
+{
+        error(status, reason);
+}
+// virtual
 void LLCurl::Responder::error(U32 status, const std::string& reason)
 {
        llinfos << status << ": " << reason << llendl;
@@ -124,38 +139,16 @@ void LLCurl::Responder::result(const LLSD& content)
 }
 // virtual
-void LLCurl::Responder::completedRaw(U32 status, const std::string& reason,
+void LLCurl::Responder::completedRaw(
-                                                                         const LLChannelDescriptors& channels,
+        U32 status,
-                                                                         const LLIOPipe::buffer_ptr_t& buffer)
+        const std::string& reason,
+        const LLChannelDescriptors& channels,
+        const LLIOPipe::buffer_ptr_t& buffer)
 {
-        if (isGoodStatus(status))
+        LLSD content;
-        {
+        LLBufferStream istr(channels, buffer.get());
-                LLSD content;
+        LLSDSerialize::fromXML(content, istr);
-                LLBufferStream istr(channels, buffer.get());
+        completed(status, reason, content);
-                LLSDSerialize::fromXML(content, istr);
-/*
-                const S32 parseError = -1;
-                if(LLSDSerialize::fromXML(content, istr) == parseError)
-                {
-                        mStatus = 498;
-                        mReason = "Client Parse Error";
-                }
-*/
-                completed(status, reason, content);
-        }
-        else if (status == 400)
-        {
-                // Get reason from buffer
-                char tbuf[4096];
-                S32 len = 4096;
-                buffer->readAfter(channels.in(), NULL, (U8*)tbuf, len);
-                tbuf[len] = 0;
-                completed(status, std::string(tbuf), LLSD());
-        }
-        else
-        {
-                completed(status, reason, LLSD());
-        }
 }
 // virtual
@@ -167,7 +160,7 @@ void LLCurl::Responder::completed(U32 status, const std::string& reason, const L
        }
        else
        {
-                error(status, reason);
+                error(status, reason, content);
        }
 }
@@ -281,7 +274,7 @@ LLCurl::Easy::~Easy()
        curl_easy_cleanup(mCurlEasyHandle);
        --gCurlEasyCount;
        curl_slist_free_all(mHeaders);
-        for_each(mStrings.begin(), mStrings.end(), DeletePointer());
+        for_each(mStrings.begin(), mStrings.end(), DeletePointerArray());
 }
 void LLCurl::Easy::resetState()
@@ -882,6 +875,7 @@ void LLCurlEasyRequest::sendRequest(const std::string& url)
 {
        llassert_always(!mRequestSent);
        mRequestSent = true;
+        lldebugs << url << llendl;
        if (mEasy)
        {
                mEasy->setHeaders();
diff --git a/linden/indra/llmessage/llcurl.h b/linden/indra/llmessage/llcurl.h
index 2737f6e..0c2caad 100644
--- a/linden/indra/llmessage/llcurl.h
+++ b/linden/indra/llmessage/llcurl.h
@@ -84,17 +84,31 @@ public:
                        return((200 <= status) && (status < 300));
                }
                
+                virtual void error(
+                        U32 status,
+                        const std::string& reason,
+                        const LLSD& content);
+                        //< called by completed() on bad status 
                virtual void error(U32 status, const std::string& reason);
-                        // called with non-200 status codes
+                        //< called by default error(status, reason, content)
                
                virtual void result(const LLSD& content);
-                
+                        //< called by completed for good status codes.
-                // Override point for clients that may want to use this class when the response is some other format besides LLSD
-                virtual void completedRaw(U32 status, const std::string& reason,
+                virtual void completedRaw(
-                                                                  const LLChannelDescriptors& channels,
+                        U32 status,
-                                                                  const LLIOPipe::buffer_ptr_t& buffer);
+                        const std::string& reason,
+                        const LLChannelDescriptors& channels,
+                        const LLIOPipe::buffer_ptr_t& buffer);
+                        /**< Override point for clients that may want to use this
+                           class when the response is some other format besides LLSD
+                        */
-                virtual void completed(U32 status, const std::string& reason, const LLSD& content);
+                virtual void completed(
+                        U32 status,
+                        const std::string& reason,
+                        const LLSD& content);
                        /**< The default implemetnation calls
                                either:
                                * result(), or
@@ -120,6 +134,11 @@ public:
         * @ brief Set certificate authority path used to verify HTTPS certs.
         */
        static void setCAPath(const std::string& path);
+        /**
+         * @ brief Return human-readable string describing libcurl version.
+         */
+        static std::string getVersionString();
        
        /**
         * @ brief Get certificate authority file used to verify HTTPS certs.
diff --git a/linden/indra/llmessage/lldatapacker.cpp b/linden/indra/llmessage/lldatapacker.cpp
index ec198f7..2c7c036 100644
--- a/linden/indra/llmessage/lldatapacker.cpp
+++ b/linden/indra/llmessage/lldatapacker.cpp
@@ -170,16 +170,16 @@ BOOL LLDataPacker::unpackFixed(F32 &value, const char *name,
 // LLDataPackerBinaryBuffer implementation
 //---------------------------------------------------------------------------
-BOOL LLDataPackerBinaryBuffer::packString(const char *value, const char *name)
+BOOL LLDataPackerBinaryBuffer::packString(const std::string& value, const char *name)
 {
        BOOL success = TRUE;
-        S32 length = (S32)strlen(value) + 1; /*Flawfinder: ignore*/
+        S32 length = value.length()+1;
        success &= verifyLength(length, name);
        if (mWriteEnabled) 
        {
-                htonmemcpy(mCurBufferp, value, MVT_VARIABLE, length);  
+                htonmemcpy(mCurBufferp, value.c_str(), MVT_VARIABLE, length);  
        }
        mCurBufferp += length;
        return success;
@@ -577,18 +577,18 @@ void LLDataPackerBinaryBuffer::dumpBufferToLog()
 //---------------------------------------------------------------------------
 // LLDataPackerAsciiBuffer implementation
 //---------------------------------------------------------------------------
-BOOL LLDataPackerAsciiBuffer::packString(const char *value, const char *name)
+BOOL LLDataPackerAsciiBuffer::packString(const std::string& value, const char *name)
 {
        BOOL success = TRUE;
        writeIndentedName(name);
        int numCopied = 0;
        if (mWriteEnabled) 
        {
-                numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%s\n", value);               /* Flawfinder: ignore */
+                numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%s\n", value.c_str());               /* Flawfinder: ignore */
        }
        else
        {
-                numCopied = (S32)strlen(value) + 1; /*Flawfinder: ignore*/
+                numCopied = value.length() + 1; /*Flawfinder: ignore*/
        }
        // snprintf returns number of bytes that would have been written
@@ -1242,9 +1242,9 @@ BOOL LLDataPackerAsciiBuffer::packUUID(const LLUUID &value, const char *name)
        int numCopied = 0;
        if (mWriteEnabled)
        {
-                char tmp_str[64]; /* Flawfinder: ignore */ 
+                std::string tmp_str;
                value.toString(tmp_str);
-                numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%s\n", tmp_str);     /* Flawfinder: ignore */
+                numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%s\n", tmp_str.c_str());     /* Flawfinder: ignore */
        }
        else
        {
@@ -1376,13 +1376,13 @@ std::string convertF32ToString(F32 val)
 //---------------------------------------------------------------------------
 // LLDataPackerAsciiFile implementation
 //---------------------------------------------------------------------------
-BOOL LLDataPackerAsciiFile::packString(const char *value, const char *name)
+BOOL LLDataPackerAsciiFile::packString(const std::string& value, const char *name)
 {
        BOOL success = TRUE;
        writeIndentedName(name);
        if (mFP)
        {
-                fprintf(mFP,"%s\n", value);     
+                fprintf(mFP,"%s\n", value.c_str());     
        }
        else if (mOutputStream)
        {
@@ -1829,11 +1829,11 @@ BOOL LLDataPackerAsciiFile::packUUID(const LLUUID &value, const char *name)
 {
        BOOL success = TRUE;
        writeIndentedName(name);
-        char tmp_str[64]; /*Flawfinder: ignore */
+        std::string tmp_str;
        value.toString(tmp_str);
        if (mFP)
        {
-                fprintf(mFP,"%s\n", tmp_str);
+                fprintf(mFP,"%s\n", tmp_str.c_str());
        }
        else if (mOutputStream)
        {
@@ -1877,7 +1877,7 @@ void LLDataPackerAsciiFile::writeIndentedName(const char *name)
        }
        else if (mOutputStream)
        {
-                *mOutputStream << indent_buf.c_str() << name << "\t";
+                *mOutputStream << indent_buf << name << "\t";
        }
 }
diff --git a/linden/indra/llmessage/lldatapacker.h b/linden/indra/llmessage/lldatapacker.h
index b1aa8fe..47dee99 100644
--- a/linden/indra/llmessage/lldatapacker.h
+++ b/linden/indra/llmessage/lldatapacker.h
@@ -49,7 +49,7 @@ public:
        virtual BOOL            hasNext() const = 0;
-        virtual BOOL            packString(const char *value, const char *name) = 0;
+        virtual BOOL            packString(const std::string& value, const char *name) = 0;
        virtual BOOL            unpackString(std::string& value, const char *name) = 0;
        virtual BOOL            packBinaryData(const U8 *value, S32 size, const char *name) = 0;
@@ -127,7 +127,7 @@ public:
        {
        }
-        /*virtual*/ BOOL                packString(const char *value, const char *name);
+        /*virtual*/ BOOL                packString(const std::string& value, const char *name);
        /*virtual*/ BOOL                unpackString(std::string& value, const char *name);
        /*virtual*/ BOOL                packBinaryData(const U8 *value, S32 size, const char *name);
@@ -229,7 +229,7 @@ public:
                mWriteEnabled = FALSE;
        }
-        /*virtual*/ BOOL                packString(const char *value, const char *name);
+        /*virtual*/ BOOL                packString(const std::string& value, const char *name);
        /*virtual*/ BOOL                unpackString(std::string& value, const char *name);
        /*virtual*/ BOOL                packBinaryData(const U8 *value, S32 size, const char *name);
@@ -358,7 +358,7 @@ public:
        {
        }
-        /*virtual*/ BOOL                packString(const char *value, const char *name);
+        /*virtual*/ BOOL                packString(const std::string& value, const char *name);
        /*virtual*/ BOOL                unpackString(std::string& value, const char *name);
        /*virtual*/ BOOL                packBinaryData(const U8 *value, S32 size, const char *name);
diff --git a/linden/indra/llmessage/lldispatcher.cpp b/linden/indra/llmessage/lldispatcher.cpp
index 0270721..541da42 100644
--- a/linden/indra/llmessage/lldispatcher.cpp
+++ b/linden/indra/llmessage/lldispatcher.cpp
@@ -111,8 +111,7 @@ bool LLDispatcher::unpackMessage(
                LLDispatcher::sparam_t& parameters)
 {
        char buf[MAX_STRING];   /*Flawfinder: ignore*/
-        msg->getStringFast(_PREHASH_MethodData, _PREHASH_Method, MAX_STRING, buf);
+        msg->getStringFast(_PREHASH_MethodData, _PREHASH_Method, method);
-        method.assign(buf);
        msg->getUUIDFast(_PREHASH_MethodData, _PREHASH_Invoice, invoice);
        S32 size;
        S32 count = msg->getNumberOfBlocksFast(_PREHASH_ParamList);
diff --git a/linden/indra/llmessage/llfiltersd2xmlrpc.cpp b/linden/indra/llmessage/llfiltersd2xmlrpc.cpp
index b3ebd0b..a3c33dd 100644
--- a/linden/indra/llmessage/llfiltersd2xmlrpc.cpp
+++ b/linden/indra/llmessage/llfiltersd2xmlrpc.cpp
@@ -81,7 +81,7 @@
 #include <sstream>
 #include <iterator>
 #include <xmlrpc-epi/xmlrpc.h>
-#include "apr-1/apr_base64.h"
+#include "apr_base64.h"
 #include "llbuffer.h"
 #include "llbufferstream.h"
diff --git a/linden/indra/llmessage/llhost.cpp b/linden/indra/llmessage/llhost.cpp
index e139f6d..34a0f92 100644
--- a/linden/indra/llmessage/llhost.cpp
+++ b/linden/indra/llmessage/llhost.cpp
@@ -66,34 +66,15 @@ LLHost::LLHost(const std::string& ip_and_port)
        }
 }
-void LLHost::getString(char* buffer, S32 length) const
+std::string LLHost::getString() const
 {
-        if (((U32) length) < MAXADDRSTR + 1 + 5)
+        return llformat("%s:%u", u32_to_ip_string(mIP), mPort);
-        {
-                llerrs << "LLHost::getString - string too short" << llendl;
-                return;
-        }
-        snprintf(buffer, length, "%s:%u", u32_to_ip_string(mIP), mPort);        /* Flawfinder: ignore */
-}
-void LLHost::getIPString(char* buffer, S32 length) const
-{
-        if ( ((U32) length) < MAXADDRSTR)
-        {
-                llerrs << "LLHost::getIPString - string too short" << llendl;
-                return;
-        }
-        snprintf(buffer, length, "%s", u32_to_ip_string(mIP));  /* Flawfinder: ignore */
 }
 std::string LLHost::getIPandPort() const
 {
-        char buffer[MAXADDRSTR + 1 + 5];        /*Flawfinder: ignore*/
+        return getString();
-        getString(buffer, sizeof(buffer));
-        return buffer;
 }
@@ -103,35 +84,6 @@ std::string LLHost::getIPString() const
 }
-void LLHost::getHostName(char *buf, S32 len) const
-{
-        hostent *he;
-        if (INVALID_HOST_IP_ADDRESS == mIP)
-        {
-                llwarns << "LLHost::getHostName() : Invalid IP address" << llendl;
-                buf[0] = '\0';
-                return;
-        }
-        he = gethostbyaddr((char *)&mIP, sizeof(mIP), AF_INET);
-        if (!he)
-        {
-#if LL_WINDOWS
-                llwarns << "LLHost::getHostName() : Couldn't find host name for address " << mIP << ", Error: " 
-                        << WSAGetLastError() << llendl;
-#else
-                llwarns << "LLHost::getHostName() : Couldn't find host name for address " << mIP << ", Error: " 
-                        << h_errno << llendl;
-#endif
-                buf[0] = '\0';                                          
-        }
-        else
-        {
-                strncpy(buf, he->h_name, len); /*Flawfinder: ignore*/
-                buf[len-1] = '\0';
-        }
-}
 std::string LLHost::getHostName() const
 {
        hostent* he;
@@ -158,28 +110,20 @@ std::string LLHost::getHostName() const
        }
 }
-BOOL LLHost::setHostByName(const char *string)
+BOOL LLHost::setHostByName(const std::string& hostname)
 {
        hostent *he;
-        char local_name[MAX_STRING];  /*Flawfinder: ignore*/
+        std::string local_name(hostname);
-        if (strlen(string)+1 > MAX_STRING) /*Flawfinder: ignore*/
-        {
-                llerrs << "LLHost::setHostByName() : Address string is too long: " 
-                        << string << llendl;
-        }
-        strncpy(local_name, string,MAX_STRING);  /*Flawfinder: ignore*/
-        local_name[MAX_STRING-1] = '\0';
 #if LL_WINDOWS
        // We may need an equivalent for Linux, but not sure - djs
-        _strupr(local_name);
+        LLStringUtil::toUpper(local_name);
 #endif
-        he = gethostbyname(local_name); 
+        he = gethostbyname(local_name.c_str()); 
        if(!he) 
        {
-                U32 ip_address = inet_addr(string);
+                U32 ip_address = inet_addr(hostname.c_str());
                he = gethostbyaddr((char *)&ip_address, sizeof(ip_address), AF_INET);
        }
diff --git a/linden/indra/llmessage/llhost.h b/linden/indra/llmessage/llhost.h
index 0b3afe8..819e7ca 100644
--- a/linden/indra/llmessage/llhost.h
+++ b/linden/indra/llmessage/llhost.h
@@ -61,10 +61,10 @@ public:
                mIP = ipv4_addr;
        }
-        LLHost( const char *ipv4_addr, U32 port )
+        LLHost( const std::string& ipv4_addr, U32 port )
        :       mPort( port )
        { 
-                mIP = ip_string_to_u32(ipv4_addr);
+                mIP = ip_string_to_u32(ipv4_addr.c_str());
        }
        explicit LLHost(const U64 ip_port)
@@ -82,11 +82,11 @@ public:
        // MANIPULATORS
        void    set( U32 ip, U32 port )                         { mIP = ip; mPort = port; }
-        void    set( const char* ipstr, U32 port )      { mIP = ip_string_to_u32(ipstr); mPort = port; }
+        void    set( const std::string& ipstr, U32 port )       { mIP = ip_string_to_u32(ipstr.c_str()); mPort = port; }
-        void    setAddress( const char* ipstr )         { mIP = ip_string_to_u32(ipstr); }
+        void    setAddress( const std::string& ipstr )          { mIP = ip_string_to_u32(ipstr.c_str()); }
        void    setAddress( U32 ip )                            { mIP = ip; }
        void    setPort( U32 port )                                     { mPort = port; }
-        BOOL    setHostByName(const char *hname);
+        BOOL    setHostByName(const std::string& hname);
        LLHost& operator=(const LLHost &rhs);
        void    invalidate()                        { mIP = INVALID_HOST_IP_ADDRESS; mPort = INVALID_PORT;};
@@ -96,10 +96,8 @@ public:
        U32             getPort() const                                                         { return mPort; }
        BOOL    isOk() const                                                            { return (mIP != INVALID_HOST_IP_ADDRESS) && (mPort != INVALID_PORT); }
        size_t  hash() const                                                            { return (mIP << 16) | (mPort & 0xffff); }
-        void    getString(char* buffer, S32 length) const;          // writes IP:port into buffer
+        std::string getString() const;
-        void    getIPString(char* buffer, S32 length) const;    // writes IP into buffer
        std::string getIPString() const;
-        void    getHostName(char *buf, S32 len) const;
        std::string getHostName() const;
        std::string getIPandPort() const;
diff --git a/linden/indra/llmessage/llhttpassetstorage.cpp b/linden/indra/llmessage/llhttpassetstorage.cpp
index 49896c6..fdd521f 100644
--- a/linden/indra/llmessage/llhttpassetstorage.cpp
+++ b/linden/indra/llmessage/llhttpassetstorage.cpp
@@ -81,8 +81,8 @@ class LLHTTPAssetRequest : public LLAssetRequest
 {
 public:
        LLHTTPAssetRequest(LLHTTPAssetStorage *asp, const LLUUID &uuid, 
-                                        LLAssetType::EType type, LLAssetStorage::ERequestType rt,
+                                           LLAssetType::EType type, LLAssetStorage::ERequestType rt,
-                                        const char *url, CURLM *curl_multi);
+                                           const std::string& url, CURLM *curl_multi);
        virtual ~LLHTTPAssetRequest();
        
        void setupCurlHandle();
@@ -103,7 +103,7 @@ public:
        CURL  *mCurlHandle;
        CURLM *mCurlMultiHandle;
-        char  *mURLBuffer;
+        std::string mURLBuffer;
        struct curl_slist *mHTTPHeaders;
        LLVFile *mVFile;
        LLUUID  mTmpUUID;
@@ -122,7 +122,7 @@ LLHTTPAssetRequest::LLHTTPAssetRequest(LLHTTPAssetStorage *asp,
                                                const LLUUID &uuid, 
                                                LLAssetType::EType type, 
                                                LLAssetStorage::ERequestType rt,
-                                                const char *url, 
+                                                const std::string& url, 
                                                CURLM *curl_multi)
        : LLAssetRequest(uuid, type),
        mZInitialized(false)
@@ -137,11 +137,7 @@ LLHTTPAssetRequest::LLHTTPAssetRequest(LLHTTPAssetStorage *asp,
        mZInputBuffer = NULL;
        mZInputExhausted = false;
        
-        mURLBuffer = new char[strlen(url) + 1]; /*Flawfinder: ignore*/
+        mURLBuffer = url;
-        if (mURLBuffer)
-        {
-            strcpy(mURLBuffer, url);    /*Flawfinder: ignore*/
-        }
 }
 LLHTTPAssetRequest::~LLHTTPAssetRequest()
@@ -156,7 +152,6 @@ LLHTTPAssetRequest::~LLHTTPAssetRequest()
        {
                curl_slist_free_all(mHTTPHeaders);
        }
-        delete[] mURLBuffer;
        delete   mVFile;
        finishCompressedUpload();
 }
@@ -242,7 +237,7 @@ void LLHTTPAssetRequest::setupCurlHandle()
        mCurlHandle = curl_easy_init();
        curl_easy_setopt(mCurlHandle, CURLOPT_NOSIGNAL, 1);
        curl_easy_setopt(mCurlHandle, CURLOPT_NOPROGRESS, 1);
-        curl_easy_setopt(mCurlHandle, CURLOPT_URL, mURLBuffer);
+        curl_easy_setopt(mCurlHandle, CURLOPT_URL, mURLBuffer.c_str());
        curl_easy_setopt(mCurlHandle, CURLOPT_PRIVATE, this);
        if (LLAssetStorage::RT_DOWNLOAD == mRequestType)
        {
@@ -400,9 +395,9 @@ size_t LLHTTPAssetRequest::curlCompressedUploadCallback(
 LLHTTPAssetStorage::LLHTTPAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
                                                                         LLVFS *vfs, const LLHost &upstream_host,
-                                                                         const char *web_host,
+                                                                         const std::string& web_host,
-                                                                         const char *local_web_host,
+                                                                         const std::string& local_web_host,
-                                                                         const char *host_name)
+                                                                         const std::string& host_name)
        : LLAssetStorage(msg, xfer, vfs, upstream_host)
 {
        _init(web_host, local_web_host, host_name);
@@ -410,15 +405,15 @@ LLHTTPAssetStorage::LLHTTPAssetStorage(LLMessageSystem *msg, LLXferManager *xfer
 LLHTTPAssetStorage::LLHTTPAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
                                                                           LLVFS *vfs,
-                                                                           const char *web_host,
+                                                                           const std::string& web_host,
-                                                                           const char *local_web_host,
+                                                                           const std::string& local_web_host,
-                                                                           const char *host_name)
+                                                                           const std::string& host_name)
        : LLAssetStorage(msg, xfer, vfs)
 {
        _init(web_host, local_web_host, host_name);
 }
-void LLHTTPAssetStorage::_init(const char *web_host, const char *local_web_host, const char* host_name)
+void LLHTTPAssetStorage::_init(const std::string& web_host, const std::string& local_web_host, const std::string& host_name)
 {
        mBaseURL = web_host;
        mLocalBaseURL = local_web_host;
@@ -470,7 +465,7 @@ void LLHTTPAssetStorage::storeAssetData(
                {
                        message = "Added to upload queue";
                }
-                reportMetric( uuid, type, NULL, requesting_agent_id, size, MR_OKAY, __FILE__, __LINE__, message );
+                reportMetric( uuid, type, LLStringUtil::null, requesting_agent_id, size, MR_OKAY, __FILE__, __LINE__, message );
                // this will get picked up and transmitted in checkForTimeouts
                if(store_local)
@@ -492,7 +487,7 @@ void LLHTTPAssetStorage::storeAssetData(
                if (callback)
                {
                        // LLAssetStorage metric: Zero size VFS
-                        reportMetric( uuid, type, NULL, requesting_agent_id, 0, MR_ZERO_SIZE, __FILE__, __LINE__, "The file didn't exist or was zero length (VFS - can't tell which)" );
+                        reportMetric( uuid, type, LLStringUtil::null, requesting_agent_id, 0, MR_ZERO_SIZE, __FILE__, __LINE__, "The file didn't exist or was zero length (VFS - can't tell which)" );
                        callback(uuid, user_data,  LL_ERR_ASSET_REQUEST_NONEXISTENT_FILE, LL_EXSTAT_NONEXISTENT_FILE);
                }
        }
@@ -500,7 +495,7 @@ void LLHTTPAssetStorage::storeAssetData(
 // virtual
 void LLHTTPAssetStorage::storeAssetData(
-        const char* filename,
+        const std::string& filename,
        const LLUUID& asset_id,
        LLAssetType::EType asset_type,
        LLStoreAssetCallback callback,
@@ -597,7 +592,7 @@ LLSD LLHTTPAssetStorage::getPendingDetails(LLAssetStorage::ERequestType rt,
                        LLSD& pending = sd["requests"][i];
                        // See if this pending request is running.
                        const LLAssetRequest* req = findRequest(running, 
-                                                                        LLAssetType::lookup(pending["type"].asString().c_str()),
+                                                                        LLAssetType::lookup(pending["type"].asString()),
                                                                        pending["asset_id"]);
                        if (req)
                        {
@@ -768,11 +763,11 @@ void LLHTTPAssetStorage::checkForTimeouts()
                // Setup this curl download request
                // We need to generate a new request here
                // since the one in the list could go away
-                char tmp_url[MAX_STRING]; /*Flawfinder: ignore*/
+                std::string tmp_url;
-                char uuid_str[UUID_STR_LENGTH]; /*Flawfinder: ignore*/
+                std::string uuid_str;
                req->getUUID().toString(uuid_str);
                std::string base_url = getBaseURL(req->getUUID(), req->getType());
-                snprintf(tmp_url, sizeof(tmp_url), "%s/%36s.%s", base_url.c_str() , uuid_str, LLAssetType::lookup(req->getType()));     /* Flawfinder: ignore */
+                tmp_url = llformat("%s/%36s.%s", base_url.c_str() , uuid_str.c_str(), LLAssetType::lookup(req->getType()));
                LLHTTPAssetRequest *new_req = new LLHTTPAssetRequest(this, req->getUUID(), 
                                                                                req->getType(), RT_DOWNLOAD, tmp_url, mCurlMultiHandle);
@@ -805,12 +800,11 @@ void LLHTTPAssetStorage::checkForTimeouts()
                bool do_compress = req->getType() == LLAssetType::AT_OBJECT;
-                char tmp_url[MAX_STRING];/*Flawfinder: ignore*/
+                std::string tmp_url;
-                char uuid_str[UUID_STR_LENGTH];/*Flawfinder: ignore*/
+                std::string uuid_str;
                req->getUUID().toString(uuid_str);
-                snprintf(tmp_url, sizeof(tmp_url),                                      /* Flawfinder: ignore */
+                tmp_url = mBaseURL + "/" + uuid_str + "." + LLAssetType::lookup(req->getType());
-                                do_compress ? "%s/%s.%s.gz" : "%s/%s.%s",
+                if (do_compress) tmp_url += ".gz";
-                                mBaseURL.c_str(), uuid_str, LLAssetType::lookup(req->getType())); 
                LLHTTPAssetRequest *new_req = new LLHTTPAssetRequest(this, req->getUUID(), 
                                                                        req->getType(), RT_UPLOAD, tmp_url, mCurlMultiHandle);
@@ -876,12 +870,12 @@ void LLHTTPAssetStorage::checkForTimeouts()
                // setup this curl upload request
                LLVFile file(mVFS, req->getUUID(), req->getType());
-                char tmp_url[MAX_STRING]; /*Flawfinder: ignore*/
+                std::string tmp_url;
-                char uuid_str[UUID_STR_LENGTH]; /*Flawfinder: ignore*/
+                std::string uuid_str;
                req->getUUID().toString(uuid_str);
                
                // KLW - All temporary uploads are saved locally "http://localhost:12041/asset"
-                snprintf(tmp_url, sizeof(tmp_url), "%s/%36s.%s", mLocalBaseURL.c_str(), uuid_str, LLAssetType::lookup(req->getType()));         /* Flawfinder: ignore */
+                tmp_url = llformat("%s/%36s.%s", mLocalBaseURL.c_str(), uuid_str.c_str(), LLAssetType::lookup(req->getType()));
                LLHTTPAssetRequest *new_req = new LLHTTPAssetRequest(this, req->getUUID(), 
                                                                                req->getType(), RT_LOCALUPLOAD, tmp_url, mCurlMultiHandle);
@@ -1160,7 +1154,7 @@ size_t LLHTTPAssetStorage::nullOutputCallback(void *data, size_t size, size_t nm
 // blocking asset fetch which bypasses the VFS
 // this is a very limited function for use by the simstate loader and other one-offs
-S32 LLHTTPAssetStorage::getURLToFile(const LLUUID& uuid, LLAssetType::EType asset_type, const LLString &url, const char *filename, progress_callback callback, void *userdata)
+S32 LLHTTPAssetStorage::getURLToFile(const LLUUID& uuid, LLAssetType::EType asset_type, const std::string &url, const std::string& filename, progress_callback callback, void *userdata)
 {
        // *NOTE: There is no guarantee that the uuid and the asset_type match
        // - not that it matters. - Doug
@@ -1174,7 +1168,7 @@ S32 LLHTTPAssetStorage::getURLToFile(const LLUUID& uuid, LLAssetType::EType asse
        }
        // make sure we use the normal curl setup, even though we don't really need a request object
-        LLHTTPAssetRequest req(this, uuid, asset_type, RT_DOWNLOAD, url.c_str(), mCurlMultiHandle);
+        LLHTTPAssetRequest req(this, uuid, asset_type, RT_DOWNLOAD, url, mCurlMultiHandle);
        req.mFP = fp;
        
        req.setupCurlHandle();
diff --git a/linden/indra/llmessage/llhttpassetstorage.h b/linden/indra/llmessage/llhttpassetstorage.h
index 71e973a..585b281 100644
--- a/linden/indra/llmessage/llhttpassetstorage.h
+++ b/linden/indra/llmessage/llhttpassetstorage.h
@@ -48,15 +48,15 @@ class LLHTTPAssetStorage : public LLAssetStorage
 public:
        LLHTTPAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
                                           LLVFS *vfs, const LLHost &upstream_host,
-                                           const char *web_host,
+                                           const std::string& web_host,
-                                           const char *local_web_host,
+                                           const std::string& local_web_host,
-                                           const char *host_name);
+                                           const std::string& host_name);
        LLHTTPAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
                                           LLVFS *vfs,
-                                           const char *web_host,
+                                           const std::string& web_host,
-                                           const char *local_web_host,
+                                           const std::string& local_web_host,
-                                           const char *host_name);
+                                           const std::string& host_name);
        virtual ~LLHTTPAssetStorage();
@@ -74,7 +74,7 @@ public:
                F64 timeout=LL_ASSET_STORAGE_TIMEOUT);
        virtual void storeAssetData(
-                const char* filename,
+                const std::string& filename,
                const LLUUID& asset_id,
                LLAssetType::EType atype,
                LLStoreAssetCallback callback,
@@ -99,7 +99,7 @@ public:
        // Hack.  One off curl download an URL to a file.  Probably should be elsewhere.
        // Only used by lldynamicstate.  The API is broken, and should be replaced with
        // a generic HTTP file fetch - Doug 9/25/06
-        S32 getURLToFile(const LLUUID& uuid, LLAssetType::EType asset_type, const LLString &url, const char *filename, progress_callback callback, void *userdata);
+        S32 getURLToFile(const LLUUID& uuid, LLAssetType::EType asset_type, const std::string &url, const std::string& filename, progress_callback callback, void *userdata);
        
        LLAssetRequest* findNextRequest(request_list_t& pending, request_list_t& running);
@@ -135,7 +135,7 @@ protected:
                                                   void *user_data, BOOL duplicate, BOOL is_priority);
 private:
-        void _init(const char *web_host, const char *local_web_host, const char* host_name);
+        void _init(const std::string& web_host, const std::string& local_web_host, const std::string& host_name);
        // This will return the correct base URI for any http asset request
        std::string getBaseURL(const LLUUID& asset_id, LLAssetType::EType asset_type);
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index 22c0c68..caeaee1 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -122,7 +122,7 @@ namespace
        {
        public:
                RawInjector(const U8* data, S32 size) : mData(data), mSize(size) {}
-                virtual ~RawInjector() {}
+                virtual ~RawInjector() {delete mData;}
                const char* contentType() { return "application/octet-stream"; }
@@ -152,17 +152,22 @@ namespace
                {
                        LLBufferStream ostream(channels, buffer.get());
-                        llifstream fstream(mFilename.c_str(), std::iostream::binary | std::iostream::out);
+                        llifstream fstream(mFilename, std::iostream::binary | std::iostream::out);
-            fstream.seekg(0, std::ios::end);
+                        if(fstream.is_open())
-            U32 fileSize = fstream.tellg();
+                        {
-            fstream.seekg(0, std::ios::beg);
+                                fstream.seekg(0, std::ios::end);
-                        char* fileBuffer;
+                                U32 fileSize = fstream.tellg();
-                        fileBuffer = new char [fileSize];
+                                fstream.seekg(0, std::ios::beg);
-            fstream.read(fileBuffer, fileSize);
+                                char* fileBuffer;
-            ostream.write(fileBuffer, fileSize);
+                                fileBuffer = new char [fileSize];
-                        fstream.close();
+                                fstream.read(fileBuffer, fileSize);
-                        eos = true;
+                                ostream.write(fileBuffer, fileSize);
-                        return STATUS_DONE;
+                                fstream.close();
+                                eos = true;
+                                return STATUS_DONE;
+                        }
+                        
+                        return STATUS_ERROR;
                }
                const std::string mFilename;
@@ -199,14 +204,13 @@ namespace
        LLPumpIO* theClientPump = NULL;
 }
-static void request(const std::string& url,
+static void request(
-                                        LLURLRequest::ERequestAction method,
+        const std::string& url,
-                                        Injector* body_injector,
+        LLURLRequest::ERequestAction method,
-                                        LLCurl::ResponderPtr responder,
+        Injector* body_injector,
-                                        const LLSD& headers = LLSD(),
+        LLCurl::ResponderPtr responder,
-                                        const F32 timeout = HTTP_REQUEST_EXPIRY_SECS,
+        const F32 timeout = HTTP_REQUEST_EXPIRY_SECS,
-                                        S32 offset = 0,
+        const LLSD& headers = LLSD())
-                                        S32 bytes = 0)
 {
        if (!LLHTTPClient::hasPump())
        {
@@ -215,7 +219,7 @@ static void request(const std::string& url,
        }
        LLPumpIO::chain_t chain;
-        LLURLRequest *req = new LLURLRequest(method, url);
+        LLURLRequest* req = new LLURLRequest(method, url);
        req->checkRootCertificate(true);
    // Insert custom headers is the caller sent any
@@ -234,10 +238,10 @@ static void request(const std::string& url,
            //to not use the proxy (read: llurlrequest.cpp)
            if ((iter->first == "Pragma") && (iter->second.asString() == ""))
            {
-                req->useProxy(FALSE);
+                req->useProxy(false);
            }
            header << iter->first << ": " << iter->second.asString() ;
-            llinfos << "header = " << header.str() << llendl;
+            lldebugs << "header = " << header.str() << llendl;
            req->addHeader(header.str().c_str());
        }
    }
@@ -257,25 +261,27 @@ static void request(const std::string& url,
                chain.push_back(LLIOPipe::ptr_t(body_injector));
        }
-        if (method == LLURLRequest::HTTP_GET && (offset > 0 || bytes > 0))
-        {
-                std::string range = llformat("Range: bytes=%d-%d", offset,offset+bytes-1);
-                req->addHeader(range.c_str());
-        }
-        
        chain.push_back(LLIOPipe::ptr_t(req));
        theClientPump->addChain(chain, timeout);
 }
-void LLHTTPClient::getByteRange(const std::string& url,
+void LLHTTPClient::getByteRange(
-                                                                S32 offset, S32 bytes,
+        const std::string& url,
-                                                                ResponderPtr responder,
+        S32 offset,
-                                                                const LLSD& headers,
+        S32 bytes,
-                                                                const F32 timeout)
+        ResponderPtr responder,
+        const LLSD& hdrs,
+        const F32 timeout)
 {
-    request(url, LLURLRequest::HTTP_GET, NULL, responder, LLSD(), timeout, offset, bytes);
+        LLSD headers = hdrs;
+        if(offset > 0 || bytes > 0)
+        {
+                std::string range = llformat("bytes=%d-%d", offset, offset+bytes-1);
+                headers["Range"] = range;
+        }
+    request(url,LLURLRequest::HTTP_GET, NULL, responder, timeout, headers);
 }
 void LLHTTPClient::head(const std::string& url, ResponderPtr responder, const F32 timeout)
@@ -285,11 +291,11 @@ void LLHTTPClient::head(const std::string& url, ResponderPtr responder, const F3
 void LLHTTPClient::get(const std::string& url, ResponderPtr responder, const LLSD& headers, const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_GET, NULL, responder, headers, timeout);
+        request(url, LLURLRequest::HTTP_GET, NULL, responder, timeout, headers);
 }
 void LLHTTPClient::getHeaderOnly(const std::string& url, ResponderPtr responder, const LLSD& headers, const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_HEAD, NULL, responder, headers, timeout);
+        request(url, LLURLRequest::HTTP_HEAD, NULL, responder, timeout, headers);
 }
 void LLHTTPClient::getHeaderOnly(const std::string& url, ResponderPtr responder, const F32 timeout)
 {
@@ -401,17 +407,11 @@ void LLHTTPClient::post(const std::string& url, const LLSD& body, ResponderPtr r
        request(url, LLURLRequest::HTTP_POST, new LLSDInjector(body), responder, timeout);
 }
-void LLHTTPClient::post(const std::string& url, const U8* data, S32 size, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::postRaw(const std::string& url, const U8* data, S32 size, ResponderPtr responder, const F32 timeout)
 {
        request(url, LLURLRequest::HTTP_POST, new RawInjector(data, size), responder, timeout);
 }
-void LLHTTPClient::del(const std::string& url, ResponderPtr responder, const F32 timeout)
-{
-        request(url, LLURLRequest::HTTP_DELETE, NULL, responder, timeout);
-}
-#if 1
 void LLHTTPClient::postFile(const std::string& url, const std::string& filename, ResponderPtr responder, const F32 timeout)
 {
        request(url, LLURLRequest::HTTP_POST, new FileInjector(filename), responder, timeout);
@@ -422,7 +422,28 @@ void LLHTTPClient::postFile(const std::string& url, const LLUUID& uuid,
 {
        request(url, LLURLRequest::HTTP_POST, new VFileInjector(uuid, asset_type), responder, timeout);
 }
-#endif
+// static
+void LLHTTPClient::del(
+        const std::string& url,
+        ResponderPtr responder,
+        const F32 timeout)
+{
+        request(url, LLURLRequest::HTTP_DELETE, NULL, responder, timeout);
+}
+// static
+void LLHTTPClient::move(
+        const std::string& url,
+        const std::string& destination,
+        ResponderPtr responder,
+        const F32 timeout)
+{
+        LLSD headers;
+        headers["Destination"] = destination;
+        request(url, LLURLRequest::HTTP_MOVE, NULL, responder, timeout, headers);
+}
 void LLHTTPClient::setPump(LLPumpIO& pump)
 {
diff --git a/linden/indra/llmessage/llhttpclient.h b/linden/indra/llmessage/llhttpclient.h
index df31b44..50c6f7a 100644
--- a/linden/indra/llmessage/llhttpclient.h
+++ b/linden/indra/llmessage/llhttpclient.h
@@ -60,7 +60,8 @@ public:
        typedef LLCurl::Responder Responder;
        typedef LLCurl::ResponderPtr ResponderPtr;
-        // non-blocking
+        /** @name non-blocking API */
+        //@{
        static void head(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
        static void getByteRange(const std::string& url, S32 offset, S32 bytes, ResponderPtr, const LLSD& headers=LLSD(), const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
        static void get(const std::string& url, ResponderPtr, const LLSD& headers = LLSD(), const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
@@ -70,13 +71,38 @@ public:
        static void getHeaderOnly(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
        static void getHeaderOnly(const std::string& url, ResponderPtr, const LLSD& headers, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
-        ///< non-blocking
        static void post(const std::string& url, const LLSD& body, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
-        static void post(const std::string& url, const U8* data, S32 size, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        /** Takes ownership of data and deletes it when sent */
+        static void postRaw(const std::string& url, const U8* data, S32 size, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        
        static void postFile(const std::string& url, const std::string& filename, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        #
        static void postFile(const std::string& url, const LLUUID& uuid,
                LLAssetType::EType asset_type, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void del(
+                const std::string& url,
+                ResponderPtr responder,
+                const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+                ///< sends a DELETE method, but we can't call it delete in c++
+        
+        /**
+         * @brief Send a MOVE webdav method
+         *
+         * @param url The complete serialized (and escaped) url to get.
+         * @param destination The complete serialized destination url.
+         * @param responder The responder that will handle the result.
+         * @param timeout The number of seconds to give the server to respond.
+         */
+        static void move(
+                const std::string& url,
+                const std::string& destination,
+                ResponderPtr responder,
+                const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        //@}
        /**
         * @brief Blocking HTTP get that returns an LLSD map of status and body.
         *
@@ -85,9 +111,7 @@ public:
         */
        static LLSD blockingGet(const std::string& url);
-        static void del(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
-                ///< sends a DELETE method, but we can't call it delete in c++
-        
        
        static void setPump(LLPumpIO& pump);
                ///< must be called before any of the above calls are made
diff --git a/linden/indra/llmessage/llhttpnode.cpp b/linden/indra/llmessage/llhttpnode.cpp
index 46f2061..772fb17 100644
--- a/linden/indra/llmessage/llhttpnode.cpp
+++ b/linden/indra/llmessage/llhttpnode.cpp
@@ -174,6 +174,26 @@ LLSD LLHTTPNode::del(const LLSD&) const
        throw NotImplemented();
 }
+// virtual
+void  LLHTTPNode::options(ResponsePtr response, const LLSD& context) const
+{
+        //llinfos << "options context: " << context << llendl;
+        // default implementation constructs an url to the documentation.
+        std::string host = context[CONTEXT_REQUEST]["headers"]["host"].asString();
+        if(host.empty())
+        {
+                response->status(400, "Bad Request -- need Host header");
+                return;
+        }
+        std::ostringstream ostr;
+        ostr << "http://" << host << "/web/server/api";
+        ostr << context[CONTEXT_REQUEST]["path"].asString();
+        static const std::string DOC_HEADER("X-Documentation-URL");
+        response->addHeader(DOC_HEADER, ostr.str());
+        response->status(200, "OK");
+}
 // virtual
 LLHTTPNode* LLHTTPNode::getChild(const std::string& name, LLSD& context) const
@@ -386,6 +406,13 @@ void LLHTTPNode::Response::methodNotAllowed()
        status(405, "Method Not Allowed");
 }
+void LLHTTPNode::Response::addHeader(
+        const std::string& name,
+        const std::string& value)
+{
+        mHeaders[name] = value;
+}
 void LLHTTPNode::describe(Description& desc) const
 {
        desc.shortInfo("unknown service (missing describe() method)");
diff --git a/linden/indra/llmessage/llhttpnode.h b/linden/indra/llmessage/llhttpnode.h
index 02e8ceb..4339e5c 100644
--- a/linden/indra/llmessage/llhttpnode.h
+++ b/linden/indra/llmessage/llhttpnode.h
@@ -82,33 +82,79 @@ public:
        */
        //@{
 public: 
-                virtual LLSD get() const;
-                virtual LLSD put(const LLSD& input) const;
-                virtual LLSD post(const LLSD& input) const;
-                virtual LLSD del(const LLSD& context) const;
+        virtual LLSD get() const;
+        virtual LLSD put(const LLSD& input) const;
+        virtual LLSD post(const LLSD& input) const;
+        virtual LLSD del(const LLSD& context) const;
-                class Response : public LLRefCount
+        class Response : public LLRefCount
-                {
+        {
-                protected:
+        protected:
-                        virtual ~Response();
+                virtual ~Response();
-                public:
+        public:
-                        virtual void result(const LLSD&) = 0;
+                /**
-                        virtual void status(S32 code, const std::string& message) = 0;
+                 * @brief Return the LLSD content and a 200 OK.
+                 */
+                virtual void result(const LLSD&) = 0;
+                /**
+                 * @brief return status code and reason string on http header,
+                 * but do not return a payload.
+                 */
+                virtual void status(S32 code, const std::string& message) = 0;
+                /**
+                 * @brief Return no body, just status code and 'UNKNOWN ERROR'.
+                 */
+                void status(S32 code);
+                void notFound(const std::string& message);
+                void notFound();
+                void methodNotAllowed();
+                /**
+                 * @breif Add a name: value http header.
+                 *
+                 * No effort is made to ensure the response is a valid http
+                 * header.
+                 * The headers are stored as a map of header name : value.
+                 * Though HTTP allows the same header name to be transmitted
+                 * more than once, this implementation only stores a header
+                 * name once.
+                 * @param name The name of the header, eg, "Content-Encoding"
+                 * @param value The value of the header, eg, "gzip"
+                 */
+                void addHeader(const std::string& name, const std::string& value);
+        protected:
+                /**
+                 * @brief Headers to be sent back with the HTTP response.
+                 *
+                 * Protected class membership since derived classes are
+                 * expected to use it and there is no use case yet for other
+                 * uses. If such a use case arises, I suggest making a
+                 * headers() public method, and moving this member data into
+                 * private.
+                 */
+                LLSD mHeaders;
+        };
-                        void status(S32 code);
-                        void notFound(const std::string& message);
-                        void notFound();
-                        void methodNotAllowed();
-                };
-                typedef LLPointer<Response> ResponsePtr;
+        typedef LLPointer<Response> ResponsePtr;
-                virtual void get(ResponsePtr, const LLSD& context) const;
+        virtual void get(ResponsePtr, const LLSD& context) const;
-                virtual void put(ResponsePtr, const LLSD& context, const LLSD& input) const;
+        virtual void put(
-                virtual void post(ResponsePtr, const LLSD& context, const LLSD& input) const;
+                ResponsePtr,
-                virtual void del(ResponsePtr, const LLSD& context) const;
+                const LLSD& context,
+                const LLSD& input) const;
+        virtual void post(
+                ResponsePtr,
+                const LLSD& context,
+                const LLSD& input) const;
+        virtual void del(ResponsePtr, const LLSD& context) const;
+        virtual void options(ResponsePtr, const LLSD& context) const;
        //@}
        
diff --git a/linden/indra/llmessage/llhttpsender.cpp b/linden/indra/llmessage/llhttpsender.cpp
index f0b453d..f72a7be 100644
--- a/linden/indra/llmessage/llhttpsender.cpp
+++ b/linden/indra/llmessage/llhttpsender.cpp
@@ -52,7 +52,7 @@ LLHTTPSender::~LLHTTPSender()
 }
 //virtual 
-void LLHTTPSender::send(const LLHost& host, const char* name, 
+void LLHTTPSender::send(const LLHost& host, const std::string& name, 
                                                const LLSD& body, 
                                                LLHTTPClient::ResponderPtr response) const
 {
diff --git a/linden/indra/llmessage/llhttpsender.h b/linden/indra/llmessage/llhttpsender.h
index 86dd754..9073f48 100644
--- a/linden/indra/llmessage/llhttpsender.h
+++ b/linden/indra/llmessage/llhttpsender.h
@@ -45,7 +45,7 @@ class LLHTTPSender
        /** @brief Send message to host with body, call response when done */ 
        virtual void send(const LLHost& host, 
-                                          const char* message, const LLSD& body, 
+                                          const std::string& message, const LLSD& body, 
                                          LLHTTPClient::ResponderPtr response) const;
        /** @brief Set sender for host, takes ownership of sender. */
diff --git a/linden/indra/llmessage/llinstantmessage.cpp b/linden/indra/llmessage/llinstantmessage.cpp
index 390a6fa..5012741 100644
--- a/linden/indra/llmessage/llinstantmessage.cpp
+++ b/linden/indra/llmessage/llinstantmessage.cpp
@@ -59,7 +59,7 @@ const S32 VOTE_UNANIMOUS = 2;
 const char EMPTY_BINARY_BUCKET[] = "";
 const S32 EMPTY_BINARY_BUCKET_SIZE = 1;
 const U32 NO_TIMESTAMP = 0;
-const char SYSTEM_FROM[] = "Second Life";
+const std::string SYSTEM_FROM("Second Life");
 const S32 IM_TTL = 1;
@@ -144,8 +144,8 @@ void LLIMInfo::packMessageBlock(LLMessageSystem* msg) const
                mFromGroup,
                LLUUID::null,
                mToID,
-                mName.c_str(),
+                mName,
-                mMessage.c_str(),
+                mMessage,
                mOffline,
                mIMType,
                mID,
@@ -163,8 +163,8 @@ void pack_instant_message(
        BOOL from_group,
        const LLUUID& session_id,
        const LLUUID& to_id,
-        const char* name,
+        const std::string& name,
-        const char* message,
+        const std::string& message,
        U8 offline,
        EInstantMessage dialog,
        const LLUUID& id,
@@ -202,8 +202,8 @@ void pack_instant_message_block(
        BOOL from_group,
        const LLUUID& session_id,
        const LLUUID& to_id,
-        const char* name,
+        const std::string& name,
-        const char* message,
+        const std::string& message,
        U8 offline,
        EInstantMessage dialog,
        const LLUUID& id,
@@ -229,10 +229,10 @@ void pack_instant_message_block(
        msg->addU32Fast(_PREHASH_Timestamp, timestamp);
        msg->addStringFast(_PREHASH_FromAgentName, name);
        S32 bytes_left = MTUBYTES;
-        if(message)
+        if(!message.empty())
        {
                char buffer[MTUBYTES];
-                int num_written = snprintf(buffer, MTUBYTES, "%s", message);    /* Flawfinder: ignore */
+                int num_written = snprintf(buffer, MTUBYTES, "%s", message.c_str());    /* Flawfinder: ignore */
                // snprintf returns number of bytes that would have been written
                // had the output not being truncated. In that case, it will
                // return either -1 or value >= passed in size value . So a check needs to be added
@@ -281,13 +281,9 @@ void LLIMInfo::unpackMessageBlock(LLMessageSystem* msg)
        mIMType = (EInstantMessage) dialog;
        msg->getUUIDFast(_PREHASH_MessageBlock, _PREHASH_ID, mID);
        msg->getU32Fast(_PREHASH_MessageBlock, _PREHASH_Timestamp, mTimeStamp);
-        char name[DB_FULL_NAME_BUF_SIZE];       /*Flawfinder: ignore*/
+        msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_FromAgentName, mName);
-        msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_FromAgentName, DB_FULL_NAME_BUF_SIZE, name);
-        mName.assign(name);
-        char message[DB_IM_MSG_BUF_SIZE];       /*Flawfinder: ignore*/
+        msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_Message, mMessage);
-        msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_Message, DB_IM_MSG_BUF_SIZE, message);
-        mMessage.assign(message);
        S32 binary_bucket_size = llmin(
                MTUBYTES,
diff --git a/linden/indra/llmessage/llinstantmessage.h b/linden/indra/llmessage/llinstantmessage.h
index 35127c3..d95b551 100644
--- a/linden/indra/llmessage/llinstantmessage.h
+++ b/linden/indra/llmessage/llinstantmessage.h
@@ -222,7 +222,7 @@ extern const char EMPTY_BINARY_BUCKET[];
 extern const S32 EMPTY_BINARY_BUCKET_SIZE;
 extern const U32 NO_TIMESTAMP;
-extern const char SYSTEM_FROM[];
+extern const std::string SYSTEM_FROM;
 // Number of retry attempts on sending the im.
 extern const S32 IM_TTL;
@@ -289,8 +289,8 @@ void pack_instant_message(
        BOOL from_group,
        const LLUUID& session_id,
        const LLUUID& to_id,
-        const char* name,
+        const std::string& name,
-        const char* message,
+        const std::string& message,
        U8 offline = IM_ONLINE,
        EInstantMessage dialog = IM_NOTHING_SPECIAL,
        const LLUUID& id = LLUUID::null,
@@ -307,8 +307,8 @@ void pack_instant_message_block(
        BOOL from_group,
        const LLUUID& session_id,
        const LLUUID& to_id,
-        const char* name,
+        const std::string& name,
-        const char* message,
+        const std::string& message,
        U8 offline = IM_ONLINE,
        EInstantMessage dialog = IM_NOTHING_SPECIAL,
        const LLUUID& id = LLUUID::null,
diff --git a/linden/indra/llmessage/lliohttpserver.cpp b/linden/indra/llmessage/lliohttpserver.cpp
index 2ebf117..d4155f6 100644
--- a/linden/indra/llmessage/lliohttpserver.cpp
+++ b/linden/indra/llmessage/lliohttpserver.cpp
@@ -57,10 +57,13 @@
 static const char HTTP_VERSION_STR[] = "HTTP/1.0";
 static const std::string CONTEXT_REQUEST("request");
 static const std::string CONTEXT_RESPONSE("response");
+static const std::string CONTEXT_VERB("verb");
+static const std::string CONTEXT_HEADERS("headers");
 static const std::string HTTP_VERB_GET("GET");
 static const std::string HTTP_VERB_PUT("PUT");
 static const std::string HTTP_VERB_POST("POST");
 static const std::string HTTP_VERB_DELETE("DELETE");
+static const std::string HTTP_VERB_OPTIONS("OPTIONS");
 static LLIOHTTPServer::timing_callback_t sTimingCallback = NULL;
 static void* sTimingCallbackData = NULL;
@@ -130,6 +133,7 @@ private:
        LLSD mGoodResult;
        S32 mStatusCode;
        std::string mStatusMessage;     
+        LLSD mHeaders;
 };
 LLIOPipe::EStatus LLHTTPPipe::process_impl(
@@ -164,7 +168,7 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
                static LLTimer timer;
                timer.reset();
-                std::string verb = context[CONTEXT_REQUEST]["verb"];
+                std::string verb = context[CONTEXT_REQUEST][CONTEXT_VERB];
                if(verb == HTTP_VERB_GET)
                {
                        mNode.get(LLHTTPNode::ResponsePtr(mResponse), context);
@@ -185,6 +189,10 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
                {
                        mNode.del(LLHTTPNode::ResponsePtr(mResponse), context);
                }               
+                else if(verb == HTTP_VERB_OPTIONS)
+                {
+                        mNode.options(LLHTTPNode::ResponsePtr(mResponse), context);
+                }               
                else 
                {
                    mResponse->methodNotAllowed();
@@ -231,7 +239,9 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
                case STATE_GOOD_RESULT:
                {
-                        context[CONTEXT_RESPONSE]["contentType"] = "application/xml";
+                        LLSD headers = mHeaders;
+                        headers["Content-Type"] = "application/xml";
+                        context[CONTEXT_RESPONSE][CONTEXT_HEADERS] = headers;
                        LLBufferStream ostr(channels, buffer.get());
                        LLSDSerialize::toXML(mGoodResult, ostr);
@@ -240,7 +250,9 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
                case STATE_STATUS_RESULT:
                {
-                        context[CONTEXT_RESPONSE]["contentType"] = "text/plain";
+                        LLSD headers = mHeaders;
+                        headers["Content-Type"] = "text/plain";
+                        context[CONTEXT_RESPONSE][CONTEXT_HEADERS] = headers;
                        context[CONTEXT_RESPONSE]["statusCode"] = mStatusCode;
                        context[CONTEXT_RESPONSE]["statusMessage"] = mStatusMessage;
                        LLBufferStream ostr(channels, buffer.get());
@@ -287,6 +299,7 @@ void LLHTTPPipe::Response::result(const LLSD& r)
        mPipe->mStatusMessage = "OK";
        mPipe->mGoodResult = r;
        mPipe->mState = STATE_GOOD_RESULT;
+        mPipe->mHeaders = mHeaders;
        mPipe->unlockChain();   
 }
@@ -302,6 +315,7 @@ void LLHTTPPipe::Response::status(S32 code, const std::string& message)
        mPipe->mStatusCode = code;
        mPipe->mStatusMessage = message;
        mPipe->mState = STATE_STATUS_RESULT;
+        mPipe->mHeaders = mHeaders;
        mPipe->unlockChain();
 }
@@ -389,17 +403,24 @@ LLIOPipe::EStatus LLHTTPResponseHeader::process_impl(
                }
                
                ostr << HTTP_VERSION_STR << " " << code << " " << message << "\r\n";
-                
-                std::string type = context[CONTEXT_RESPONSE]["contentType"].asString();
-                if (!type.empty())
-                {
-                        ostr << "Content-Type: " << type << "\r\n";
-                }
                S32 content_length = buffer->countAfter(channels.in(), NULL);
                if(0 < content_length)
                {
                        ostr << "Content-Length: " << content_length << "\r\n";
                }
+                // *NOTE: This guard can go away once the LLSD static map
+                // iterator is available. Phoenix. 2008-05-09
+                LLSD headers = context[CONTEXT_RESPONSE][CONTEXT_HEADERS];
+                if(headers.isDefined())
+                {
+                        LLSD::map_iterator iter = headers.beginMap();
+                        LLSD::map_iterator end = headers.endMap();
+                        for(; iter != end; ++iter)
+                        {
+                                ostr << (*iter).first << ": " << (*iter).second.asString()
+                                        << "\r\n";
+                        }
+                }
                ostr << "\r\n";
                LLChangeChannel change(channels.in(), channels.out());
@@ -606,11 +627,12 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
                                read_next_line = true;
                                LLMemoryStream header((U8*)buf, len);
                                header >> mVerb;
-                                
                                if((HTTP_VERB_GET == mVerb)
                                   || (HTTP_VERB_POST == mVerb)
                                   || (HTTP_VERB_PUT == mVerb)
-                                   || (HTTP_VERB_DELETE == mVerb))
+                                   || (HTTP_VERB_DELETE == mVerb)
+                                   || (HTTP_VERB_OPTIONS == mVerb))
                                {
                                        header >> mAbsPathAndQuery;
                                        header >> mVersion;
@@ -685,7 +707,7 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
                                        read_next_line = true;
                                        std::string name(buf, pos_colon - buf);
                                        std::string value(pos_colon + 2);
-                                        LLString::toLower(name);
+                                        LLStringUtil::toLower(name);
                                        if("content-length" == name)
                                        {
                                                lldebugs << "Content-Length: " << value << llendl;
@@ -693,7 +715,7 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
                                        }
                                        else
                                        {
-                                                LLString::trimTail(value);
+                                                LLStringUtil::trimTail(value);
                                                mHeaders[name] = value;
                                        }
                                }
@@ -721,7 +743,7 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
        {
                // hey, hey, we should have everything now, so we pass it to
                // a content handler.
-                context[CONTEXT_REQUEST]["verb"] = mVerb;
+                context[CONTEXT_REQUEST][CONTEXT_VERB] = mVerb;
                const LLHTTPNode* node = mRootNode.traverse(mPath, context);
                if(node)
                {
@@ -765,7 +787,7 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
                                = mBuildContext["remote-host"];
                        context[CONTEXT_REQUEST]["remote-port"]
                                = mBuildContext["remote-port"];
-                        context[CONTEXT_REQUEST]["headers"] = mHeaders;
+                        context[CONTEXT_REQUEST][CONTEXT_HEADERS] = mHeaders;
                        const LLChainIOFactory* protocolHandler
                                = node->getProtocolHandler();
diff --git a/linden/indra/llmessage/lliopipe.cpp b/linden/indra/llmessage/lliopipe.cpp
index 3b52fae..1e40940 100644
--- a/linden/indra/llmessage/lliopipe.cpp
+++ b/linden/indra/llmessage/lliopipe.cpp
@@ -55,6 +55,7 @@ static const std::string STATUS_ERROR_NAMES[LLIOPipe::STATUS_ERROR_COUNT] =
        std::string("STATUS_EXPIRED"),
 };
+#ifdef LL_DEBUG_PUMPS
 // Debugging schmutz for deadlock
 const char      *gPumpFile = "";
 S32                     gPumpLine = 0;
@@ -64,6 +65,7 @@ void pump_debug(const char *file, S32 line)
        gPumpFile = file;
        gPumpLine = line;
 }
+#endif /* LL_DEBUG_PUMPS */
 /**
 * LLIOPipe
diff --git a/linden/indra/llmessage/lliopipe.h b/linden/indra/llmessage/lliopipe.h
index 97c6246..a451dd7 100644
--- a/linden/indra/llmessage/lliopipe.h
+++ b/linden/indra/llmessage/lliopipe.h
@@ -36,7 +36,7 @@
 #include <boost/intrusive_ptr.hpp>
 #include <boost/shared_ptr.hpp>
-#include "apr-1/apr_poll.h"
+#include "apr_poll.h"
 #include "llsd.h"
@@ -46,11 +46,14 @@ class LLBufferArray;
 class LLChannelDescriptors;
 // Debugging schmutz for deadlocks
-#define LL_DEBUG_PUMPS
+//#define LL_DEBUG_PUMPS
 #ifdef LL_DEBUG_PUMPS
 void pump_debug(const char *file, S32 line);
 #define PUMP_DEBUG pump_debug(__FILE__, __LINE__);
 #define END_PUMP_DEBUG pump_debug("none", 0);
+#else /* LL_DEBUG_PUMPS */
+#define PUMP_DEBUG
+#define END_PUMP_DEBUG
 #endif
diff --git a/linden/indra/llmessage/lliosocket.cpp b/linden/indra/llmessage/lliosocket.cpp
index 26fd0b2..dec83b0 100644
--- a/linden/indra/llmessage/lliosocket.cpp
+++ b/linden/indra/llmessage/lliosocket.cpp
@@ -68,7 +68,7 @@ bool is_addr_in_use(apr_status_t status)
 // Define this to see the actual file descriptors being tossed around.
 //#define LL_DEBUG_SOCKET_FILE_DESCRIPTORS 1
 #if LL_DEBUG_SOCKET_FILE_DESCRIPTORS
-#include "apr-1/apr_portable.h"
+#include "apr_portable.h"
 #endif
 #endif
@@ -220,11 +220,11 @@ bool LLSocket::blockingConnect(const LLHost& host)
 {
        if(!mSocket) return false;
        apr_sockaddr_t* sa = NULL;
-        char ip_address[MAXADDRSTR];    /*Flawfinder: ignore*/
+        std::string ip_address;
-        host.getIPString(ip_address, MAXADDRSTR);
+        ip_address = host.getIPString();
        if(ll_apr_warn_status(apr_sockaddr_info_get(
                &sa,
-                ip_address,
+                ip_address.c_str(),
                APR_UNSPEC,
                host.getPort(),
                0,
diff --git a/linden/indra/llmessage/lliosocket.h b/linden/indra/llmessage/lliosocket.h
index f0b788e..5b6c11f 100644
--- a/linden/indra/llmessage/lliosocket.h
+++ b/linden/indra/llmessage/lliosocket.h
@@ -43,8 +43,8 @@
 */
 #include "lliopipe.h"
-#include "apr-1/apr_pools.h"
+#include "apr_pools.h"
-#include "apr-1/apr_network_io.h"
+#include "apr_network_io.h"
 #include "llchainio.h"
 class LLHost;
diff --git a/linden/indra/llmessage/llmail.cpp b/linden/indra/llmessage/llmail.cpp
index 659803a..8ae7206 100644
--- a/linden/indra/llmessage/llmail.cpp
+++ b/linden/indra/llmessage/llmail.cpp
@@ -42,10 +42,9 @@
 #include <string>
 #include <sstream>
-#include <boost/regex.hpp>
-#include "apr-1/apr_pools.h"
+#include "apr_pools.h"
-#include "apr-1/apr_network_io.h"
+#include "apr_network_io.h"
 #include "llapr.h"
 #include "llbase32.h"   // IM-to-email address
@@ -66,8 +65,6 @@ static apr_pool_t* gMailPool;
 static apr_sockaddr_t* gSockAddr;
 static apr_socket_t* gMailSocket;
-// According to RFC2822
-static const boost::regex valid_subject_chars("[\\x1-\\x9\\xb\\xc\\xe-\\x7f]*");
 bool connect_smtp();
 void disconnect_smtp();
 
@@ -173,6 +170,22 @@ void LLMail::enable(bool mail_enabled)
        gMailEnabled = mail_enabled;
 }
+// Test a subject line for RFC2822 compliance.
+static bool valid_subject_chars(const char *subject)
+{
+        for (; *subject != '\0'; subject++)
+        {
+                unsigned char c = *subject;
+                if (c == '\xa' || c == '\xd' || c > '\x7f')
+                {
+                        return false;
+                }
+        }
+        return true;
+}
 // static
 std::string LLMail::buildSMTPTransaction(
        const char* from_name,
@@ -187,7 +200,7 @@ std::string LLMail::buildSMTPTransaction(
                        << " from address." << llendl;
                return std::string();
        }
-        if(! boost::regex_match(subject, valid_subject_chars))
+        if(!valid_subject_chars(subject))
        {
                llinfos << "send_mail build_smtp_transaction reject: bad subject header: "
                        << "to=<" << to_address
@@ -352,7 +365,7 @@ std::string LLMail::encryptIMEmailAddress(const LLUUID& from_agent_id,
        std::string address = LLBase32::encode(encrypted, encrypted_size);
        // Make it more pretty for humans.
-        LLString::toLower(address);
+        LLStringUtil::toLower(address);
        delete [] encrypted;
diff --git a/linden/indra/llmessage/llmessage.vcproj b/linden/indra/llmessage/llmessage.vcproj
deleted file mode 100644
index b011c24..0000000
--- a/linden/indra/llmessage/llmessage.vcproj
+++ /dev/null
@@ -1,675 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-        ProjectType="Visual C++"
-        Version="7.10"
-        Name="llmessage"
-        ProjectGUID="{E5D94794-5671-4BD6-A16D-26EC18F3DB34}"
-        RootNamespace="llmessage"
-        Keyword="Win32Proj">
-        <Platforms>
-                <Platform
-                        Name="Win32"/>
-        </Platforms>
-        <Configurations>
-                <Configuration
-                        Name="Debug|Win32"
-                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-                        IntermediateDirectory="Debug"
-                        ConfigurationType="4"
-                        CharacterSet="1">
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;LL_DEBUG"
-                                MinimalRebuild="TRUE"
-                                BasicRuntimeChecks="3"
-                                RuntimeLibrary="1"
-                                StructMemberAlignment="4"
-                                ForceConformanceInForLoopScope="TRUE"
-                                UsePrecompiledHeader="0"
-                                WarningLevel="3"
-                                WarnAsError="TRUE"
-                                Detect64BitPortabilityProblems="FALSE"
-                                DebugInformationFormat="4"/>
-                        <Tool
-                                Name="VCCustomBuildTool"/>
-                        <Tool
-                                Name="VCLibrarianTool"
-                                OutputFile="$(OutDir)/llmessage.lib"/>
-                        <Tool
-                                Name="VCMIDLTool"/>
-                        <Tool
-                                Name="VCPostBuildEventTool"/>
-                        <Tool
-                                Name="VCPreBuildEventTool"/>
-                        <Tool
-                                Name="VCPreLinkEventTool"/>
-                        <Tool
-                                Name="VCResourceCompilerTool"/>
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"/>
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"/>
-                        <Tool
-                                Name="VCManagedWrapperGeneratorTool"/>
-                        <Tool
-                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-                </Configuration>
-                <Configuration
-                        Name="Release|Win32"
-                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-                        IntermediateDirectory="Release"
-                        ConfigurationType="4"
-                        CharacterSet="1">
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/Oy-"
-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-                                RuntimeLibrary="0"
-                                StructMemberAlignment="0"
-                                ForceConformanceInForLoopScope="TRUE"
-                                UsePrecompiledHeader="0"
-                                WarningLevel="3"
-                                WarnAsError="TRUE"
-                                Detect64BitPortabilityProblems="FALSE"
-                                DebugInformationFormat="3"/>
-                        <Tool
-                                Name="VCCustomBuildTool"/>
-                        <Tool
-                                Name="VCLibrarianTool"
-                                OutputFile="$(OutDir)/llmessage.lib"/>
-                        <Tool
-                                Name="VCMIDLTool"/>
-                        <Tool
-                                Name="VCPostBuildEventTool"/>
-                        <Tool
-                                Name="VCPreBuildEventTool"/>
-                        <Tool
-                                Name="VCPreLinkEventTool"/>
-                        <Tool
-                                Name="VCResourceCompilerTool"/>
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"/>
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"/>
-                        <Tool
-                                Name="VCManagedWrapperGeneratorTool"/>
-                        <Tool
-                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-                </Configuration>
-                <Configuration
-                        Name="ReleaseNoOpt|Win32"
-                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-                        IntermediateDirectory="$(ConfigurationName)"
-                        ConfigurationType="4"
-                        CharacterSet="1">
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/Oy-"
-                                Optimization="0"
-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;LL_RELEASE"
-                                RuntimeLibrary="0"
-                                StructMemberAlignment="0"
-                                ForceConformanceInForLoopScope="TRUE"
-                                UsePrecompiledHeader="0"
-                                WarningLevel="3"
-                                WarnAsError="TRUE"
-                                Detect64BitPortabilityProblems="FALSE"
-                                DebugInformationFormat="3"/>
-                        <Tool
-                                Name="VCCustomBuildTool"/>
-                        <Tool
-                                Name="VCLibrarianTool"
-                                OutputFile="$(OutDir)/llmessage.lib"/>
-                        <Tool
-                                Name="VCMIDLTool"/>
-                        <Tool
-                                Name="VCPostBuildEventTool"/>
-                        <Tool
-                                Name="VCPreBuildEventTool"/>
-                        <Tool
-                                Name="VCPreLinkEventTool"/>
-                        <Tool
-                                Name="VCResourceCompilerTool"/>
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"/>
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"/>
-                        <Tool
-                                Name="VCManagedWrapperGeneratorTool"/>
-                        <Tool
-                                Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-                </Configuration>
-        </Configurations>
-        <References>
-        </References>
-        <Files>
-                <Filter
-                        Name="Source Files"
-                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-                        <File
-                                RelativePath=".\llassetstorage.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llblowfishcipher.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llbuffer.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llbufferstream.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llcachename.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llchainio.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llcircuit.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llclassifiedflags.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llcurl.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\lldatapacker.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\lldispatcher.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llfiltersd2xmlrpc.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llhost.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llhttpassetstorage.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llhttpassetstorage.h">
-                        </File>
-                        <File
-                                RelativePath=".\llhttpclient.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llhttpnode.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llhttpsender.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llinstantmessage.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\lliobuffer.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\lliohttpserver.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\lliopipe.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\lliosocket.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llioutil.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llmail.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llmessagebuilder.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llmessageconfig.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llmessagereader.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llmessagetemplate.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llmessagetemplateparser.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llmessagethrottle.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llmime.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llnamevalue.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llnullcipher.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llpacketack.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llpacketbuffer.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llpacketring.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llpartdata.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llpumpio.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llsdappservices.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llsdhttpserver.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llsdmessagebuilder.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llsdmessagereader.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llsdrpcclient.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llsdrpcserver.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llservice.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llservicebuilder.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\lltemplatemessagebuilder.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\lltemplatemessagereader.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llthrottle.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\lltransfermanager.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\lltransfersourceasset.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\lltransfersourcefile.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\lltransfertargetfile.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\lltransfertargetvfile.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llurlrequest.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\lluseroperation.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llxfer.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_file.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_mem.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_vfile.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llxfermanager.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\llxorcipher.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\message.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\message_prehash.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\message_string_table.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\net.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\network.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\partsyspacket.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\patch_code.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\patch_dct.cpp">
-                        </File>
-                        <File
-                                RelativePath=".\patch_idct.cpp">
-                        </File>
-                </Filter>
-                <Filter
-                        Name="Header Files"
-                        Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-                        <File
-                                RelativePath=".\camera.h">
-                        </File>
-                        <File
-                                RelativePath=".\coordframe.h">
-                        </File>
-                        <File
-                                RelativePath=".\llassetstorage.h">
-                        </File>
-                        <File
-                                RelativePath=".\llblowfishcipher.h">
-                        </File>
-                        <File
-                                RelativePath=".\llbuffer.h">
-                        </File>
-                        <File
-                                RelativePath=".\llbufferstream.h">
-                        </File>
-                        <File
-                                RelativePath=".\llcachename.h">
-                        </File>
-                        <File
-                                RelativePath=".\llcamera.h">
-                        </File>
-                        <File
-                                RelativePath=".\llchainio.h">
-                        </File>
-                        <File
-                                RelativePath=".\llcipher.h">
-                        </File>
-                        <File
-                                RelativePath=".\llcircuit.h">
-                        </File>
-                        <File
-                                RelativePath=".\llclassifiedflags.h">
-                        </File>
-                        <File
-                                RelativePath=".\llcoordframe.h">
-                        </File>
-                        <File
-                                RelativePath=".\llcurl.h">
-                        </File>
-                        <File
-                                RelativePath=".\lldatapacker.h">
-                        </File>
-                        <File
-                                RelativePath=".\lldbstrings.h">
-                        </File>
-                        <File
-                                RelativePath=".\lldispatcher.h">
-                        </File>
-                        <File
-                                RelativePath=".\lleventflags.h">
-                        </File>
-                        <File
-                                RelativePath=".\llfiltersd2xmlrpc.h">
-                        </File>
-                        <File
-                                RelativePath=".\llfollowcamparams.h">
-                        </File>
-                        <File
-                                RelativePath=".\llhost.h">
-                        </File>
-                        <File
-                                RelativePath=".\llhttpclient.h">
-                        </File>
-                        <File
-                                RelativePath=".\llhttpnode.h">
-                        </File>
-                        <File
-                                RelativePath=".\llhttpsender.h">
-                        </File>
-                        <File
-                                RelativePath=".\llinstantmessage.h">
-                        </File>
-                        <File
-                                RelativePath=".\llinvite.h">
-                        </File>
-                        <File
-                                RelativePath=".\lliobuffer.h">
-                        </File>
-                        <File
-                                RelativePath=".\lliohttpserver.h">
-                        </File>
-                        <File
-                                RelativePath=".\lliopipe.h">
-                        </File>
-                        <File
-                                RelativePath=".\lliosocket.h">
-                        </File>
-                        <File
-                                RelativePath=".\llioutil.h">
-                        </File>
-                        <File
-                                RelativePath=".\llloginflags.h">
-                        </File>
-                        <File
-                                RelativePath=".\lllsltransmit.h">
-                        </File>
-                        <File
-                                RelativePath=".\llmail.h">
-                        </File>
-                        <File
-                                RelativePath=".\llmessagebuilder.h">
-                        </File>
-                        <File
-                                RelativePath=".\llmessageconfig.h">
-                        </File>
-                        <File
-                                RelativePath=".\llmessagereader.h">
-                        </File>
-                        <File
-                                RelativePath=".\llmessagetemplate.h">
-                        </File>
-                        <File
-                                RelativePath=".\llmessagetemplateparser.h">
-                        </File>
-                        <File
-                                RelativePath=".\llmessagethrottle.h">
-                        </File>
-                        <File
-                                RelativePath=".\llmime.h">
-                        </File>
-                        <File
-                                RelativePath=".\llnamevalue.h">
-                        </File>
-                        <File
-                                RelativePath=".\llnullcipher.h">
-                        </File>
-                        <File
-                                RelativePath=".\llpacketack.h">
-                        </File>
-                        <File
-                                RelativePath=".\llpacketbuffer.h">
-                        </File>
-                        <File
-                                RelativePath=".\llpacketring.h">
-                        </File>
-                        <File
-                                RelativePath=".\llpartdata.h">
-                        </File>
-                        <File
-                                RelativePath=".\llpumpio.h">
-                        </File>
-                        <File
-                                RelativePath=".\llqueryflags.h">
-                        </File>
-                        <File
-                                RelativePath=".\llregionflags.h">
-                        </File>
-                        <File
-                                RelativePath=".\llregionhandle.h">
-                        </File>
-                        <File
-                                RelativePath=".\llsdappservices.h">
-                        </File>
-                        <File
-                                RelativePath=".\llsdhttpserver.h">
-                        </File>
-                        <File
-                                RelativePath=".\llsdmessagebuilder.h">
-                        </File>
-                        <File
-                                RelativePath=".\llsdmessagereader.h">
-                        </File>
-                        <File
-                                RelativePath=".\llsdrpcclient.h">
-                        </File>
-                        <File
-                                RelativePath=".\llsdrpcserver.h">
-                        </File>
-                        <File
-                                RelativePath=".\llservice.h">
-                        </File>
-                        <File
-                                RelativePath=".\llservicebuilder.h">
-                        </File>
-                        <File
-                                RelativePath=".\lltaskname.h">
-                        </File>
-                        <File
-                                RelativePath=".\llteleportflags.h">
-                        </File>
-                        <File
-                                RelativePath=".\lltemplatemessagebuilder.h">
-                        </File>
-                        <File
-                                RelativePath=".\lltemplatemessagereader.h">
-                        </File>
-                        <File
-                                RelativePath=".\llthrottle.h">
-                        </File>
-                        <File
-                                RelativePath=".\lltransfermanager.h">
-                        </File>
-                        <File
-                                RelativePath=".\lltransfersourceasset.h">
-                        </File>
-                        <File
-                                RelativePath=".\lltransfersourcefile.h">
-                        </File>
-                        <File
-                                RelativePath=".\lltransfertargetfile.h">
-                        </File>
-                        <File
-                                RelativePath=".\lltransfertargetvfile.h">
-                        </File>
-                        <File
-                                RelativePath=".\llurlrequest.h">
-                        </File>
-                        <File
-                                RelativePath=".\lluseroperation.h">
-                        </File>
-                        <File
-                                RelativePath=".\llvehicleparams.h">
-                        </File>
-                        <File
-                                RelativePath=".\llxfer.h">
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_file.h">
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_mem.h">
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_vfile.h">
-                        </File>
-                        <File
-                                RelativePath=".\llxfermanager.h">
-                        </File>
-                        <File
-                                RelativePath=".\llxorcipher.h">
-                        </File>
-                        <File
-                                RelativePath=".\machine.h">
-                        </File>
-                        <File
-                                RelativePath=".\mean_collision_data.h">
-                        </File>
-                        <File
-                                RelativePath=".\message.h">
-                        </File>
-                        <File
-                                RelativePath=".\message_prehash.h">
-                        </File>
-                        <File
-                                RelativePath=".\net.h">
-                        </File>
-                        <File
-                                RelativePath=".\network.h">
-                        </File>
-                        <File
-                                RelativePath=".\partsyspacket.h">
-                        </File>
-                        <File
-                                RelativePath=".\patch_code.h">
-                        </File>
-                        <File
-                                RelativePath=".\patch_dct.h">
-                        </File>
-                        <File
-                                RelativePath=".\sound_ids.h">
-                        </File>
-                </Filter>
-                <Filter
-                        Name="Resource Files"
-                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-                </Filter>
-                <File
-                        RelativePath="..\..\scripts\messages\message_template.msg">
-                        <FileConfiguration
-                                Name="Debug|Win32">
-                                <Tool
-                                        Name="VCCustomBuildTool"
-                                        Description=""
-                                        CommandLine=""
-                                        Outputs=""/>
-                        </FileConfiguration>
-                        <FileConfiguration
-                                Name="Release|Win32">
-                                <Tool
-                                        Name="VCCustomBuildTool"
-                                        Description=""
-                                        CommandLine=""
-                                        Outputs=""/>
-                        </FileConfiguration>
-                        <FileConfiguration
-                                Name="ReleaseNoOpt|Win32">
-                                <Tool
-                                        Name="VCCustomBuildTool"
-                                        Description=""
-                                        CommandLine=""
-                                        Outputs=""/>
-                        </FileConfiguration>
-                </File>
-        </Files>
-        <Globals>
-        </Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llmessage/llmessage_vc8.vcproj b/linden/indra/llmessage/llmessage_vc8.vcproj
deleted file mode 100644
index 96f81f7..0000000
--- a/linden/indra/llmessage/llmessage_vc8.vcproj
+++ /dev/null
@@ -1,921 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-        ProjectType="Visual C++"
-        Version="8.00"
-        Name="llmessage"
-        ProjectGUID="{E5D94794-5671-4BD6-A16D-26EC18F3DB34}"
-        RootNamespace="llmessage"
-        Keyword="Win32Proj"
-        >
-        <Platforms>
-                <Platform
-                        Name="Win32"
-                />
-        </Platforms>
-        <ToolFiles>
-        </ToolFiles>
-        <Configurations>
-                <Configuration
-                        Name="Debug|Win32"
-                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-                        IntermediateDirectory="Debug"
-                        ConfigurationType="4"
-                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                        CharacterSet="1"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-                                MinimalRebuild="true"
-                                BasicRuntimeChecks="3"
-                                RuntimeLibrary="1"
-                                StructMemberAlignment="4"
-                                TreatWChar_tAsBuiltInType="false"
-                                ForceConformanceInForLoopScope="true"
-                                UsePrecompiledHeader="0"
-                                WarningLevel="3"
-                                WarnAsError="true"
-                                Detect64BitPortabilityProblems="false"
-                                DebugInformationFormat="4"
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLibrarianTool"
-                                OutputFile="$(OutDir)/llmessage.lib"
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-                <Configuration
-                        Name="Release|Win32"
-                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-                        IntermediateDirectory="Release"
-                        ConfigurationType="4"
-                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                        CharacterSet="1"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/Oy-"
-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-                                RuntimeLibrary="0"
-                                StructMemberAlignment="0"
-                                TreatWChar_tAsBuiltInType="false"
-                                ForceConformanceInForLoopScope="true"
-                                UsePrecompiledHeader="0"
-                                WarningLevel="3"
-                                WarnAsError="true"
-                                Detect64BitPortabilityProblems="false"
-                                DebugInformationFormat="3"
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLibrarianTool"
-                                OutputFile="$(OutDir)/llmessage.lib"
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-                <Configuration
-                        Name="ReleaseNoOpt|Win32"
-                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-                        IntermediateDirectory="$(ConfigurationName)"
-                        ConfigurationType="4"
-                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                        CharacterSet="1"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/Oy-"
-                                Optimization="0"
-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-                                RuntimeLibrary="0"
-                                StructMemberAlignment="0"
-                                TreatWChar_tAsBuiltInType="false"
-                                ForceConformanceInForLoopScope="true"
-                                UsePrecompiledHeader="0"
-                                WarningLevel="3"
-                                WarnAsError="true"
-                                Detect64BitPortabilityProblems="false"
-                                DebugInformationFormat="3"
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLibrarianTool"
-                                OutputFile="$(OutDir)/llmessage.lib"
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-        </Configurations>
-        <References>
-        </References>
-        <Files>
-                <Filter
-                        Name="Source Files"
-                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                        >
-                        <File
-                                RelativePath=".\llassetstorage.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llblowfishcipher.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llbuffer.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llbufferstream.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcachename.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llchainio.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcircuit.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llclassifiedflags.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcurl.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lldatapacker.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lldispatcher.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llfiltersd2xmlrpc.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhost.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhttpassetstorage.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhttpassetstorage.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhttpclient.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhttpnode.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhttpsender.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llinstantmessage.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lliobuffer.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lliohttpserver.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lliopipe.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lliosocket.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llioutil.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmail.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagebuilder.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessageconfig.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagereader.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagetemplate.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagetemplateparser.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagethrottle.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmime.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llnamevalue.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llnullcipher.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpacketack.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpacketbuffer.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpacketring.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpartdata.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpumpio.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdappservices.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdhttpserver.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdmessagebuilder.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdmessagereader.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdrpcclient.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdrpcserver.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llservice.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llservicebuilder.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltemplatemessagebuilder.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltemplatemessagereader.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llthrottle.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfermanager.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfersourceasset.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfersourcefile.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfertargetfile.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfertargetvfile.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llurlrequest.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lluseroperation.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfer.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_file.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_mem.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_vfile.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfermanager.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxorcipher.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\message.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\message_prehash.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\message_string_table.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\net.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\network.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\partsyspacket.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\patch_code.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\patch_dct.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\patch_idct.cpp"
-                                >
-                        </File>
-                </Filter>
-                <Filter
-                        Name="Header Files"
-                        Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                        >
-                        <File
-                                RelativePath=".\camera.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\coordframe.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llassetstorage.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llblowfishcipher.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llbuffer.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llbufferstream.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcachename.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcamera.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llchainio.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcipher.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcircuit.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llclassifiedflags.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcoordframe.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcurl.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lldatapacker.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lldbstrings.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lldispatcher.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lleventflags.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llfiltersd2xmlrpc.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llfollowcamparams.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhost.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhttpclient.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhttpnode.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhttpsender.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llinstantmessage.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llinvite.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lliobuffer.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lliohttpserver.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lliopipe.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lliosocket.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llioutil.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llloginflags.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lllsltransmit.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmail.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagebuilder.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessageconfig.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagereader.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagetemplate.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagetemplateparser.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagethrottle.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmime.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llnamevalue.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llnullcipher.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpacketack.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpacketbuffer.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpacketring.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpartdata.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpumpio.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llqueryflags.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llregionflags.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llregionhandle.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdappservices.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdhttpserver.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdmessagebuilder.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdmessagereader.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdrpcclient.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdrpcserver.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llservice.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llservicebuilder.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltaskname.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llteleportflags.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltemplatemessagebuilder.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltemplatemessagereader.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llthrottle.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfermanager.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfersourceasset.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfersourcefile.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfertargetfile.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfertargetvfile.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llurlrequest.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lluseroperation.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llvehicleparams.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfer.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_file.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_mem.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_vfile.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfermanager.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxorcipher.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\machine.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\mean_collision_data.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\message.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\message_prehash.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\net.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\network.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\partsyspacket.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\patch_code.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\patch_dct.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\sound_ids.h"
-                                >
-                        </File>
-                </Filter>
-                <Filter
-                        Name="Resource Files"
-                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                        >
-                </Filter>
-                <File
-                        RelativePath="..\..\scripts\messages\message_template.msg"
-                        >
-                        <FileConfiguration
-                                Name="Debug|Win32"
-                                >
-                                <Tool
-                                        Name="VCCustomBuildTool"
-                                        Description=""
-                                        CommandLine=""
-                                        Outputs=""
-                                />
-                        </FileConfiguration>
-                        <FileConfiguration
-                                Name="Release|Win32"
-                                >
-                                <Tool
-                                        Name="VCCustomBuildTool"
-                                        Description=""
-                                        CommandLine=""
-                                        Outputs=""
-                                />
-                        </FileConfiguration>
-                        <FileConfiguration
-                                Name="ReleaseNoOpt|Win32"
-                                >
-                                <Tool
-                                        Name="VCCustomBuildTool"
-                                        Description=""
-                                        CommandLine=""
-                                        Outputs=""
-                                />
-                        </FileConfiguration>
-                </File>
-        </Files>
-        <Globals>
-        </Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llmessage/llmessage_vc9.vcproj b/linden/indra/llmessage/llmessage_vc9.vcproj
deleted file mode 100644
index e9f4889..0000000
--- a/linden/indra/llmessage/llmessage_vc9.vcproj
+++ /dev/null
@@ -1,922 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-        ProjectType="Visual C++"
-        Version="9.00"
-        Name="llmessage"
-        ProjectGUID="{E5D94794-5671-4BD6-A16D-26EC18F3DB34}"
-        RootNamespace="llmessage"
-        Keyword="Win32Proj"
-        TargetFrameworkVersion="131072"
-        >
-        <Platforms>
-                <Platform
-                        Name="Win32"
-                />
-        </Platforms>
-        <ToolFiles>
-        </ToolFiles>
-        <Configurations>
-                <Configuration
-                        Name="Debug|Win32"
-                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-                        IntermediateDirectory="Debug"
-                        ConfigurationType="4"
-                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                        CharacterSet="1"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                Optimization="0"
-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"
-                                MinimalRebuild="true"
-                                BasicRuntimeChecks="3"
-                                RuntimeLibrary="1"
-                                StructMemberAlignment="4"
-                                TreatWChar_tAsBuiltInType="false"
-                                ForceConformanceInForLoopScope="true"
-                                UsePrecompiledHeader="0"
-                                WarningLevel="3"
-                                WarnAsError="true"
-                                Detect64BitPortabilityProblems="false"
-                                DebugInformationFormat="4"
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLibrarianTool"
-                                OutputFile="$(OutDir)/llmessage.lib"
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-                <Configuration
-                        Name="Release|Win32"
-                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-                        IntermediateDirectory="Release"
-                        ConfigurationType="4"
-                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                        CharacterSet="1"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/Oy-"
-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-                                RuntimeLibrary="0"
-                                StructMemberAlignment="0"
-                                TreatWChar_tAsBuiltInType="false"
-                                ForceConformanceInForLoopScope="true"
-                                UsePrecompiledHeader="0"
-                                WarningLevel="3"
-                                WarnAsError="true"
-                                Detect64BitPortabilityProblems="false"
-                                DebugInformationFormat="3"
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLibrarianTool"
-                                OutputFile="$(OutDir)/llmessage.lib"
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-                <Configuration
-                        Name="ReleaseNoOpt|Win32"
-                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"
-                        IntermediateDirectory="$(ConfigurationName)"
-                        ConfigurationType="4"
-                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-                        CharacterSet="1"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                AdditionalOptions="/Oy-"
-                                Optimization="0"
-                                AdditionalIncludeDirectories="..\llcommon;..\llmath;..\llvfs;..\..\libraries\i686-win32\include;..\..\libraries\include\"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"
-                                RuntimeLibrary="0"
-                                StructMemberAlignment="0"
-                                TreatWChar_tAsBuiltInType="false"
-                                ForceConformanceInForLoopScope="true"
-                                UsePrecompiledHeader="0"
-                                WarningLevel="3"
-                                WarnAsError="true"
-                                Detect64BitPortabilityProblems="false"
-                                DebugInformationFormat="3"
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLibrarianTool"
-                                OutputFile="$(OutDir)/llmessage.lib"
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-        </Configurations>
-        <References>
-        </References>
-        <Files>
-                <Filter
-                        Name="Source Files"
-                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-                        >
-                        <File
-                                RelativePath=".\llassetstorage.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llblowfishcipher.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llbuffer.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llbufferstream.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcachename.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llchainio.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcircuit.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llclassifiedflags.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcurl.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lldatapacker.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lldispatcher.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llfiltersd2xmlrpc.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhost.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhttpassetstorage.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhttpassetstorage.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhttpclient.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhttpnode.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhttpsender.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llinstantmessage.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lliobuffer.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lliohttpserver.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lliopipe.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lliosocket.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llioutil.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmail.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagebuilder.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessageconfig.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagereader.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagetemplate.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagetemplateparser.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagethrottle.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmime.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llnamevalue.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llnullcipher.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpacketack.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpacketbuffer.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpacketring.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpartdata.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpumpio.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdappservices.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdhttpserver.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdmessagebuilder.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdmessagereader.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdrpcclient.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdrpcserver.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llservice.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llservicebuilder.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltemplatemessagebuilder.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltemplatemessagereader.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llthrottle.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfermanager.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfersourceasset.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfersourcefile.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfertargetfile.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfertargetvfile.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llurlrequest.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lluseroperation.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfer.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_file.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_mem.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_vfile.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfermanager.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxorcipher.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\message.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\message_prehash.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\message_string_table.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\net.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\network.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\partsyspacket.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\patch_code.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\patch_dct.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\patch_idct.cpp"
-                                >
-                        </File>
-                </Filter>
-                <Filter
-                        Name="Header Files"
-                        Filter="h;hpp;hxx;hm;inl;inc;xsd"
-                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-                        >
-                        <File
-                                RelativePath=".\camera.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\coordframe.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llassetstorage.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llblowfishcipher.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llbuffer.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llbufferstream.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcachename.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcamera.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llchainio.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcipher.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcircuit.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llclassifiedflags.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcoordframe.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llcurl.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lldatapacker.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lldbstrings.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lldispatcher.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lleventflags.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llfiltersd2xmlrpc.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llfollowcamparams.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhost.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhttpclient.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhttpnode.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llhttpsender.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llinstantmessage.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llinvite.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lliobuffer.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lliohttpserver.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lliopipe.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lliosocket.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llioutil.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llloginflags.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lllsltransmit.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmail.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagebuilder.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessageconfig.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagereader.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagetemplate.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagetemplateparser.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmessagethrottle.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llmime.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llnamevalue.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llnullcipher.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpacketack.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpacketbuffer.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpacketring.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpartdata.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llpumpio.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llqueryflags.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llregionflags.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llregionhandle.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdappservices.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdhttpserver.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdmessagebuilder.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdmessagereader.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdrpcclient.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llsdrpcserver.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llservice.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llservicebuilder.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltaskname.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llteleportflags.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltemplatemessagebuilder.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltemplatemessagereader.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llthrottle.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfermanager.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfersourceasset.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfersourcefile.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfertargetfile.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lltransfertargetvfile.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llurlrequest.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\lluseroperation.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llvehicleparams.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfer.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_file.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_mem.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfer_vfile.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxfermanager.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\llxorcipher.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\machine.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\mean_collision_data.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\message.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\message_prehash.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\net.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\network.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\partsyspacket.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\patch_code.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\patch_dct.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath=".\sound_ids.h"
-                                >
-                        </File>
-                </Filter>
-                <Filter
-                        Name="Resource Files"
-                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-                        >
-                </Filter>
-                <File
-                        RelativePath="..\..\scripts\messages\message_template.msg"
-                        >
-                        <FileConfiguration
-                                Name="Debug|Win32"
-                                >
-                                <Tool
-                                        Name="VCCustomBuildTool"
-                                        Description=""
-                                        CommandLine=""
-                                        Outputs=""
-                                />
-                        </FileConfiguration>
-                        <FileConfiguration
-                                Name="Release|Win32"
-                                >
-                                <Tool
-                                        Name="VCCustomBuildTool"
-                                        Description=""
-                                        CommandLine=""
-                                        Outputs=""
-                                />
-                        </FileConfiguration>
-                        <FileConfiguration
-                                Name="ReleaseNoOpt|Win32"
-                                >
-                                <Tool
-                                        Name="VCCustomBuildTool"
-                                        Description=""
-                                        CommandLine=""
-                                        Outputs=""
-                                />
-                        </FileConfiguration>
-                </File>
-        </Files>
-        <Globals>
-        </Globals>
-</VisualStudioProject>
diff --git a/linden/indra/llmessage/llmessageconfig.cpp b/linden/indra/llmessage/llmessageconfig.cpp
index e23ed07..498cfff 100644
--- a/linden/indra/llmessage/llmessageconfig.cpp
+++ b/linden/indra/llmessage/llmessageconfig.cpp
@@ -52,13 +52,14 @@ static LLSD sMessages;
 class LLMessageConfigFile : public LLLiveFile
 {
 public:
-        LLMessageConfigFile()
+        LLMessageConfigFile() :
-        : LLLiveFile(filename(), messageConfigRefreshRate)
+                LLLiveFile(filename(), messageConfigRefreshRate),
+                mMaxQueuedEvents(0)
            { }
-    static std::string filename();
+        static std::string filename();
-    LLSD mMessages;
+        LLSD mMessages;
        std::string mServerDefault;
        
        static LLMessageConfigFile& instance();
@@ -66,7 +67,7 @@ public:
        /* virtual */ void loadFile();
        void loadServerDefaults(const LLSD& data);
-         void loadMaxQueuedEvents(const LLSD& data);
+        void loadMaxQueuedEvents(const LLSD& data);
        void loadMessages(const LLSD& data);
        void loadCapBans(const LLSD& blacklist);
        void loadMessageBans(const LLSD& blacklist);
@@ -74,7 +75,10 @@ public:
 public:
        LLSD mCapBans;
-         S32 mMaxQueuedEvents;
+        S32 mMaxQueuedEvents;
+private:
+        static const S32 DEFAULT_MAX_QUEUED_EVENTS = 100;
 };
 std::string LLMessageConfigFile::filename()
@@ -97,7 +101,7 @@ void LLMessageConfigFile::loadFile()
 {
        LLSD data;
    {
-        llifstream file(filename().c_str());
+        llifstream file(filename());
        
        if (file.is_open())
        {
@@ -125,7 +129,6 @@ void LLMessageConfigFile::loadServerDefaults(const LLSD& data)
        mServerDefault = data["serverDefaults"][sServerName].asString();
 }
-const S32 DEFAULT_MAX_QUEUED_EVENTS = 100;
 void LLMessageConfigFile::loadMaxQueuedEvents(const LLSD& data)
 {
         if (data.has("maxQueuedEvents"))
diff --git a/linden/indra/llmessage/llmessagereader.h b/linden/indra/llmessage/llmessagereader.h
index 1e74da9..9fae682 100644
--- a/linden/indra/llmessage/llmessagereader.h
+++ b/linden/indra/llmessage/llmessagereader.h
@@ -69,6 +69,7 @@ class LLMessageReader
        virtual void getIPAddr(const char *block, const char *var, U32 &ip, S32 blocknum = 0) = 0;
        virtual void getIPPort(const char *block, const char *var, U16 &port, S32 blocknum = 0) = 0;
        virtual void getString(const char *block, const char *var, S32 buffer_size, char *buffer, S32 blocknum = 0) = 0;
+        virtual void getString(const char *block, const char *var, std::string& outstr, S32 blocknum = 0) = 0;
        virtual S32     getNumberOfBlocks(const char *blockname) = 0;
        virtual S32     getSize(const char *blockname, const char *varname) = 0;
diff --git a/linden/indra/llmessage/llmessagetemplateparser.cpp b/linden/indra/llmessage/llmessagetemplateparser.cpp
index 969a0d9..d6adba8 100644
--- a/linden/indra/llmessage/llmessagetemplateparser.cpp
+++ b/linden/indra/llmessage/llmessagetemplateparser.cpp
@@ -161,7 +161,7 @@ S32 get_checker_number(char checker)
 }
 // check token based on passed simplified regular expression
-BOOL    b_check_token(const char *token, char *regexp)
+BOOL    b_check_token(const char *token, const char *regexp)
 {
        S32 tptr, rptr = 0;
        S32 current_checker, next_checker = 0;
diff --git a/linden/indra/llmessage/llmessagethrottle.cpp b/linden/indra/llmessage/llmessagethrottle.cpp
index 84733ba..ad9df26 100644
--- a/linden/indra/llmessage/llmessagethrottle.cpp
+++ b/linden/indra/llmessage/llmessagethrottle.cpp
@@ -110,7 +110,7 @@ void LLMessageThrottle::pruneEntries()
        }
 }
-BOOL LLMessageThrottle::addViewerAlert(const LLUUID& to, const char* mesg)
+BOOL LLMessageThrottle::addViewerAlert(const LLUUID& to, const std::string& mesg)
 {
        message_list_t* message_list = &(mMessageList[MTC_VIEWER_ALERT]);
@@ -144,7 +144,7 @@ BOOL LLMessageThrottle::addViewerAlert(const LLUUID& to, const char* mesg)
        }
 }
-BOOL LLMessageThrottle::addAgentAlert(const LLUUID& agent, const LLUUID& task, const char* mesg)
+BOOL LLMessageThrottle::addAgentAlert(const LLUUID& agent, const LLUUID& task, const std::string& mesg)
 {
        message_list_t* message_list = &(mMessageList[MTC_AGENT_ALERT]);
diff --git a/linden/indra/llmessage/llmessagethrottle.h b/linden/indra/llmessage/llmessagethrottle.h
index 8be08b3..2f27f13 100644
--- a/linden/indra/llmessage/llmessagethrottle.h
+++ b/linden/indra/llmessage/llmessagethrottle.h
@@ -64,8 +64,8 @@ public:
        LLMessageThrottle();
        ~LLMessageThrottle();
-        BOOL addViewerAlert     (const LLUUID& to, const char* mesg);
+        BOOL addViewerAlert     (const LLUUID& to, const std::string& mesg);
-        BOOL addAgentAlert      (const LLUUID& agent, const LLUUID& task, const char* mesg);
+        BOOL addAgentAlert      (const LLUUID& agent, const LLUUID& task, const std::string& mesg);
        void pruneEntries();
diff --git a/linden/indra/llmessage/llmime.cpp b/linden/indra/llmessage/llmime.cpp
index 48e73fb..2093255 100644
--- a/linden/indra/llmessage/llmime.cpp
+++ b/linden/indra/llmessage/llmime.cpp
@@ -439,9 +439,7 @@ bool LLMimeParser::Impl::parseHeaders(
                std::string value(colon);
                for(S32 ii = 0; ii < KNOWN_HEADER_COUNT; ++ii)
                {
-                        if(0 == LLString::compareInsensitive(
+                        if(0 == LLStringUtil::compareInsensitive(name, KNOWN_HEADER[ii]))
-                                name.c_str(),
-                                KNOWN_HEADER[ii].c_str()))
                        {
                                name = KNOWN_HEADER[ii];
                                break;
@@ -525,7 +523,7 @@ void LLMimeParser::Impl::scanPastSeparator(
                {
                        mContinue = false;
                }
-                if(0 == LLString::compareStrings(mBuffer, separator.c_str()))
+                if(0 == LLStringUtil::compareStrings(std::string(mBuffer), separator))
                {
                        found_separator = true;
                }
diff --git a/linden/indra/llmessage/llnamevalue.cpp b/linden/indra/llmessage/llnamevalue.cpp
index 18bd5ac..c44f6ce 100644
--- a/linden/indra/llmessage/llnamevalue.cpp
+++ b/linden/indra/llmessage/llnamevalue.cpp
@@ -155,7 +155,7 @@ void LLNameValue::init(const char *name, const char *data, const char *type, con
        else if (!strcmp(mStringType, "U64"))
        {
                mType = NVT_U64;
-                mNameValueReference.u64 = new U64(str_to_U64(data));
+                mNameValueReference.u64 = new U64(str_to_U64(ll_safe_string(data)));
        }
        else if (!strcmp(mStringType, "VEC3"))
        {
diff --git a/linden/indra/llmessage/llpumpio.cpp b/linden/indra/llmessage/llpumpio.cpp
index f60ee2b..c92612f 100644
--- a/linden/indra/llmessage/llpumpio.cpp
+++ b/linden/indra/llmessage/llpumpio.cpp
@@ -36,7 +36,7 @@
 #include <map>
 #include <set>
-#include "apr-1/apr_poll.h"
+#include "apr_poll.h"
 #include "llapr.h"
 #include "llmemtype.h"
@@ -49,7 +49,7 @@
 //#define LL_DEBUG_PIPE_TYPE_IN_PUMP 1
 //#define LL_DEBUG_POLL_FILE_DESCRIPTORS 1
 #if LL_DEBUG_POLL_FILE_DESCRIPTORS
-#include "apr-1/apr_portable.h"
+#include "apr_portable.h"
 #endif
 #endif
@@ -261,7 +261,7 @@ bool LLPumpIO::addChain(
 bool LLPumpIO::setTimeoutSeconds(F32 timeout)
 {
        // If no chain is running, return failure.
-        if(current_chain_t() == mCurrentChain)
+        if(mRunningChains.end() == mCurrentChain)
        {
                return false;
        }
@@ -365,7 +365,7 @@ S32 LLPumpIO::setLock()
        // lock the runner at the same time.
        // If no chain is running, return failure.
-        if(current_chain_t() == mCurrentChain)
+        if(mRunningChains.end() == mCurrentChain)
        {
                return 0;
        }
@@ -414,7 +414,7 @@ bool LLPumpIO::sleepChain(F64 seconds)
 bool LLPumpIO::copyCurrentLinkInfo(links_t& links) const
 {
        LLMemType m1(LLMemType::MTYPE_IO_PUMP);
-        if(current_chain_t() == mCurrentChain)
+        if(mRunningChains.end() == mCurrentChain)
        {
                return false;
        }
@@ -584,6 +584,7 @@ void LLPumpIO::pump(const S32& poll_timeout)
                }
                PUMP_DEBUG;
                mCurrentChain = run_chain;
+                
                if((*run_chain).mDescriptors.empty())
                {
                        // if there are no conditionals, just process this chain.
@@ -702,7 +703,7 @@ void LLPumpIO::pump(const S32& poll_timeout)
        PUMP_DEBUG;
        // null out the chain
-        mCurrentChain = current_chain_t();
+        mCurrentChain = mRunningChains.end();
        END_PUMP_DEBUG;
 }
diff --git a/linden/indra/llmessage/llpumpio.h b/linden/indra/llmessage/llpumpio.h
index 68db329..d2392a3 100644
--- a/linden/indra/llmessage/llpumpio.h
+++ b/linden/indra/llmessage/llpumpio.h
@@ -39,7 +39,7 @@
 #include <sys/param.h>
 #endif
-#include "apr-1/apr_pools.h"
+#include "apr_pools.h"
 #include "llbuffer.h"
 #include "llframetimer.h"
 #include "lliopipe.h"
diff --git a/linden/indra/llmessage/llregionflags.h b/linden/indra/llmessage/llregionflags.h
index 1675478..af010ae 100644
--- a/linden/indra/llmessage/llregionflags.h
+++ b/linden/indra/llmessage/llregionflags.h
@@ -94,8 +94,8 @@ const U32 REGION_FLAGS_ABUSE_EMAIL_TO_ESTATE_OWNER = (1 << 27);
 const U32 REGION_FLAGS_ALLOW_VOICE = (1 << 28);
 const U32 REGION_FLAGS_BLOCK_PARCEL_SEARCH = (1 << 29);
-const U32 REGION_FLAGS_DENY_AGEUNVERIFIED               = (1 << 30);
+const U32 REGION_FLAGS_DENY_AGEUNVERIFIED       = (1 << 30);
+const U32 REGION_FLAGS_SKIP_MONO_SCRIPTS        = (1 << 31);
 const U32 REGION_FLAGS_DEFAULT = REGION_FLAGS_ALLOW_LANDMARK |
                                                                 REGION_FLAGS_ALLOW_SET_HOME |
diff --git a/linden/indra/llmessage/llsdmessagereader.cpp b/linden/indra/llmessage/llsdmessagereader.cpp
index 70cc455..1f0effa 100755
--- a/linden/indra/llmessage/llsdmessagereader.cpp
+++ b/linden/indra/llmessage/llsdmessagereader.cpp
@@ -37,7 +37,15 @@
 #include "llsdmessagebuilder.h"
 #include "llsdutil.h"
-LLSDMessageReader::LLSDMessageReader()
+#include "v3math.h"
+#include "v4math.h"
+#include "v3dmath.h"
+#include "v2math.h"
+#include "llquaternion.h"
+#include "v4color.h"
+LLSDMessageReader::LLSDMessageReader() :
+        mMessageName(NULL)
 {
 }
@@ -63,14 +71,20 @@ LLSD getLLSD(const LLSD& input, const char* block, const char* var, S32 blocknum
        }
        if(! input[block].isArray())
        {
-                llerrs << "block " << block << " not found" << llendl;
+                // NOTE: babbage: need to return default for missing blocks to allow
+                // backwards/forwards compatibility - handlers must cope with default
+                // values.
+                llwarns << "block " << block << " not found" << llendl;
                return LLSD();
        }
        LLSD result = input[block][blocknum][var]; 
        if(result.isUndefined())
        {
-                llerrs << "var " << var << " not found" << llendl;
+                // NOTE: babbage: need to return default for missing vars to allow
+                // backwards/forwards compatibility - handlers must cope with default
+                // values.
+                llwarns << "var " << var << " not found" << llendl;
        }
        return result;
 }
@@ -235,6 +249,12 @@ void LLSDMessageReader::getString(const char *block, const char *var,
        buffer[data_size] = '\0';
 }
+//virtual 
+void LLSDMessageReader::getString(const char *block, const char *var, 
+                                                   std::string& outstr, S32 blocknum)
+{
+        outstr = getLLSD(mMessage, block, var, blocknum).asString();
+}
 //virtual 
 S32     LLSDMessageReader::getNumberOfBlocks(const char *blockname)
diff --git a/linden/indra/llmessage/llsdmessagereader.h b/linden/indra/llmessage/llsdmessagereader.h
index 698f751..9afa4a2 100755
--- a/linden/indra/llmessage/llsdmessagereader.h
+++ b/linden/indra/llmessage/llsdmessagereader.h
@@ -87,6 +87,8 @@ public:
                                                   S32 blocknum = 0);
        virtual void getString(const char *block, const char *var, 
                                                   S32 buffer_size, char *buffer, S32 blocknum = 0);
+        virtual void getString(const char *block, const char *var, std::string& outstr,
+                                                   S32 blocknum = 0);
        virtual S32     getNumberOfBlocks(const char *blockname);
        virtual S32     getSize(const char *blockname, const char *varname);
diff --git a/linden/indra/llmessage/llservicebuilder.cpp b/linden/indra/llmessage/llservicebuilder.cpp
index 138ab2d..96f49ab 100644
--- a/linden/indra/llmessage/llservicebuilder.cpp
+++ b/linden/indra/llmessage/llservicebuilder.cpp
@@ -39,7 +39,7 @@
 void LLServiceBuilder::loadServiceDefinitionsFromFile(
        const std::string& service_filename)
 {
-        llifstream service_file(service_filename.c_str(), std::ios::binary);
+        llifstream service_file(service_filename, std::ios::binary);
        if(service_file.is_open())
        {
                LLSD service_data;
@@ -111,10 +111,13 @@ std::string LLServiceBuilder::buildServiceURI(
        const std::string& service_name,
        const LLSD& option_map)
 {
-        std::string service_url = buildServiceURI(service_name);
+        return russ_format(buildServiceURI(service_name), option_map);
-    
+}
-        // Find the Service Name
-        if(!service_url.empty() && option_map.isMap())
+std::string russ_format(const std::string& format_str, const LLSD& context)
+{
+        std::string service_url(format_str);
+        if(!service_url.empty() && context.isMap())
        {
                // throw in a ridiculously large limiter to make sure we don't
                // loop forever with bad input.
@@ -134,9 +137,9 @@ std::string LLServiceBuilder::buildServiceURI(
                        std::string::iterator end(service_url.end());
                        std::string::iterator deepest_node(service_url.end());
                        std::string::iterator deepest_node_end(service_url.end());
-                        //parse out the variables to replace by going through {}s one at a time,
+                        // parse out the variables to replace by going through {}s
-                        // starting with the "deepest" in series {{}},
+                        // one at a time, starting with the "deepest" in series
-                        // and otherwise replacing right-to-left
+                        // {{}}, and otherwise replacing right-to-left
                        for(; iter != end; ++iter)
                        {
                                switch(*iter)
@@ -171,7 +174,7 @@ std::string LLServiceBuilder::buildServiceURI(
                        // params and straight string substitution, so it's a
                        // known distance of 2 to skip the directive.
                        std::string key(deepest_node + 2, deepest_node_end);
-                        LLSD value = option_map[key];
+                        LLSD value = context[key];
                        switch(*(deepest_node + 1))
                        {
                        case '$':
@@ -184,7 +187,9 @@ std::string LLServiceBuilder::buildServiceURI(
                                }
                                else
                                {
-                                        llwarns << "Unknown key: " << key << " in option map: " << LLSDOStreamer<LLSDNotationFormatter>(option_map) << llendl;
+                                        llwarns << "Unknown key: " << key << " in option map: "
+                                                << LLSDOStreamer<LLSDNotationFormatter>(context)
+                                                << llendl;
                                        keep_looping = false;
                                }
                                break;
@@ -212,50 +217,3 @@ std::string LLServiceBuilder::buildServiceURI(
        }
        return service_url;
 }
-// Old, not as good implementation. Phoenix 2007-10-15
-#if 0
-                // Do brace replacements - NOT CURRENTLY RECURSIVE
-                for(LLSD::map_const_iterator option_itr = option_map.beginMap();
-                        option_itr != option_map.endMap();
-                        ++option_itr)
-                {
-                        std::string variable_name = "{$";
-                        variable_name.append((*option_itr).first);
-                        variable_name.append("}");
-                        std::string::size_type find_pos = service_url.find(variable_name);
-                        if(find_pos != std::string::npos)
-                        {
-                                service_url.replace(
-                                        find_pos,
-                                        variable_name.length(),
-                                        (*option_itr).second.asString());
-                                continue;
-                        }
-                        variable_name.assign("{%");
-                        variable_name.append((*option_itr).first);
-                        variable_name.append("}");
-                        find_pos = service_url.find(variable_name);
-                        if(find_pos != std::string::npos)
-                        {
-                                std::string query_str = LLURI::mapToQueryString(
-                                        (*option_itr).second);
-                                service_url.replace(
-                                        find_pos,
-                                        variable_name.length(),
-                                        query_str);
-                        }
-                }
-        }
-        if (service_url.find('{') != std::string::npos)
-        {
-                llwarns << "Constructed a likely bogus service URL: " << service_url
-                                << llendl;
-        }
-        return service_url;
-}
-#endif
diff --git a/linden/indra/llmessage/llservicebuilder.h b/linden/indra/llmessage/llservicebuilder.h
index f19ba9a..ce95488 100644
--- a/linden/indra/llmessage/llservicebuilder.h
+++ b/linden/indra/llmessage/llservicebuilder.h
@@ -38,11 +38,24 @@
 class LLSD;
+/**
+ * @brief  Format format string according to rules for RUSS.
+ *
+ * This function appears alongside the service builder since the
+ * algorithm was originally implemented there. This can eventually be
+ * moved when someone wants to take the time.
+ * @see https://osiris.lindenlab.com/mediawiki/index.php/Recursive_URL_Substitution_Syntax
+ * @param format_str The input string to format.
+ * @param context A map used for string substitutions.
+ * @return Returns the formatted string. If no match is found for a
+ * substitution target, the braces remain intact.
+ */
+std::string russ_format(const std::string& format_str, const LLSD& context);
 /** 
 * @class LLServiceBuilder
 * @brief This class builds urls for us to use when making web service calls.
 */
 class LLServiceBuilder
 {
        LOG_CLASS(LLServiceBuilder);
diff --git a/linden/indra/llmessage/lltemplatemessagereader.cpp b/linden/indra/llmessage/lltemplatemessagereader.cpp
index 0d81383..f5da14b 100644
--- a/linden/indra/llmessage/lltemplatemessagereader.cpp
+++ b/linden/indra/llmessage/lltemplatemessagereader.cpp
@@ -171,9 +171,6 @@ S32 LLTemplateMessageReader::getNumberOfBlocks(const char *blockname)
        
        if (iter == mCurrentRMessageData->mMemberBlocks.end())
        {
-//              sprintf(errmsg, "Block %s not in message %s", bnamep, mCurrentRMessageData->mName);
-//              llerrs << errmsg << llendl;
-//              return -1;
                return 0;
        }
@@ -433,6 +430,15 @@ inline void LLTemplateMessageReader::getString(const char *block, const char *va
        s[buffer_size - 1] = '\0';
 }
+inline void LLTemplateMessageReader::getString(const char *block, const char *var, std::string& outstr, S32 blocknum )
+{
+        char s[MTUBYTES];
+        s[0] = '\0';
+        getData(block, var, s, 0, blocknum, MTUBYTES);
+        s[MTUBYTES - 1] = '\0';
+        outstr = s;
+}
 //virtual 
 S32 LLTemplateMessageReader::getMessageSize() const
 {
@@ -568,7 +574,9 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
                        // repeat number is a single byte
                        if (decode_pos >= mReceiveSize)
                        {
-                                logRanOffEndOfPacket(sender, decode_pos, 1);
+                                // commented out - hetgrid says that missing variable blocks
+                                // at end of message are legal
+                                // logRanOffEndOfPacket(sender, decode_pos, 1);
                                // default to 0 repeats
                                repeat_number = 0;
diff --git a/linden/indra/llmessage/lltemplatemessagereader.h b/linden/indra/llmessage/lltemplatemessagereader.h
index 1448c2d..98f41ae 100644
--- a/linden/indra/llmessage/lltemplatemessagereader.h
+++ b/linden/indra/llmessage/lltemplatemessagereader.h
@@ -88,6 +88,8 @@ public:
                                                   S32 blocknum = 0);
        virtual void getString(const char *block, const char *var, 
                                                   S32 buffer_size, char *buffer, S32 blocknum = 0);
+        virtual void getString(const char *block, const char *var,  std::string& outstr,
+                                                   S32 blocknum = 0);
        virtual S32     getNumberOfBlocks(const char *blockname);
        virtual S32     getSize(const char *blockname, const char *varname);
diff --git a/linden/indra/llmessage/lltransfersourcefile.cpp b/linden/indra/llmessage/lltransfersourcefile.cpp
index 4b60cf3..a372f66 100644
--- a/linden/indra/llmessage/lltransfersourcefile.cpp
+++ b/linden/indra/llmessage/lltransfersourcefile.cpp
@@ -67,7 +67,7 @@ void LLTransferSourceFile::initTransfer()
                return;
        }
        // Look for the file.
-        mFP = LLFile::fopen(mParams.getFilename().c_str(), "rb");               /* Flawfinder: ignore */
+        mFP = LLFile::fopen(mParams.getFilename(), "rb");               /* Flawfinder: ignore */
        if (!mFP)
        {
                sendTransferStatus(LLTS_ERROR);
@@ -134,9 +134,9 @@ void LLTransferSourceFile::completionCallback(const LLTSCode status)
        }
        // Delete the file iff the filename begins with "TEMP"
-        if (mParams.getDeleteOnCompletion() && memcmp(mParams.getFilename().c_str(), "TEMP", 4) == 0)
+        if (mParams.getDeleteOnCompletion() && mParams.getFilename().substr(0, 4) == "TEMP")
        {
-                LLFile::remove(mParams.getFilename().c_str());
+                LLFile::remove(mParams.getFilename());
        }
 }
@@ -162,7 +162,7 @@ LLTransferSourceParamsFile::LLTransferSourceParamsFile() :
 void LLTransferSourceParamsFile::packParams(LLDataPacker &dp) const
 {
-        dp.packString(mFilename.c_str(), "Filename");
+        dp.packString(mFilename, "Filename");
        dp.packU8((U8)mDeleteOnCompletion, "Delete");
 }
diff --git a/linden/indra/llmessage/lltransfersourcefile.h b/linden/indra/llmessage/lltransfersourcefile.h
index 030f80e..3137e1c 100644
--- a/linden/indra/llmessage/lltransfersourcefile.h
+++ b/linden/indra/llmessage/lltransfersourcefile.h
@@ -42,7 +42,7 @@ public:
        /*virtual*/ void packParams(LLDataPacker &dp) const;
        /*virtual*/ BOOL unpackParams(LLDataPacker &dp);
-        void setFilename(const LLString &filename)              { mFilename = filename; }
+        void setFilename(const std::string &filename)           { mFilename = filename; }
        std::string getFilename() const                                 { return mFilename; }
        void setDeleteOnCompletion(BOOL enabled)                { mDeleteOnCompletion = enabled; }
diff --git a/linden/indra/llmessage/lltransfertargetfile.cpp b/linden/indra/llmessage/lltransfertargetfile.cpp
index f1f602d..2723cb7 100644
--- a/linden/indra/llmessage/lltransfertargetfile.cpp
+++ b/linden/indra/llmessage/lltransfertargetfile.cpp
@@ -80,7 +80,7 @@ LLTSCode LLTransferTargetFile::dataCallback(const S32 packet_id, U8 *in_datap, c
        if (!mFP)
        {
-                mFP = LLFile::fopen(mParams.mFilename.c_str(), "wb");           /* Flawfinder: ignore */                
+                mFP = LLFile::fopen(mParams.mFilename, "wb");           /* Flawfinder: ignore */                
                if (!mFP)
                {
@@ -122,7 +122,7 @@ void LLTransferTargetFile::completionCallback(const LLTSCode status)
                if (mFP)
                {
                        // Only need to remove file if we successfully opened it.
-                        LLFile::remove(mParams.mFilename.c_str());
+                        LLFile::remove(mParams.mFilename);
                }
        default:
                break;
diff --git a/linden/indra/llmessage/lltransfertargetfile.h b/linden/indra/llmessage/lltransfertargetfile.h
index 02c0c11..4d92ec1 100644
--- a/linden/indra/llmessage/lltransfertargetfile.h
+++ b/linden/indra/llmessage/lltransfertargetfile.h
@@ -40,12 +40,12 @@ class LLTransferTargetParamsFile : public LLTransferTargetParams
 {
 public:
        LLTransferTargetParamsFile() : LLTransferTargetParams(LLTTT_FILE) {}
-        void setFilename(const LLString& filename)      { mFilename = filename; }
+        void setFilename(const std::string& filename)   { mFilename = filename; }
        void setCallback(LLTTFCompleteCallback cb, void *user_data)             { mCompleteCallback = cb; mUserData = user_data; }
        friend class LLTransferTargetFile;
 protected:
-        LLString                                mFilename;
+        std::string                             mFilename;
        LLTTFCompleteCallback   mCompleteCallback;
        void *                                  mUserData;
 };
diff --git a/linden/indra/llmessage/llurlrequest.cpp b/linden/indra/llmessage/llurlrequest.cpp
index 5760197..42f3f04 100644
--- a/linden/indra/llmessage/llurlrequest.cpp
+++ b/linden/indra/llmessage/llurlrequest.cpp
@@ -42,7 +42,7 @@
 #include "llpumpio.h"
 #include "llsd.h"
 #include "llstring.h"
-#include "apr-1/apr_env.h"
+#include "apr_env.h"
 static const U32 HTTP_STATUS_PIPE_ERROR = 499;
@@ -385,6 +385,13 @@ bool LLURLRequest::configure()
                rv = true;
                break;
+        case HTTP_MOVE:
+                // Set the handle for an http post
+                mDetail->mCurlRequest->setoptString(CURLOPT_CUSTOMREQUEST, "MOVE");
+                // *NOTE: should we check for the Destination header?
+                rv = true;
+                break;
        default:
                llwarns << "Unhandled URLRequest action: " << mAction << llendl;
                break;
@@ -535,7 +542,7 @@ LLIOPipe::EStatus LLContextURLExtractor::process_impl(
        // find the context url
        if(context.has(CONTEXT_DEST_URI_SD_LABEL))
        {
-                mRequest->setURL(context[CONTEXT_DEST_URI_SD_LABEL]);
+                mRequest->setURL(context[CONTEXT_DEST_URI_SD_LABEL].asString());
                return STATUS_DONE;
        }
        return STATUS_ERROR;
diff --git a/linden/indra/llmessage/llurlrequest.h b/linden/indra/llmessage/llurlrequest.h
index b6da56b..888b962 100644
--- a/linden/indra/llmessage/llurlrequest.h
+++ b/linden/indra/llmessage/llurlrequest.h
@@ -76,6 +76,7 @@ public:
                HTTP_PUT,
                HTTP_POST,
                HTTP_DELETE,
+                HTTP_MOVE, // Caller will need to set 'Destination' header
                REQUEST_ACTION_COUNT
        };
diff --git a/linden/indra/llmessage/llxfer.cpp b/linden/indra/llmessage/llxfer.cpp
index 5430213..ab7b1ee 100644
--- a/linden/indra/llmessage/llxfer.cpp
+++ b/linden/indra/llmessage/llxfer.cpp
@@ -103,7 +103,7 @@ void LLXfer::free ()
 S32 LLXfer::startSend (U64 xfer_id, const LLHost &remote_host)
 {
-        llwarns << "undifferentiated LLXfer::startSend for " << getName() << llendl;
+        llwarns << "undifferentiated LLXfer::startSend for " << getFileName() << llendl;
        return (-1);
 }
@@ -119,7 +119,7 @@ void LLXfer::setXferSize (S32 xfer_size)
 S32 LLXfer::startDownload()
 {
-        llwarns << "undifferentiated LLXfer::startDownload for " << getName()
+        llwarns << "undifferentiated LLXfer::startDownload for " << getFileName()
                        << llendl;
        return (-1);
 }
@@ -293,13 +293,13 @@ S32 LLXfer::processEOF()
        if (LL_ERR_NOERR == mCallbackResult)
        {
-                llinfos << "xfer from " << mRemoteHost << " complete: " << getName()
+                llinfos << "xfer from " << mRemoteHost << " complete: " << getFileName()
                                << llendl;
        }
        else
        {
                llinfos << "xfer from " << mRemoteHost << " failed, code "
-                                << mCallbackResult << ": " << getName() << llendl;
+                                << mCallbackResult << ": " << getFileName() << llendl;
        }
        if (mCallback)
@@ -327,7 +327,7 @@ void LLXfer::abort (S32 result_code)
 {
        mCallbackResult = result_code;
-        llinfos << "Aborting xfer from " << mRemoteHost << " named " << getName()
+        llinfos << "Aborting xfer from " << mRemoteHost << " named " << getFileName()
                        << " - error: " << result_code << llendl;
        gMessageSystem->newMessageFast(_PREHASH_AbortXfer);
@@ -343,11 +343,9 @@ void LLXfer::abort (S32 result_code)
 ///////////////////////////////////////////////////////////
-const char * LLXfer::getName() 
+std::string LLXfer::getFileName() 
 {
-        static char tmp_str[256];               /* Flawfinder: ignore */
+        return U64_to_str(mID);
-        return (U64_to_str(mID, tmp_str, sizeof(tmp_str)));
 }
 ///////////////////////////////////////////////////////////
@@ -367,7 +365,7 @@ S32 LLXfer::getMaxBufferSize ()
 std::ostream& operator<< (std::ostream& os, LLXfer &hh)
 {
-        os << hh.getName() ;
+        os << hh.getFileName() ;
        return os;
 }
diff --git a/linden/indra/llmessage/llxfer.h b/linden/indra/llmessage/llxfer.h
index 603b4d7..259f1ac 100644
--- a/linden/indra/llmessage/llxfer.h
+++ b/linden/indra/llmessage/llxfer.h
@@ -106,7 +106,7 @@ class LLXfer
        virtual void setXferSize (S32 data_size);
        virtual S32  getMaxBufferSize();
-        virtual const char *getName();
+        virtual std::string getFileName();
        virtual U32 getXferTypeTag();
diff --git a/linden/indra/llmessage/llxfer_file.cpp b/linden/indra/llmessage/llxfer_file.cpp
index 840d84c..da12d54 100644
--- a/linden/indra/llmessage/llxfer_file.cpp
+++ b/linden/indra/llmessage/llxfer_file.cpp
@@ -47,17 +47,17 @@
 const U32 LL_MAX_XFER_FILE_BUFFER = 65536;
 // local function to copy a file
-S32 copy_file(const char* from, const char* to);
+S32 copy_file(const std::string& from, const std::string& to);
 ///////////////////////////////////////////////////////////
 LLXfer_File::LLXfer_File (S32 chunk_size)
 : LLXfer(chunk_size)
 {
-        init(LLString::null, FALSE, chunk_size);
+        init(LLStringUtil::null, FALSE, chunk_size);
 }
-LLXfer_File::LLXfer_File (const LLString& local_filename, BOOL delete_local_on_completion, S32 chunk_size)
+LLXfer_File::LLXfer_File (const std::string& local_filename, BOOL delete_local_on_completion, S32 chunk_size)
 : LLXfer(chunk_size)
 {
        init(local_filename, delete_local_on_completion, chunk_size);
@@ -72,24 +72,24 @@ LLXfer_File::~LLXfer_File ()
 ///////////////////////////////////////////////////////////
-void LLXfer_File::init (const LLString& local_filename, BOOL delete_local_on_completion, S32 chunk_size)
+void LLXfer_File::init (const std::string& local_filename, BOOL delete_local_on_completion, S32 chunk_size)
 {
        mFp = NULL;
-        mLocalFilename[0] = 0;
+        mLocalFilename.clear();
-        mRemoteFilename[0] = 0;
+        mRemoteFilename.clear();
        mRemotePath = LL_PATH_NONE;
-        mTempFilename[0] = 0;
+        mTempFilename.clear();
        mDeleteLocalOnCompletion = FALSE;
        mDeleteRemoteOnCompletion = FALSE;
        if (!local_filename.empty())
        {
-                strncpy(mLocalFilename, local_filename.c_str(), LL_MAX_PATH-1);
+                mLocalFilename =  local_filename.substr(0,LL_MAX_PATH-1);
-                mLocalFilename[LL_MAX_PATH-1] = '\0'; // stupid strncpy.
                // You can only automatically delete .tmp file as a safeguard against nasty messages.
-                mDeleteLocalOnCompletion = (delete_local_on_completion && (strstr(mLocalFilename,".tmp") == &mLocalFilename[strlen(mLocalFilename)-4]));                /* Flawfinder : ignore */
+                std::string exten = mLocalFilename.substr(mLocalFilename.length()-4, 4);
+                mDeleteLocalOnCompletion = (delete_local_on_completion && exten == ".tmp");
        }
 }
        
@@ -121,8 +121,8 @@ void LLXfer_File::free ()
 ///////////////////////////////////////////////////////////
 S32 LLXfer_File::initializeRequest(U64 xfer_id,
-                                   const LLString& local_filename,
+                                   const std::string& local_filename,
-                                   const LLString& remote_filename,
+                                   const std::string& remote_filename,
                                   ELLPath remote_path,
                                   const LLHost& remote_host,
                                   BOOL delete_remote_on_completion,
@@ -132,15 +132,13 @@ S32 LLXfer_File::initializeRequest(U64 xfer_id,
        S32 retval = 0;  // presume success
        
        mID = xfer_id;
-        strncpy(mLocalFilename, local_filename.c_str(), LL_MAX_PATH-1);
+        mLocalFilename = local_filename;
-        mLocalFilename[LL_MAX_PATH-1] = '\0'; // stupid strncpy.
+        mRemoteFilename = remote_filename;
-        strncpy(mRemoteFilename,remote_filename.c_str(), LL_MAX_PATH-1);
-        mRemoteFilename[LL_MAX_PATH-1] = '\0'; // stupid strncpy.
        mRemotePath = remote_path;
        mRemoteHost = remote_host;
        mDeleteRemoteOnCompletion = delete_remote_on_completion;
-        snprintf(mTempFilename, sizeof(mTempFilename), "%s",gDirUtilp->getTempFilename().c_str());      /* Flawfinder: ignore */
+        mTempFilename = gDirUtilp->getTempFilename();
        mCallback = callback;
        mCallbackDataHandle = user_data;
@@ -343,7 +341,7 @@ S32 LLXfer_File::processEOF()
                                if(copy_file(mTempFilename, mLocalFilename) == 0)
                                {
                                        llinfos << "Rename across mounts; copying+unlinking the file instead." << llendl;
-                                        unlink(mTempFilename);
+                                        unlink(mTempFilename.c_str());
                                }
                                else
                                {
@@ -384,14 +382,14 @@ S32 LLXfer_File::processEOF()
 ///////////////////////////////////////////////////////////
-BOOL LLXfer_File::matchesLocalFilename(const LLString& filename) 
+BOOL LLXfer_File::matchesLocalFilename(const std::string& filename) 
 {
        return (filename == mLocalFilename);
 }
 ///////////////////////////////////////////////////////////
-BOOL LLXfer_File::matchesRemoteFilename(const LLString& filename, ELLPath remote_path) 
+BOOL LLXfer_File::matchesRemoteFilename(const std::string& filename, ELLPath remote_path) 
 {
        return ((filename == mRemoteFilename) && (remote_path == mRemotePath));
 }
@@ -399,9 +397,9 @@ BOOL LLXfer_File::matchesRemoteFilename(const LLString& filename, ELLPath remote
 ///////////////////////////////////////////////////////////
-const char * LLXfer_File::getName() 
+std::string LLXfer_File::getFileName() 
 {
-        return (mLocalFilename);
+        return mLocalFilename;
 }
 ///////////////////////////////////////////////////////////
@@ -421,7 +419,7 @@ U32 LLXfer_File::getXferTypeTag()
 // function. It does not really spam enough information, but is useful
 // for this cpp file, because this should never be called in a
 // production environment.
-S32 copy_file(const char* from, const char* to)
+S32 copy_file(const std::string& from, const std::string& to)
 {
        S32 rv = 0;
        LLFILE* in = LLFile::fopen(from, "rb"); /*Flawfinder: ignore*/
diff --git a/linden/indra/llmessage/llxfer_file.h b/linden/indra/llmessage/llxfer_file.h
index b5294ad..78f77a8 100644
--- a/linden/indra/llmessage/llxfer_file.h
+++ b/linden/indra/llmessage/llxfer_file.h
@@ -39,25 +39,25 @@ class LLXfer_File : public LLXfer
 {
 protected:
        LLFILE *mFp;
-        char mLocalFilename[LL_MAX_PATH];               /* Flawfinder : ignore */
+        std::string mLocalFilename;
-        char mRemoteFilename[LL_MAX_PATH];              /* Flawfinder : ignore */
+        std::string mRemoteFilename;
        ELLPath mRemotePath;
-        char mTempFilename[LL_MAX_PATH];                /* Flawfinder : ignore */
+        std::string mTempFilename;
        BOOL mDeleteLocalOnCompletion;
        BOOL mDeleteRemoteOnCompletion;
 public:
        LLXfer_File (S32 chunk_size);
-        LLXfer_File (const LLString& local_filename, BOOL delete_local_on_completion, S32 chunk_size);
+        LLXfer_File (const std::string& local_filename, BOOL delete_local_on_completion, S32 chunk_size);
        virtual ~LLXfer_File();
-        virtual void init(const LLString& local_filename, BOOL delete_local_on_completion, S32 chunk_size);
+        virtual void init(const std::string& local_filename, BOOL delete_local_on_completion, S32 chunk_size);
        virtual void free();
        virtual S32 initializeRequest(U64 xfer_id,
-                                                                  const LLString& local_filename,
+                                                                  const std::string& local_filename,
-                                                                  const LLString& remote_filename,
+                                                                  const std::string& remote_filename,
                                                                  ELLPath remote_path,
                                                                  const LLHost& remote_host,
                                                                  BOOL delete_remote_on_completion,
@@ -72,14 +72,14 @@ class LLXfer_File : public LLXfer
        virtual S32 suck(S32 start_position);
        virtual S32 flush();
-        virtual BOOL matchesLocalFilename(const LLString& filename);
+        virtual BOOL matchesLocalFilename(const std::string& filename);
-        virtual BOOL matchesRemoteFilename(const LLString& filename, ELLPath remote_path);
+        virtual BOOL matchesRemoteFilename(const std::string& filename, ELLPath remote_path);
        virtual S32  getMaxBufferSize();
        virtual U32 getXferTypeTag();
-        virtual const char *getName();
+        virtual std::string getFileName();
 };
 #endif
diff --git a/linden/indra/llmessage/llxfer_mem.cpp b/linden/indra/llmessage/llxfer_mem.cpp
index 614f027..3404520 100644
--- a/linden/indra/llmessage/llxfer_mem.cpp
+++ b/linden/indra/llmessage/llxfer_mem.cpp
@@ -55,7 +55,7 @@ LLXfer_Mem::~LLXfer_Mem ()
 void LLXfer_Mem::init ()
 {
-        mRemoteFilename[0] = '\0';
+        mRemoteFilename.clear();
        mRemotePath = LL_PATH_NONE;
        mDeleteRemoteOnCompletion = FALSE;
 }
@@ -120,7 +120,7 @@ S32 LLXfer_Mem::startSend (U64 xfer_id, const LLHost &remote_host)
        mID = xfer_id;
        mPacketNum = -1;
-//      cout << "Sending file: " << getName() << endl;
+//      cout << "Sending file: " << getFileName() << endl;
        mStatus = e_LL_XFER_PENDING;
@@ -135,7 +135,7 @@ S32 LLXfer_Mem::processEOF()
        mStatus = e_LL_XFER_COMPLETE;
-        llinfos << "xfer complete: " << getName() << llendl;
+        llinfos << "xfer complete: " << getFileName() << llendl;
        if (mCallback)
        {
@@ -165,8 +165,7 @@ S32 LLXfer_Mem::initializeRequest(U64 xfer_id,
        mCallbackDataHandle = user_data;
        mCallbackResult = LL_ERR_NOERR;
-        strncpy(mRemoteFilename, remote_filename.c_str(), LL_MAX_PATH-1);
+        mRemoteFilename = remote_filename;
-        mRemoteFilename[LL_MAX_PATH-1] = '\0'; // stupid strncpy.
        mRemotePath = remote_path;
        mDeleteRemoteOnCompletion = delete_remote_on_completion;
diff --git a/linden/indra/llmessage/llxfer_mem.h b/linden/indra/llmessage/llxfer_mem.h
index a3d6ca5..0e67a06 100644
--- a/linden/indra/llmessage/llxfer_mem.h
+++ b/linden/indra/llmessage/llxfer_mem.h
@@ -42,7 +42,7 @@ class LLXfer_Mem : public LLXfer
 private:
 protected:
        void (*mCallback)(void *, S32, void **, S32, LLExtStat);        
-        char mRemoteFilename[LL_MAX_PATH];              /* Flawfinder : ignore */
+        std::string mRemoteFilename;
        ELLPath mRemotePath;
        BOOL mDeleteRemoteOnCompletion;
diff --git a/linden/indra/llmessage/llxfer_vfile.cpp b/linden/indra/llmessage/llxfer_vfile.cpp
index 69d580a..aede763 100644
--- a/linden/indra/llmessage/llxfer_vfile.cpp
+++ b/linden/indra/llmessage/llxfer_vfile.cpp
@@ -74,10 +74,10 @@ void LLXfer_VFile::init (LLVFS *vfs, const LLUUID &local_id, LLAssetType::EType
        mVFile = NULL;
-        char id_string[UUID_STR_LENGTH];                        /* Flawfinder : ignore */
+        std::string id_string;
        mLocalID.toString(id_string);
-        snprintf(mName, sizeof(mName), "VFile %s:%s", id_string, LLAssetType::lookup(mType));           /* Flawfinder : ignore */
+        mName = llformat("VFile %s:%s", id_string.c_str(), LLAssetType::lookup(mType));
 }
        
 ///////////////////////////////////////////////////////////
@@ -118,10 +118,10 @@ S32 LLXfer_VFile::initializeRequest(U64 xfer_id,
        mCallbackDataHandle = user_data;
        mCallbackResult = LL_ERR_NOERR;
-        char id_string[UUID_STR_LENGTH];                /* Flawfinder : ignore */
+        std::string id_string;
        mLocalID.toString(id_string);
-        snprintf(mName, sizeof(mName), "VFile %s:%s", id_string, LLAssetType::lookup(mType));           /* Flawfinder : ignore */
+        mName = llformat("VFile %s:%s", id_string.c_str(), LLAssetType::lookup(mType));
        llinfos << "Requesting " << mName << llendl;
@@ -328,7 +328,7 @@ BOOL LLXfer_VFile::matchesRemoteFile(const LLUUID &id, LLAssetType::EType type)
 //////////////////////////////////////////////////////////
-const char * LLXfer_VFile::getName() 
+std::string LLXfer_VFile::getFileName() 
 {
        return mName;
 }
diff --git a/linden/indra/llmessage/llxfer_vfile.h b/linden/indra/llmessage/llxfer_vfile.h
index 8c0bebb..12d38ba 100644
--- a/linden/indra/llmessage/llxfer_vfile.h
+++ b/linden/indra/llmessage/llxfer_vfile.h
@@ -50,7 +50,7 @@ class LLXfer_VFile : public LLXfer
        LLVFS *mVFS;
-        char mName[MAX_STRING];         /* Flawfinder : ignore */
+        std::string mName;
 public:
        LLXfer_VFile ();
@@ -85,7 +85,7 @@ class LLXfer_VFile : public LLXfer
        virtual U32 getXferTypeTag();
-        virtual const char *getName();
+        virtual std::string getFileName();
 };
 #endif
diff --git a/linden/indra/llmessage/llxfermanager.cpp b/linden/indra/llmessage/llxfermanager.cpp
index 8bf9813..90188b6 100644
--- a/linden/indra/llmessage/llxfermanager.cpp
+++ b/linden/indra/llmessage/llxfermanager.cpp
@@ -406,8 +406,8 @@ U64 LLXferManager::registerXfer(const void *datap, const S32 length)
 ///////////////////////////////////////////////////////////
-void LLXferManager::requestFile(const char* local_filename,
+void LLXferManager::requestFile(const std::string& local_filename,
-                                                                const char* remote_filename,
+                                                                const std::string& remote_filename,
                                                                ELLPath remote_path,
                                                                const LLHost& remote_host,
                                                                BOOL delete_remote_on_completion,
@@ -444,7 +444,7 @@ void LLXferManager::requestFile(const char* local_filename,
                // Note: according to AaronB, this is here to deal with locks on files that were
                // in transit during a crash,
                if(delete_remote_on_completion &&
-                   (strstr(remote_filename,".tmp") == &remote_filename[strlen(remote_filename)-4]))             /* Flawfinder : ignore */
+                   (remote_filename.substr(remote_filename.length()-4) == ".tmp"))
                {
                        LLFile::remove(local_filename);
                }
@@ -464,7 +464,7 @@ void LLXferManager::requestFile(const char* local_filename,
        }
 }
-void LLXferManager::requestFile(const char* remote_filename,
+void LLXferManager::requestFile(const std::string& remote_filename,
                                                                ELLPath remote_path,
                                                                const LLHost& remote_host,
                                                                BOOL delete_remote_on_completion,
@@ -540,7 +540,7 @@ void LLXferManager::requestVFile(const LLUUID& local_id,
 /*
 void LLXferManager::requestXfer(
-                                                                const char *local_filename, 
+                                                                const std::string& local_filename, 
                                                                BOOL delete_remote_on_completion,
                                                                U64 xfer_id, 
                                                                const LLHost &remote_host, 
@@ -634,11 +634,11 @@ void LLXferManager::processReceiveData (LLMessageSystem *mesgsys, void ** /*user
                // confirm it if it was a resend of the last one, since the confirmation might have gotten dropped
                if (decodePacketNum(packetnum) == (xferp->mPacketNum - 1))
                {
-                        llinfos << "Reconfirming xfer " << xferp->mRemoteHost << ":" << xferp->getName() << " packet " << packetnum << llendl;                  sendConfirmPacket(mesgsys, id, decodePacketNum(packetnum), mesgsys->getSender());
+                        llinfos << "Reconfirming xfer " << xferp->mRemoteHost << ":" << xferp->getFileName() << " packet " << packetnum << llendl;                      sendConfirmPacket(mesgsys, id, decodePacketNum(packetnum), mesgsys->getSender());
                }
                else
                {
-                        llinfos << "Ignoring xfer " << xferp->mRemoteHost << ":" << xferp->getName() << " recv'd packet " << packetnum << "; expecting " << xferp->mPacketNum << llendl;
+                        llinfos << "Ignoring xfer " << xferp->mRemoteHost << ":" << xferp->getFileName() << " recv'd packet " << packetnum << "; expecting " << xferp->mPacketNum << llendl;
                }
                return;         
        }
@@ -717,7 +717,7 @@ void LLXferManager::processFileRequest (LLMessageSystem *mesgsys, void ** /*user
 {
                
        U64 id;
-        char local_filename[MAX_STRING];                /* Flawfinder : ignore */
+        std::string local_filename;
        ELLPath local_path = LL_PATH_NONE;
        S32 result = LL_ERR_NOERR;
        LLUUID  uuid;
@@ -732,7 +732,7 @@ void LLXferManager::processFileRequest (LLMessageSystem *mesgsys, void ** /*user
        llinfos << "xfer request id: " << U64_to_str(id, U64_BUF, sizeof(U64_BUF))
                   << " to " << mesgsys->getSender() << llendl;
-        mesgsys->getStringFast(_PREHASH_XferID, _PREHASH_Filename, MAX_STRING, local_filename);
+        mesgsys->getStringFast(_PREHASH_XferID, _PREHASH_Filename, local_filename);
        
        U8 local_path_u8;
        mesgsys->getU8("XferID", "FilePath", local_path_u8);
@@ -780,7 +780,7 @@ void LLXferManager::processFileRequest (LLMessageSystem *mesgsys, void ** /*user
                        llerrs << "Xfer allcoation error" << llendl;
                }
        }
-        else if (strlen(local_filename))                /* Flawfinder : ignore */
+        else if (!local_filename.empty())
        {
                std::string expanded_filename = gDirUtilp->getExpandedFilename( local_path, local_filename );
                llinfos << "starting file transfer: " <<  expanded_filename << " to " << mesgsys->getSender() << llendl;
@@ -923,7 +923,7 @@ void LLXferManager::retransmitUnackedPackets ()
                {
                        if (xferp->mRetries > LL_PACKET_RETRY_LIMIT)
                        {
-                                llinfos << "dropping xfer " << xferp->mRemoteHost << ":" << xferp->getName() << " packet retransmit limit exceeded, xfer dropped" << llendl;
+                                llinfos << "dropping xfer " << xferp->mRemoteHost << ":" << xferp->getFileName() << " packet retransmit limit exceeded, xfer dropped" << llendl;
                                xferp->abort(LL_ERR_TCP_TIMEOUT);
                                delp = xferp;
                                xferp = xferp->mNext;
@@ -931,7 +931,7 @@ void LLXferManager::retransmitUnackedPackets ()
                        }
                        else
                        {
-                                llinfos << "resending xfer " << xferp->mRemoteHost << ":" << xferp->getName() << " packet unconfirmed after: "<< et << " sec, packet " << xferp->mPacketNum << llendl;
+                                llinfos << "resending xfer " << xferp->mRemoteHost << ":" << xferp->getFileName() << " packet unconfirmed after: "<< et << " sec, packet " << xferp->mPacketNum << llendl;
                                xferp->resendLastPacket();
                                xferp = xferp->mNext;
                        }
@@ -946,7 +946,7 @@ void LLXferManager::retransmitUnackedPackets ()
                }
                else if (xferp->mStatus == e_LL_XFER_ABORTED)
                {
-                        llwarns << "Removing aborted xfer " << xferp->mRemoteHost << ":" << xferp->getName() << llendl;
+                        llwarns << "Removing aborted xfer " << xferp->mRemoteHost << ":" << xferp->getFileName() << llendl;
                        delp = xferp;
                        xferp = xferp->mNext;
                        removeXfer(delp,&mSendList);
diff --git a/linden/indra/llmessage/llxfermanager.h b/linden/indra/llmessage/llxfermanager.h
index 82cd8e9..12b3ec0 100644
--- a/linden/indra/llmessage/llxfermanager.h
+++ b/linden/indra/llmessage/llxfermanager.h
@@ -143,8 +143,8 @@ class LLXferManager
 // file requesting routines
 // .. to file
-        virtual void requestFile(const char* local_filename,
+        virtual void requestFile(const std::string& local_filename,
-                                                         const char* remote_filename,
+                                                         const std::string& remote_filename,
                                                         ELLPath remote_path,
                                                         const LLHost& remote_host,
                                                         BOOL delete_remote_on_completion,
@@ -153,7 +153,7 @@ class LLXferManager
                                                         BOOL use_big_packets = FALSE);
 // .. to memory
-        virtual void requestFile(const char* remote_filename, 
+        virtual void requestFile(const std::string& remote_filename, 
                                                         ELLPath remote_path,
                                                         const LLHost &remote_host,
                                                         BOOL delete_remote_on_completion,
diff --git a/linden/indra/llmessage/mean_collision_data.h b/linden/indra/llmessage/mean_collision_data.h
index 1f245f9..0f09c3e 100644
--- a/linden/indra/llmessage/mean_collision_data.h
+++ b/linden/indra/llmessage/mean_collision_data.h
@@ -55,15 +55,13 @@ class LLMeanCollisionData
 public:
        LLMeanCollisionData(const LLUUID &victim, const LLUUID &perp, time_t time, EMeanCollisionType type, F32 mag)
                : mVictim(victim), mPerp(perp), mTime(time), mType(type), mMag(mag)
-        { mFirstName[0] = 0; mLastName[0] =  0; }
+        {
+        }
        
        LLMeanCollisionData(LLMeanCollisionData *mcd)
-                : mVictim(mcd->mVictim), mPerp(mcd->mPerp), mTime(mcd->mTime), mType(mcd->mType), mMag(mcd->mMag)
+                : mVictim(mcd->mVictim), mPerp(mcd->mPerp), mTime(mcd->mTime), mType(mcd->mType), mMag(mcd->mMag),
-        { 
+                  mFirstName(mcd->mFirstName), mLastName(mcd->mLastName)
-                strncpy(mFirstName, mcd->mFirstName, sizeof(mFirstName) -1); /* Flawfinder: Ignore */
+        {
-                mFirstName[sizeof(mFirstName) -1] = '\0'; 
-                strncpy(mLastName, mcd->mLastName, sizeof(mLastName) -1); /* Flawfinder: Ignore */
-                mLastName[sizeof(mLastName) -1] = '\0';
        }               
        
        friend std::ostream&     operator<<(std::ostream& s, const LLMeanCollisionData &a)
@@ -96,8 +94,8 @@ public:
        time_t mTime;
        EMeanCollisionType mType;
        F32        mMag;
-        char   mFirstName[DB_FIRST_NAME_BUF_SIZE];              /* Flawfinder: Ignore */
+        std::string mFirstName;
-        char   mLastName[DB_LAST_NAME_BUF_SIZE];                /* Flawfinder: Ignore */
+        std::string mLastName;
 };
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index f3aac29..27f9d12 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -46,9 +46,9 @@
 #include <sstream>
 #include "llapr.h"
-#include "apr-1/apr_portable.h"
+#include "apr_portable.h"
-#include "apr-1/apr_network_io.h"
+#include "apr_network_io.h"
-#include "apr-1/apr_poll.h"
+#include "apr_poll.h"
 // linden library headers
 #include "indra_constants.h"
@@ -286,10 +286,11 @@ void LLMessageSystem::init()
 }
 // Read file and build message templates
-LLMessageSystem::LLMessageSystem(const char *filename, U32 port, 
+LLMessageSystem::LLMessageSystem(const std::string& filename, U32 port, 
                                                                 S32 version_major,
                                                                 S32 version_minor,
-                                                                 S32 version_patch)
+                                                                 S32 version_patch,
+                                                                 bool failure_is_fatal)
 {
        init();
@@ -306,7 +307,7 @@ LLMessageSystem::LLMessageSystem(const char *filename, U32 port,
        mCircuitPrintFreq = 60.f;               // seconds
-        loadTemplateFile(filename);
+        loadTemplateFile(filename, failure_is_fatal);
        mTemplateMessageBuilder = new LLTemplateMessageBuilder(mMessageTemplates);
        mLLSDMessageBuilder = new LLSDMessageBuilder();
@@ -365,9 +366,9 @@ LLMessageSystem::LLMessageSystem(const char *filename, U32 port,
 // Read file and build message templates
-void LLMessageSystem::loadTemplateFile(const char* filename)
+void LLMessageSystem::loadTemplateFile(const std::string& filename, bool failure_is_fatal)
 {
-        if(!filename)
+        if(filename.empty())
        {
                LL_ERRS("Messaging") << "No template filename specified" << llendl;
                mbError = TRUE;
@@ -377,7 +378,11 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
        std::string template_body;
        if(!_read_file_into_string(template_body, filename))
        {
-                LL_WARNS("Messaging") << "Failed to open template: " << filename << llendl;
+                if (failure_is_fatal) {
+                        LL_ERRS("Messaging") << "Failed to open template: " << filename << llendl;
+                } else {
+                        LL_WARNS("Messaging") << "Failed to open template: " << filename << llendl;
+                }
                mbError = TRUE;
                return;
        }
@@ -686,9 +691,9 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
                                        {
                                                std::ostringstream str;
                                                str << "MSG: <- " << host;
-                                                char buffer[MAX_STRING]; /* Flawfinder: ignore*/
+                                                std::string tbuf;
-                                                snprintf(buffer, MAX_STRING, "\t%6d\t%6d\t%6d ", receive_size, (mIncomingCompressedSize ? mIncomingCompressedSize : receive_size), mCurrentRecvPacketID);       /* Flawfinder: ignore */
+                                                tbuf = llformat( "\t%6d\t%6d\t%6d ", receive_size, (mIncomingCompressedSize ? mIncomingCompressedSize : receive_size), mCurrentRecvPacketID);
-                                                str << buffer << "(unknown)"
+                                                str << tbuf << "(unknown)"
                                                        << (recv_reliable ? " reliable" : "")
                                                        << " resent "
                                                        << ((acks > 0) ? "acks" : "")
@@ -816,10 +821,9 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
                                                                        LLMsgBlkData *msg_block_data = mCurrentRMessageData->mMemberBlocks[bnamep];
-                                                                        char errmsg[1024];
                                                                        if (!msg_block_data)
                                                                        {
-                                                                                sprintf(errmsg, "Block %s #%d not in message %s", block_name, blocknum, mCurrentRMessageData->mName);
+                                                                                std::string errmsg = llformat("Block %s #%d not in message %s", block_name, blocknum, mCurrentRMessageData->mName);
                                                                                LL_ERRS("Messaging") << errmsg << llendl;
                                                                        }
@@ -827,7 +831,7 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
                                                                        if (!vardata.getName())
                                                                        {
-                                                                                sprintf(errmsg, "Variable %s not in message %s block %s", vnamep, mCurrentRMessageData->mName, bnamep);
+                                                                                std::string errmsg = llformat("Variable %s not in message %s block %s", vnamep, mCurrentRMessageData->mName, bnamep);
                                                                                LL_ERRS("Messaging") << errmsg << llendl;
                                                                        }
@@ -1378,8 +1382,8 @@ S32 LLMessageSystem::sendMessage(const LLHost &host)
        {
                std::ostringstream str;
                str << "MSG: -> " << host;
-                char buffer[MAX_STRING];                        /* Flawfinder: ignore */
+                std::string buffer;
-                snprintf(buffer, MAX_STRING, "\t%6d\t%6d\t%6d ", mSendSize, buffer_length, cdp->getPacketOutID());              /* Flawfinder: ignore */
+                buffer = llformat( "\t%6d\t%6d\t%6d ", mSendSize, buffer_length, cdp->getPacketOutID());
                str << buffer
                        << mMessageBuilder->getMessageName()
                        << (mSendReliable ? " reliable " : "");
@@ -1407,8 +1411,8 @@ void LLMessageSystem::logMsgFromInvalidCircuit( const LLHost& host, BOOL recv_re
        {
                std::ostringstream str;
                str << "MSG: <- " << host;
-                char buffer[MAX_STRING];                        /* Flawfinder: ignore */
+                std::string buffer;
-                snprintf(buffer, MAX_STRING, "\t%6d\t%6d\t%6d ", mMessageReader->getMessageSize(), (mIncomingCompressedSize ? mIncomingCompressedSize: mMessageReader->getMessageSize()), mCurrentRecvPacketID);                /* Flawfinder: ignore */
+                buffer = llformat( "\t%6d\t%6d\t%6d ", mMessageReader->getMessageSize(), (mIncomingCompressedSize ? mIncomingCompressedSize: mMessageReader->getMessageSize()), mCurrentRecvPacketID);
                str << buffer
                        << nullToEmpty(mMessageReader->getMessageName())
                        << (recv_reliable ? " reliable" : "")
@@ -1512,8 +1516,8 @@ void LLMessageSystem::logValidMsg(LLCircuitData *cdp, const LLHost& host, BOOL r
        {
                std::ostringstream str;
                str << "MSG: <- " << host;
-                char buffer[MAX_STRING];                        /* Flawfinder: ignore */
+                std::string buffer;
-                snprintf(buffer, MAX_STRING, "\t%6d\t%6d\t%6d ", mMessageReader->getMessageSize(), (mIncomingCompressedSize ? mIncomingCompressedSize : mMessageReader->getMessageSize()), mCurrentRecvPacketID);               /* Flawfinder: ignore */
+                buffer = llformat( "\t%6d\t%6d\t%6d ", mMessageReader->getMessageSize(), (mIncomingCompressedSize ? mIncomingCompressedSize : mMessageReader->getMessageSize()), mCurrentRecvPacketID);
                str << buffer
                        << nullToEmpty(mMessageReader->getMessageName())
                        << (recv_reliable ? " reliable" : "")
@@ -2086,20 +2090,18 @@ void LLMessageSystem::processUseCircuitCode(LLMessageSystem* msg,
 // static
 void LLMessageSystem::processError(LLMessageSystem* msg, void**)
 {
-        char buffer[MTUBYTES];
        S32 error_code = 0;
        msg->getS32("Data", "Code", error_code);
        std::string error_token;
-        msg->getString("Data", "Token", MTUBYTES, buffer);
+        msg->getString("Data", "Token", error_token);
-        error_token.assign(buffer);
        LLUUID error_id;
        msg->getUUID("Data", "ID", error_id);
        std::string error_system;
-        msg->getString("Data", "System", MTUBYTES, buffer);
+        msg->getString("Data", "System", error_system);
-        error_system.assign(buffer);
        std::string error_message;
-        msg->getString("Data", "Message", MTUBYTES, buffer);
+        msg->getString("Data", "Message", error_message);
-        error_message.assign(buffer);
        LL_WARNS("Messaging") << "Message error from " << msg->getSender() << " - "
                << error_code << " " << error_token << " " << error_id << " \""
@@ -2415,7 +2417,8 @@ void process_deny_trusted_circuit(LLMessageSystem *msg, void **)
 void dump_prehash_files()
 {
        U32 i;
-        LLFILE* fp = LLFile::fopen("../../indra/llmessage/message_prehash.h", "w");     /* Flawfinder: ignore */
+        std::string filename("../../indra/llmessage/message_prehash.h");
+        LLFILE* fp = LLFile::fopen(filename, "w");      /* Flawfinder: ignore */
        if (fp)
        {
                fprintf(
@@ -2445,7 +2448,8 @@ void dump_prehash_files()
                fprintf(fp, "\n\n#endif\n");
                fclose(fp);
        }
-        fp = LLFile::fopen("../../indra/llmessage/message_prehash.cpp", "w");   /* Flawfinder: ignore */
+        filename = std::string("../../indra/llmessage/message_prehash.cpp");
+        fp = LLFile::fopen(filename, "w");      /* Flawfinder: ignore */
        if (fp)
        {
                fprintf(
@@ -2475,22 +2479,24 @@ void dump_prehash_files()
        }
 }
-BOOL start_messaging_system(
+bool start_messaging_system(
        const std::string& template_name,
        U32 port,
        S32 version_major,
        S32 version_minor,
        S32 version_patch,
-        BOOL b_dump_prehash_file,
+        bool b_dump_prehash_file,
        const std::string& secret,
-        const LLUseCircuitCodeResponder* responder)
+        const LLUseCircuitCodeResponder* responder,
+        bool failure_is_fatal)
 {
        gMessageSystem = new LLMessageSystem(
-                template_name.c_str(),
+                template_name,
                port, 
                version_major, 
                version_minor, 
-                version_patch);
+                version_patch,
+                failure_is_fatal);
        g_shared_secret.assign(secret);
        if (!gMessageSystem)
@@ -2579,79 +2585,79 @@ void LLMessageSystem::stopLogging()
 void LLMessageSystem::summarizeLogs(std::ostream& str)
 {
-        char buffer[MAX_STRING];        /* Flawfinder: ignore */ 
+        std::string buffer;
-        char tmp_str[MAX_STRING];        /* Flawfinder: ignore */ 
+        std::string tmp_str;
        F32 run_time = mMessageSystemTimer.getElapsedTimeF32();
        str << "START MESSAGE LOG SUMMARY" << std::endl;
-        snprintf(buffer, MAX_STRING, "Run time: %12.3f seconds", run_time);     /* Flawfinder: ignore */
+        buffer = llformat( "Run time: %12.3f seconds", run_time);
        // Incoming
        str << buffer << std::endl << "Incoming:" << std::endl;
-        U64_to_str(mTotalBytesIn, tmp_str, sizeof(tmp_str));
+        tmp_str = U64_to_str(mTotalBytesIn);
-        snprintf(buffer, MAX_STRING, "Total bytes received:      %20s (%5.2f kbits per second)", tmp_str, ((F32)mTotalBytesIn * 0.008f) / run_time);    /* Flawfinder: ignore */
+        buffer = llformat( "Total bytes received:      %20s (%5.2f kbits per second)", tmp_str.c_str(), ((F32)mTotalBytesIn * 0.008f) / run_time);
        str << buffer << std::endl;
-        U64_to_str(mPacketsIn, tmp_str, sizeof(tmp_str));
+        tmp_str = U64_to_str(mPacketsIn);
-        snprintf(buffer, MAX_STRING, "Total packets received:    %20s (%5.2f packets per second)", tmp_str, ((F32) mPacketsIn / run_time));     /* Flawfinder: ignore */
+        buffer = llformat( "Total packets received:    %20s (%5.2f packets per second)", tmp_str.c_str(), ((F32) mPacketsIn / run_time));
        str << buffer << std::endl;
-        snprintf(buffer, MAX_STRING, "Average packet size:       %20.0f bytes", (F32)mTotalBytesIn / (F32)mPacketsIn);  /* Flawfinder: ignore */
+        buffer = llformat( "Average packet size:       %20.0f bytes", (F32)mTotalBytesIn / (F32)mPacketsIn);
        str << buffer << std::endl;
-        U64_to_str(mReliablePacketsIn, tmp_str, sizeof(tmp_str));
+        tmp_str = U64_to_str(mReliablePacketsIn);
-        snprintf(buffer, MAX_STRING, "Total reliable packets:    %20s (%5.2f%%)", tmp_str, 100.f * ((F32) mReliablePacketsIn)/((F32) mPacketsIn + 1));          /* Flawfinder: ignore */
+        buffer = llformat( "Total reliable packets:    %20s (%5.2f%%)", tmp_str.c_str(), 100.f * ((F32) mReliablePacketsIn)/((F32) mPacketsIn + 1));
        str << buffer << std::endl;
-        U64_to_str(mCompressedPacketsIn, tmp_str, sizeof(tmp_str));
+        tmp_str = U64_to_str(mCompressedPacketsIn);
-        snprintf(buffer, MAX_STRING, "Total compressed packets:  %20s (%5.2f%%)", tmp_str, 100.f * ((F32) mCompressedPacketsIn)/((F32) mPacketsIn + 1));        /* Flawfinder: ignore */
+        buffer = llformat( "Total compressed packets:  %20s (%5.2f%%)", tmp_str.c_str(), 100.f * ((F32) mCompressedPacketsIn)/((F32) mPacketsIn + 1));
        str << buffer << std::endl;
        S64 savings = mUncompressedBytesIn - mCompressedBytesIn;
-        U64_to_str(savings, tmp_str, sizeof(tmp_str));
+        tmp_str = U64_to_str(savings);
-        snprintf(buffer, MAX_STRING, "Total compression savings: %20s bytes", tmp_str); /* Flawfinder: ignore */
+        buffer = llformat( "Total compression savings: %20s bytes", tmp_str.c_str());
        str << buffer << std::endl;
-        U64_to_str(savings/(mCompressedPacketsIn +1), tmp_str, sizeof(tmp_str));
+        tmp_str = U64_to_str(savings/(mCompressedPacketsIn +1));
-        snprintf(buffer, MAX_STRING, "Avg comp packet savings:   %20s (%5.2f : 1)", tmp_str, ((F32) mUncompressedBytesIn)/((F32) mCompressedBytesIn+1));        /* Flawfinder: ignore */
+        buffer = llformat( "Avg comp packet savings:   %20s (%5.2f : 1)", tmp_str.c_str(), ((F32) mUncompressedBytesIn)/((F32) mCompressedBytesIn+1));
        str << buffer << std::endl;
-        U64_to_str(savings/(mPacketsIn+1), tmp_str, sizeof(tmp_str));
+        tmp_str = U64_to_str(savings/(mPacketsIn+1));
-        snprintf(buffer, MAX_STRING, "Avg overall comp savings:  %20s (%5.2f : 1)", tmp_str, ((F32) mTotalBytesIn + (F32) savings)/((F32) mTotalBytesIn + 1.f));        /* Flawfinder: ignore */
+        buffer = llformat( "Avg overall comp savings:  %20s (%5.2f : 1)", tmp_str.c_str(), ((F32) mTotalBytesIn + (F32) savings)/((F32) mTotalBytesIn + 1.f));
        // Outgoing
        str << buffer << std::endl << std::endl << "Outgoing:" << std::endl;
-        U64_to_str(mTotalBytesOut, tmp_str, sizeof(tmp_str));
+        tmp_str = U64_to_str(mTotalBytesOut);
-        snprintf(buffer, MAX_STRING, "Total bytes sent:          %20s (%5.2f kbits per second)", tmp_str, ((F32)mTotalBytesOut * 0.008f) / run_time );  /* Flawfinder: ignore */
+        buffer = llformat( "Total bytes sent:          %20s (%5.2f kbits per second)", tmp_str.c_str(), ((F32)mTotalBytesOut * 0.008f) / run_time );
        str << buffer << std::endl;
-        U64_to_str(mPacketsOut, tmp_str, sizeof(tmp_str));
+        tmp_str = U64_to_str(mPacketsOut);
-        snprintf(buffer, MAX_STRING, "Total packets sent:        %20s (%5.2f packets per second)", tmp_str, ((F32)mPacketsOut / run_time));     /* Flawfinder: ignore */
+        buffer = llformat( "Total packets sent:        %20s (%5.2f packets per second)", tmp_str.c_str(), ((F32)mPacketsOut / run_time));
        str << buffer << std::endl;
-        snprintf(buffer, MAX_STRING, "Average packet size:       %20.0f bytes", (F32)mTotalBytesOut / (F32)mPacketsOut);        /* Flawfinder: ignore */
+        buffer = llformat( "Average packet size:       %20.0f bytes", (F32)mTotalBytesOut / (F32)mPacketsOut);
        str << buffer << std::endl;
-        U64_to_str(mReliablePacketsOut, tmp_str, sizeof(tmp_str));
+        tmp_str = U64_to_str(mReliablePacketsOut);
-        snprintf(buffer, MAX_STRING, "Total reliable packets:    %20s (%5.2f%%)", tmp_str, 100.f * ((F32) mReliablePacketsOut)/((F32) mPacketsOut + 1));                /* Flawfinder: ignore */
+        buffer = llformat( "Total reliable packets:    %20s (%5.2f%%)", tmp_str.c_str(), 100.f * ((F32) mReliablePacketsOut)/((F32) mPacketsOut + 1));
        str << buffer << std::endl;
-        U64_to_str(mCompressedPacketsOut, tmp_str, sizeof(tmp_str));
+        tmp_str = U64_to_str(mCompressedPacketsOut);
-        snprintf(buffer, MAX_STRING, "Total compressed packets:  %20s (%5.2f%%)", tmp_str, 100.f * ((F32) mCompressedPacketsOut)/((F32) mPacketsOut + 1));              /* Flawfinder: ignore */
+        buffer = llformat( "Total compressed packets:  %20s (%5.2f%%)", tmp_str.c_str(), 100.f * ((F32) mCompressedPacketsOut)/((F32) mPacketsOut + 1));
        str << buffer << std::endl;
        savings = mUncompressedBytesOut - mCompressedBytesOut;
-        U64_to_str(savings, tmp_str, sizeof(tmp_str));
+        tmp_str = U64_to_str(savings);
-        snprintf(buffer, MAX_STRING, "Total compression savings: %20s bytes", tmp_str); /* Flawfinder: ignore */
+        buffer = llformat( "Total compression savings: %20s bytes", tmp_str.c_str());
        str << buffer << std::endl;
-        U64_to_str(savings/(mCompressedPacketsOut +1), tmp_str, sizeof(tmp_str));
+        tmp_str = U64_to_str(savings/(mCompressedPacketsOut +1));
-        snprintf(buffer, MAX_STRING, "Avg comp packet savings:   %20s (%5.2f : 1)", tmp_str, ((F32) mUncompressedBytesOut)/((F32) mCompressedBytesOut+1));              /* Flawfinder: ignore */
+        buffer = llformat( "Avg comp packet savings:   %20s (%5.2f : 1)", tmp_str.c_str(), ((F32) mUncompressedBytesOut)/((F32) mCompressedBytesOut+1));
        str << buffer << std::endl;
-        U64_to_str(savings/(mPacketsOut+1), tmp_str, sizeof(tmp_str));
+        tmp_str = U64_to_str(savings/(mPacketsOut+1));
-        snprintf(buffer, MAX_STRING, "Avg overall comp savings:  %20s (%5.2f : 1)", tmp_str, ((F32) mTotalBytesOut + (F32) savings)/((F32) mTotalBytesOut + 1.f));              /* Flawfinder: ignore */
+        buffer = llformat( "Avg overall comp savings:  %20s (%5.2f : 1)", tmp_str.c_str(), ((F32) mTotalBytesOut + (F32) savings)/((F32) mTotalBytesOut + 1.f));
        str << buffer << std::endl << std::endl;
-        snprintf(buffer, MAX_STRING, "SendPacket failures:       %20d", mSendPacketFailureCount);       /* Flawfinder: ignore */
+        buffer = llformat( "SendPacket failures:       %20d", mSendPacketFailureCount);
        str << buffer << std::endl;
-        snprintf(buffer, MAX_STRING, "Dropped packets:           %20d", mDroppedPackets);       /* Flawfinder: ignore */
+        buffer = llformat( "Dropped packets:           %20d", mDroppedPackets);
        str << buffer << std::endl;
-        snprintf(buffer, MAX_STRING, "Resent packets:            %20d", mResentPackets);        /* Flawfinder: ignore */
+        buffer = llformat( "Resent packets:            %20d", mResentPackets);
        str << buffer << std::endl;
-        snprintf(buffer, MAX_STRING, "Failed reliable resends:   %20d", mFailedResendPackets);  /* Flawfinder: ignore */
+        buffer = llformat( "Failed reliable resends:   %20d", mFailedResendPackets);
        str << buffer << std::endl;
-        snprintf(buffer, MAX_STRING, "Off-circuit rejected packets: %17d", mOffCircuitPackets); /* Flawfinder: ignore */
+        buffer = llformat( "Off-circuit rejected packets: %17d", mOffCircuitPackets);
        str << buffer << std::endl;
-        snprintf(buffer, MAX_STRING, "On-circuit invalid packets:   %17d", mInvalidOnCircuitPackets);           /* Flawfinder: ignore */
+        buffer = llformat( "On-circuit invalid packets:   %17d", mInvalidOnCircuitPackets);
        str << buffer << std::endl << std::endl;
        str << "Decoding: " << std::endl;
-        snprintf(buffer, MAX_STRING, "%35s%10s%10s%10s%10s", "Message", "Count", "Time", "Max", "Avg"); /* Flawfinder: ignore */
+        buffer = llformat( "%35s%10s%10s%10s%10s", "Message", "Count", "Time", "Max", "Avg");
        str << buffer << std:: endl;    
        F32 avg;
        for (message_template_name_map_t::const_iterator iter = mMessageTemplates.begin(),
@@ -2662,7 +2668,7 @@ void LLMessageSystem::summarizeLogs(std::ostream& str)
                if(mt->mTotalDecoded > 0)
                {
                        avg = mt->mTotalDecodeTime / (F32)mt->mTotalDecoded;
-                        snprintf(buffer, MAX_STRING, "%35s%10u%10f%10f%10f", mt->mName, mt->mTotalDecoded, mt->mTotalDecodeTime, mt->mMaxDecodeTimePerMsg, avg);        /* Flawfinder: ignore */
+                        buffer = llformat( "%35s%10u%10f%10f%10f", mt->mName, mt->mTotalDecoded, mt->mTotalDecodeTime, mt->mMaxDecodeTimePerMsg, avg);
                        str << buffer << std::endl;
                }
        }
@@ -3928,6 +3934,20 @@ void LLMessageSystem::getString(const char *block, const char *var,
                                  blocknum);
 }
+void LLMessageSystem::getStringFast(const char *block, const char *var, 
+                                                                        std::string& outstr, S32 blocknum)
+{
+        mMessageReader->getString(block, var, outstr, blocknum);
+}
+void LLMessageSystem::getString(const char *block, const char *var, 
+                                                                std::string& outstr, S32 blocknum )
+{
+        getStringFast(LLMessageStringTable::getInstance()->getString(block), 
+                                  LLMessageStringTable::getInstance()->getString(var), outstr, 
+                                  blocknum);
+}
 S32     LLMessageSystem::getNumberOfBlocksFast(const char *blockname)
 {
        return mMessageReader->getNumberOfBlocks(blockname);
diff --git a/linden/indra/llmessage/message.h b/linden/indra/llmessage/message.h
index 00abff4..8807521 100644
--- a/linden/indra/llmessage/message.h
+++ b/linden/indra/llmessage/message.h
@@ -283,8 +283,9 @@ public:
 public:
        // Read file and build message templates
-        LLMessageSystem(const char *filename, U32 port, S32 version_major,
+        LLMessageSystem(const std::string& filename, U32 port, S32 version_major,
-                S32 version_minor, S32 version_patch);
+                                        S32 version_minor, S32 version_patch,
+                                        bool failure_is_fatal = true);
        ~LLMessageSystem();
@@ -294,7 +295,7 @@ public:
        // Read file and build message templates filename must point to a
        // valid string which specifies the path of a valid linden
        // template.
-        void loadTemplateFile(const char* filename);
+        void loadTemplateFile(const std::string& filename, bool failure_is_fatal);
        // methods for building, sending, receiving, and handling messages
@@ -515,6 +516,8 @@ public:
        void    getIPPort(      const char *block, const char *var, U16 &port, S32 blocknum = 0);
        void getStringFast(     const char *block, const char *var, S32 buffer_size, char *buffer, S32 blocknum = 0);
        void    getString(      const char *block, const char *var, S32 buffer_size, char *buffer, S32 blocknum = 0);
+        void getStringFast(     const char *block, const char *var, std::string& outstr, S32 blocknum = 0);
+        void    getString(      const char *block, const char *var, std::string& outstr, S32 blocknum = 0);
        // Utility functions to generate a replay-resistant digest check
@@ -764,16 +767,17 @@ extern LLMessageSystem	*gMessageSystem;
 // Must specific overall system version, which is used to determine
 // if a patch is available in the message template checksum verification.
-// Return TRUE if able to initialize system.
+// Return true if able to initialize system.
-BOOL start_messaging_system(
+bool start_messaging_system(
        const std::string& template_name,
        U32 port, 
        S32 version_major,
        S32 version_minor,
        S32 version_patch,
-        BOOL b_dump_prehash_file,
+        bool b_dump_prehash_file,
        const std::string& secret,
-        const LLUseCircuitCodeResponder* responder = NULL);
+        const LLUseCircuitCodeResponder* responder = NULL,
+        bool failure_is_fatal = true);
 void end_messaging_system();
diff --git a/linden/indra/llmessage/message_prehash.cpp b/linden/indra/llmessage/message_prehash.cpp
index 745271f..2ac1319 100644
--- a/linden/indra/llmessage/message_prehash.cpp
+++ b/linden/indra/llmessage/message_prehash.cpp
@@ -1371,4 +1371,7 @@ char* _PREHASH_OwnerMask = LLMessageStringTable::getInstance()->getString("Owner
 char* _PREHASH_TransferInventoryAck = LLMessageStringTable::getInstance()->getString("TransferInventoryAck");
 char* _PREHASH_RegionDenyAgeUnverified = LLMessageStringTable::getInstance()->getString("RegionDenyAgeUnverified");
 char* _PREHASH_AgeVerificationBlock = LLMessageStringTable::getInstance()->getString("AgeVerificationBlock");
+char* _PREHASH_UCoord = LLMessageStringTable::getInstance()->getString("UCoord");
+char* _PREHASH_VCoord = LLMessageStringTable::getInstance()->getString("VCoord");
+char* _PREHASH_FaceIndex = LLMessageStringTable::getInstance()->getString("FaceIndex");
diff --git a/linden/indra/llmessage/message_prehash.h b/linden/indra/llmessage/message_prehash.h
index e65d539..0ee02be 100644
--- a/linden/indra/llmessage/message_prehash.h
+++ b/linden/indra/llmessage/message_prehash.h
@@ -1371,6 +1371,8 @@ extern char * _PREHASH_OwnerMask;
 extern char * _PREHASH_TransferInventoryAck;
 extern char * _PREHASH_RegionDenyAgeUnverified;
 extern char * _PREHASH_AgeVerificationBlock;
+extern char * _PREHASH_UCoord;
+extern char * _PREHASH_VCoord;
+extern char * _PREHASH_FaceIndex;
 #endif