Second Life viewer sources 1.23.0-RC

author: Jacek Antonelli 2009-04-30 13:04:20 -0500
committer: Jacek Antonelli 2009-04-30 13:07:16 -0500
commit: ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch)
tree: 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/llmessage
parent: Second Life viewer sources 1.22.11 (diff)
download: meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2
meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz
170 files changed, 2139 insertions, 844 deletions
diff --git a/linden/indra/llmessage/CMakeLists.txt b/linden/indra/llmessage/CMakeLists.txt
index fd22de9..0f3e159 100644
--- a/linden/indra/llmessage/CMakeLists.txt
+++ b/linden/indra/llmessage/CMakeLists.txt
@@ -7,6 +7,8 @@ include(LLCommon)
 include(LLMath)
 include(LLMessage)
 include(LLVFS)
+include(LLAddBuildTest)
+include(Tut)
 include_directories (${CMAKE_CURRENT_SOURCE_DIR})
@@ -34,6 +36,7 @@ set(llmessage_SOURCE_FILES
    llhost.cpp
    llhttpassetstorage.cpp
    llhttpclient.cpp
+    llhttpclientadapter.cpp
    llhttpnode.cpp
    llhttpsender.cpp
    llinstantmessage.cpp
@@ -57,6 +60,7 @@ set(llmessage_SOURCE_FILES
    llpacketring.cpp
    llpartdata.cpp
    llpumpio.cpp
+    llregionpresenceverifier.cpp
    llsdappservices.cpp
    llsdhttpserver.cpp
    llsdmessagebuilder.cpp
@@ -65,7 +69,9 @@ set(llmessage_SOURCE_FILES
    llsdrpcserver.cpp
    llservicebuilder.cpp
    llservice.cpp
+    llstoredmessage.cpp
    lltemplatemessagebuilder.cpp
+    lltemplatemessagedispatcher.cpp
    lltemplatemessagereader.cpp
    llthrottle.cpp
    lltransfermanager.cpp
@@ -73,6 +79,7 @@ set(llmessage_SOURCE_FILES
    lltransfersourcefile.cpp
    lltransfertargetfile.cpp
    lltransfertargetvfile.cpp
+    lltrustedmessageservice.cpp
    llurlrequest.cpp
    lluseroperation.cpp
    llxfer.cpp
@@ -85,7 +92,6 @@ set(llmessage_SOURCE_FILES
    message_prehash.cpp
    message_string_table.cpp
    net.cpp
-    network.cpp
    partsyspacket.cpp
    patch_code.cpp
    patch_dct.cpp
@@ -115,7 +121,10 @@ set(llmessage_HEADER_FILES
    llhost.h
    llhttpassetstorage.h
    llhttpclient.h
+    llhttpclientinterface.h
+    llhttpclientadapter.h
    llhttpnode.h
+    llhttpnodeadapter.h
    llhttpsender.h
    llinstantmessage.h
    llinvite.h
@@ -144,6 +153,7 @@ set(llmessage_HEADER_FILES
    llqueryflags.h
    llregionflags.h
    llregionhandle.h
+    llregionpresenceverifier.h
    llsdappservices.h
    llsdhttpserver.h
    llsdmessagebuilder.h
@@ -152,9 +162,11 @@ set(llmessage_HEADER_FILES
    llsdrpcserver.h
    llservice.h
    llservicebuilder.h
+    llstoredmessage.h
    lltaskname.h
    llteleportflags.h
    lltemplatemessagebuilder.h
+    lltemplatemessagedispatcher.h
    lltemplatemessagereader.h
    llthrottle.h
    lltransfermanager.h
@@ -162,6 +174,7 @@ set(llmessage_HEADER_FILES
    lltransfersourcefile.h
    lltransfertargetfile.h
    lltransfertargetvfile.h
+    lltrustedmessageservice.h
    llurlrequest.h
    lluseroperation.h
    llvehicleparams.h
@@ -176,7 +189,6 @@ set(llmessage_HEADER_FILES
    message.h
    message_prehash.h
    net.h
-    network.h
    partsyspacket.h
    patch_code.h
    patch_dct.h
@@ -197,3 +209,13 @@ target_link_libraries(
    ${CRYPTO_LIBRARIES}
    ${XMLRPCEPI_LIBRARIES}
    )
+IF (NOT LINUX AND VIEWER)
+    # When building the viewer the tests links against the shared objects. 
+    # These can not be found when we try to run the tests, so we had to disable them, for the viewer build.
+    # TODO: Can someone with viewer knowledge figure out how to make these find the correct so.
+    #ADD_BUILD_TEST(llhttpclientadapter llmessage)
+    ADD_BUILD_TEST(lltrustedmessageservice llmessage)
+    ADD_BUILD_TEST(lltemplatemessagedispatcher llmessage)
+ENDIF (NOT LINUX AND VIEWER)
diff --git a/linden/indra/llmessage/llares.cpp b/linden/indra/llmessage/llares.cpp
index 578304a..fe37fe8 100644
--- a/linden/indra/llmessage/llares.cpp
+++ b/linden/indra/llmessage/llares.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
@@ -469,9 +470,7 @@ bool LLAres::process(U64 timeout)
        int socks[ARES_GETSOCK_MAXNUM];
        apr_pollfd_t aprFds[ARES_GETSOCK_MAXNUM];
-        apr_int32_t nsds = 0;
+        apr_int32_t nsds = 0;   
-        apr_status_t status;
-        apr_pool_t *pool;
        int nactive = 0;
        int bitmask;
@@ -479,10 +478,12 @@ bool LLAres::process(U64 timeout)
        if (bitmask == 0)
        {
-                goto bail;
+                return nsds > 0;
        }
-        status = apr_pool_create(&pool, gAPRPoolp);
+        apr_status_t status;
+        LLAPRPool pool;
+        status = pool.getStatus() ;
        ll_apr_assert_status(status);
        for (int i = 0; i < ARES_GETSOCK_MAXNUM; i++)
@@ -500,16 +501,16 @@ bool LLAres::process(U64 timeout)
                apr_socket_t *aprSock = NULL;
-                status = apr_os_sock_put(&aprSock, (apr_os_sock_t *) &socks[i], pool);
+                status = apr_os_sock_put(&aprSock, (apr_os_sock_t *) &socks[i], pool.getAPRPool());
                if (status != APR_SUCCESS)
                {
                        ll_apr_warn_status(status);
-                        goto bail_pool;
+                        return nsds > 0;
                }
                aprFds[nactive].desc.s = aprSock;
                aprFds[nactive].desc_type = APR_POLL_SOCKET;
-                aprFds[nactive].p = pool;
+                aprFds[nactive].p = pool.getAPRPool();
                aprFds[nactive].rtnevents = 0;
                aprFds[nactive].client_data = &socks[i];
@@ -537,10 +538,6 @@ bool LLAres::process(U64 timeout)
                }
        }
-bail_pool:
-        apr_pool_destroy(pool);
-bail:
        return nsds > 0;
 }
diff --git a/linden/indra/llmessage/llares.h b/linden/indra/llmessage/llares.h
index 96eed79..96d7f6d 100644
--- a/linden/indra/llmessage/llares.h
+++ b/linden/indra/llmessage/llares.h
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp
index a89a786..2966b60 100644
--- a/linden/indra/llmessage/llassetstorage.cpp
+++ b/linden/indra/llmessage/llassetstorage.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -539,8 +540,19 @@ void LLAssetStorage::downloadCompleteCallback(
                return;
        }
-        req->setUUID(file_id);
+        // Inefficient since we're doing a find through a list that may have thousands of elements.
-        req->setType(file_type);
+        // This is due for refactoring; we will probably change mPendingDownloads into a set.
+        request_list_t::iterator download_iter = std::find(gAssetStorage->mPendingDownloads.begin(), 
+                                                                                                           gAssetStorage->mPendingDownloads.end(),
+                                                                                                           req);
+        // If the LLAssetRequest doesn't exist in the downloads queue, then it either has already been deleted
+        // by _cleanupRequests, or it's a transfer.
+        if (download_iter != gAssetStorage->mPendingDownloads.end())
+        {
+                req->setUUID(file_id);
+                req->setType(file_type);
+        }
        if (LL_ERR_NOERR == result)
        {
                // we might have gotten a zero-size file
@@ -563,7 +575,7 @@ void LLAssetStorage::downloadCompleteCallback(
        {
                request_list_t::iterator curiter = iter++;
                LLAssetRequest* tmp = *curiter;
-                if ((tmp->getUUID() == req->getUUID()) && (tmp->getType()== req->getType()))
+                if ((tmp->getUUID() == file_id) && (tmp->getType()== file_type))
                {
                        requests.push_front(tmp);
                        iter = gAssetStorage->mPendingDownloads.erase(curiter);
@@ -1198,6 +1210,9 @@ const char* LLAssetStorage::getErrorString(S32 status)
        case LL_ERR_CIRCUIT_GONE:
                return "Circuit gone";
+        case LL_ERR_PRICE_MISMATCH:
+                return "Viewer and server do not agree on price";
        default:
                return "Unknown status";
        }
diff --git a/linden/indra/llmessage/llassetstorage.h b/linden/indra/llmessage/llassetstorage.h
index eefa9a1..f01ee6a 100644
--- a/linden/indra/llmessage/llassetstorage.h
+++ b/linden/indra/llmessage/llassetstorage.h
@@ -18,7 +18,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llblowfishcipher.cpp b/linden/indra/llmessage/llblowfishcipher.cpp
index 908fb49..f24d103 100644
--- a/linden/indra/llmessage/llblowfishcipher.cpp
+++ b/linden/indra/llmessage/llblowfishcipher.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llblowfishcipher.h b/linden/indra/llmessage/llblowfishcipher.h
index 2d51a49..f8b5e1f 100644
--- a/linden/indra/llmessage/llblowfishcipher.h
+++ b/linden/indra/llmessage/llblowfishcipher.h
@@ -20,7 +20,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llbuffer.cpp b/linden/indra/llmessage/llbuffer.cpp
index 4499b97..1ffcecd 100644
--- a/linden/indra/llmessage/llbuffer.cpp
+++ b/linden/indra/llmessage/llbuffer.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llbuffer.h b/linden/indra/llmessage/llbuffer.h
index 1c200b0..b031ee8 100644
--- a/linden/indra/llmessage/llbuffer.h
+++ b/linden/indra/llmessage/llbuffer.h
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llbufferstream.cpp b/linden/indra/llmessage/llbufferstream.cpp
index ea8d0bb..bdb0d68 100644
--- a/linden/indra/llmessage/llbufferstream.cpp
+++ b/linden/indra/llmessage/llbufferstream.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llbufferstream.h b/linden/indra/llmessage/llbufferstream.h
index fe9b2dc..de68884 100644
--- a/linden/indra/llmessage/llbufferstream.h
+++ b/linden/indra/llmessage/llbufferstream.h
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llcachename.cpp b/linden/indra/llmessage/llcachename.cpp
index 3acd881..1e6584a 100644
--- a/linden/indra/llmessage/llcachename.cpp
+++ b/linden/indra/llmessage/llcachename.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -41,8 +42,7 @@
 #include "llsdserialize.h"
 #include "lluuid.h"
 #include "message.h"
-#include "llservicebuilder.h"
-#include "llframetimer.h"
 // Constants
 static const std::string CN_WAITING("(Loading...)"); // *TODO: translate
 static const std::string CN_NOBODY("(nobody)"); // *TODO: translate
@@ -197,8 +197,6 @@ class LLCacheName::Impl
 public:
        LLMessageSystem*        mMsg;
        LLHost                          mUpstreamHost;
-        std::string mGroupNameURL;
-        std::string mAgentNameURL;
        Cache                           mCache;
                // the map of UUIDs to names
@@ -224,8 +222,6 @@ public:
        void processPendingReplies();
        void sendRequest(const char* msg_name, const AskQueue& queue);
        bool isRequestPending(const LLUUID& id);
-        void getAgentName(const AskQueue&);
-        void getGroupName(const AskQueue&);
        // Message system callbacks.
        void processUUIDRequest(LLMessageSystem* msg, bool isGroup);
@@ -239,35 +235,6 @@ public:
        void notifyObservers(const LLUUID& id, const std::string& first, const std::string& last, BOOL group);
 };
-class LLHTTPAgentNamesResponse : public LLHTTPClient::Responder
-{
-public:
-        LLHTTPAgentNamesResponse(const LLSD& agent_ids)
-                : mAgentIDs(agent_ids)
-        { }
-        void result(const LLSD& content);
-private:
-        LLHost mSender;
-        LLSD mAgentIDs;
-};
-class LLHTTPGroupNamesResponse : public LLHTTPClient::Responder
-{
-public:
-        LLHTTPGroupNamesResponse(const LLSD& group_ids)
-                : mGroupIDs(group_ids)
-        { };
-                                                
-        void result(const LLSD& content);
-private:
-        LLHost mSender;
-        LLSD mGroupIDs;
-};
 /// --------------------------------------------------------------------------
 /// class LLCacheName
@@ -353,57 +320,6 @@ void LLCacheName::cancelCallback(const LLUUID& id, LLCacheNameCallback callback,
        }
 }
-void LLCacheName::sendAgentNames(const LLUUID& id, std::string& first, std::string& last)
-{
-        LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache, id);
-        if (!entry)
-        {
-                entry = new LLCacheNameEntry;
-                impl.mCache[id] = entry;
-                
-        }
-        entry->mIsGroup = false;
-        entry->mCreateTime = (U32)LLFrameTimer::getTotalSeconds();
-    //entry->mFirstName = first;
-    //entry->mLastName = last;
-    //LLStringUtil::truncate(entry->mFirstName, DB_FIRST_NAME_BUF_SIZE);
-    //LLStringUtil::truncate(entry->mLastName, DB_LAST_NAME_BUF_SIZE);
-    entry->mFirstName = std::string(first, DB_FIRST_NAME_BUF_SIZE);
-    entry->mLastName = std::string(last, DB_LAST_NAME_BUF_SIZE);
-        impl.mPendingQueue.erase(id);
-        impl.notifyObservers(id,
-                                entry->mFirstName, entry->mLastName,
-                                FALSE);
-         
-}
-void LLCacheName::sendGroupNames(const LLUUID& id, std::string& name)
-{
-         
-        LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache, id);
-    if (!entry)
-        {
-                entry = new LLCacheNameEntry;
-                impl.mCache[id] = entry;
-                                                                     
-        }
-             
-        entry->mIsGroup = true;
-        entry->mCreateTime = (U32)time(NULL);
-        
-    entry->mGroupName = std::string(name, DB_GROUP_NAME_BUF_SIZE);
-        impl.mPendingQueue.erase(id);
-                     
-        impl.notifyObservers(id,
-                entry->mFirstName, entry->mLastName,
-                FALSE);
-                         
-        
-}
 void LLCacheName::importFile(LLFILE* fp)
 {
        S32 count = 0;
@@ -609,16 +525,6 @@ BOOL LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
        return res;
 }
-void LLCacheName::setGroupURL(const std::string& group_url)
-{
-        impl.mGroupNameURL = group_url; 
-}
-void LLCacheName::setAgentURL(const std::string& agent_url)
-{
-        impl.mAgentNameURL = agent_url;
-}
 BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
 {
        if(id.isNull())
@@ -653,111 +559,6 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
        }
 }
-void LLCacheName::Impl::getAgentName(const AskQueue &queue)
-{
-         
-        // get the names from backbone module
-        if(queue.empty())
-        {
-                 return;
-        }
-                
-        LLSD request;
-        request["action"] = "GET";
-        LLSD id_block = LLSD::emptyArray();
-        AskQueue::const_iterator it = queue.begin();
-        AskQueue::const_iterator end = queue.end();
-        for(;it!=end;++it)
-        {
-                id_block.append(*it);
-        }
-        lldebugs<<LLSDOStreamer<LLSDNotationFormatter>(id_block) <<llendl;
-                 
-        request["agents"] = id_block;
-        
-        LLHTTPClient::post(
-                        mAgentNameURL,
-                        request, 
-                        new LLHTTPAgentNamesResponse(id_block));
-                 
-                                                           
-        lldebugs<<"Service builder call to agent-name "<<mAgentNameURL<<llendl;
-                 
-}
-void LLHTTPAgentNamesResponse::result(const LLSD& content)
-{
-        LLUUID id;
-        lldebugs<<LLSDOStreamer<LLSDNotationFormatter>(content) <<llendl;
-        LLSD::map_const_iterator iter = content.beginMap();
-        for ( ; iter != content.endMap(); ++iter)
-        {
-                id.set((*iter).first);
-                LLSD name = (*iter).second;
-                LLCacheNameEntry* entry = new LLCacheNameEntry;
-                entry->mIsGroup = FALSE;
-                entry->mCreateTime = (U32)LLFrameTimer::getTotalSeconds();
-        std::string first = name["first"];
-        std::string last = name["last"];
-        entry->mFirstName = std::string(first, DB_FIRST_NAME_BUF_SIZE);
-        entry->mLastName = std::string(last, DB_LAST_NAME_BUF_SIZE);
-                gCacheName->sendAgentNames(id,first,last);
-        }       
-}
-void LLCacheName::Impl::getGroupName(const AskQueue &queue)
-{
-        // get the group names from backbone module
-        if(queue.empty())
-        {
-                return;
-        }
-                
-        LLSD request;
-        request["action"] = "GET";
-        LLSD id_block = LLSD::emptyArray();
-        AskQueue::const_iterator it = queue.begin();
-        AskQueue::const_iterator end = queue.end();
-        for(;it!=end;++it)
-        {
-                id_block.append(*it);
-        }
-                
-        request["groups"] = id_block;
-                                                                             
-        if(!mGroupNameURL.empty())
-        {       
-                LLHTTPClient::post(
-                        mGroupNameURL,
-                        request,
-                        new LLHTTPGroupNamesResponse(id_block));
-        }
-        lldebugs<<"Service builder call to group-name "<< mGroupNameURL<<llendl;
-}
-void LLHTTPGroupNamesResponse::result(const LLSD& content)
-{
-        lldebugs<<"Result"<<LLSDOStreamer<LLSDNotationFormatter>(content) << llendl;
-        LLUUID id;
-        LLSD::map_const_iterator iter = content.beginMap();
-        for ( ; iter != content.endMap(); ++iter)
-        {
-                                          
-                id.set((*iter).first);
-                std::string name = (*iter).second.asString();
-                LLCacheNameEntry* entry = new LLCacheNameEntry;
-                entry->mIsGroup = TRUE;                                         
-                entry->mCreateTime = (U32)time(NULL);
-        entry->mGroupName = std::string(name, DB_GROUP_NAME_BUF_SIZE);
-                lldebugs<<"Group Name"<<name<<llendl;
-                gCacheName->sendGroupNames(id,name);                                                    
-        }
-}
 // 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)
@@ -765,6 +566,7 @@ void LLCacheName::get(const LLUUID& id, BOOL is_group, LLCacheNameCallback callb
        if(id.isNull())
        {
                callback(id, CN_NOBODY, "", is_group, user_data);
+                return;
        }
        LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache, id );
@@ -806,14 +608,12 @@ void LLCacheName::processPending()
                return;
        }
-    /*
        if(!impl.mUpstreamHost.isOk())
        {
                lldebugs << "LLCacheName::processPending() - bad upstream host."
                                 << llendl;
                return;
        }
-    */
        impl.processPendingAsks();
        impl.processPendingReplies();
@@ -895,16 +695,8 @@ std::string LLCacheName::getDefaultName()
 void LLCacheName::Impl::processPendingAsks()
 {
-        if (mUpstreamHost.isOk()) //its the vuewer asking for names send request to simulator
+        sendRequest(_PREHASH_UUIDNameRequest, mAskNameQueue);
-        {
+        sendRequest(_PREHASH_UUIDGroupNameRequest, mAskGroupQueue);
-                sendRequest(_PREHASH_UUIDNameRequest, mAskNameQueue);
-                sendRequest(_PREHASH_UUIDGroupNameRequest, mAskGroupQueue);
-        }
-        else //its simulator asking for names ask the backbone
-        {
-                getAgentName(mAskNameQueue);
-                getGroupName(mAskGroupQueue);
-        }
        mAskNameQueue.clear();
        mAskGroupQueue.clear();
 }
@@ -1025,15 +817,12 @@ void LLCacheName::Impl::processUUIDRequest(LLMessageSystem* msg, bool isGroup)
 {
        // You should only get this message if the cache is at the simulator
        // level, hence having an upstream provider.
-        // 03/31/2008 Simulator is talking to backbone and not dataserver
-        // This check was for dataserver
-        /*
        if (!mUpstreamHost.isOk())
        {
                llwarns << "LLCacheName - got UUID name/group request, but no upstream provider!" << llendl;
                return;
        }
-        */
        LLHost fromHost = msg->getSender();
        ReplySender sender(msg);
@@ -1104,8 +893,9 @@ void LLCacheName::Impl::processUUIDReply(LLMessageSystem* msg, bool isGroup)
                        msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_LastName,  entry->mLastName, i);
                }
                else
-                {
+                {       // is group
                        msg->getStringFast(_PREHASH_UUIDNameBlock, _PREHASH_GroupName, entry->mGroupName, i);
+                        LLStringFn::replace_ascii_controlchars(entry->mGroupName, LL_UNKNOWN_CHAR);
                }
                if (!isGroup)
diff --git a/linden/indra/llmessage/llcachename.h b/linden/indra/llmessage/llcachename.h
index 8626dd5..2757b86 100644
--- a/linden/indra/llmessage/llcachename.h
+++ b/linden/indra/llmessage/llcachename.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -31,9 +32,7 @@
 #ifndef LL_LLCACHENAME_H
 #define LL_LLCACHENAME_H
-#include "llhttpclient.h"
-#include "llhost.h"
-#include "lluri.h"
 class LLMessageSystem;
 class LLHost;
 class LLUUID;
@@ -99,15 +98,10 @@ public:
        // This method needs to be called from time to time to send out
        // requests.
        void processPending();
-        void setAgentURL(const std::string& url);
-        void setGroupURL(const std::string& url);
-        
        // Expire entries created more than "secs" seconds ago.
        void deleteEntriesOlderThan(S32 secs);
-        //send the information retrived from backbone
-        void sendAgentNames(const LLUUID& id, std::string& first, std::string& last);
-        void sendGroupNames(const LLUUID& id, std::string& name);
        // Debugging
        void dump();            // Dumps the contents of the cache
        void dumpStats();       // Dumps the sizes of the cache and associated queues.
@@ -118,9 +112,10 @@ private:
        class Impl;
        Impl& impl;
 };
 extern LLCacheName* gCacheName;
 #endif
diff --git a/linden/indra/llmessage/llchainio.cpp b/linden/indra/llmessage/llchainio.cpp
index dd76c46..9e61356 100644
--- a/linden/indra/llmessage/llchainio.cpp
+++ b/linden/indra/llmessage/llchainio.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llchainio.h b/linden/indra/llmessage/llchainio.h
index ab0410b..22140be 100644
--- a/linden/indra/llmessage/llchainio.h
+++ b/linden/indra/llmessage/llchainio.h
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llcipher.h b/linden/indra/llmessage/llcipher.h
index f8fadb3..b68a1ac 100644
--- a/linden/indra/llmessage/llcipher.h
+++ b/linden/indra/llmessage/llcipher.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llcircuit.cpp b/linden/indra/llmessage/llcircuit.cpp
index c58628b..725425c 100644
--- a/linden/indra/llmessage/llcircuit.cpp
+++ b/linden/indra/llmessage/llcircuit.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -62,7 +63,6 @@
 #include "lltransfermanager.h"
 #include "llmodularmath.h"
-const F32 PING_INTERVAL = 5.f; // seconds
 const S32 PING_START_BLOCK = 3;         // How many pings behind we have to be to consider ourself blocked.
 const S32 PING_RELEASE_BLOCK = 2;       // How many pings behind we have to be to consider ourself unblocked.
@@ -70,7 +70,8 @@ const F32 TARGET_PERIOD_LENGTH = 5.f;	// seconds
 const F32 LL_DUPLICATE_SUPPRESSION_TIMEOUT = 60.f; //seconds - this can be long, as time-based cleanup is
                                                                                                        // only done when wrapping packetids, now...
-LLCircuitData::LLCircuitData(const LLHost &host, TPACKETID in_id)
+LLCircuitData::LLCircuitData(const LLHost &host, TPACKETID in_id, 
+                                                         const F32 circuit_heartbeat_interval, const F32 circuit_timeout)
 :       mHost (host),
        mWrapID(0),
        mPacketsOutID(0), 
@@ -105,7 +106,9 @@ LLCircuitData::LLCircuitData(const LLHost &host, TPACKETID in_id)
        mPeakBPSOut(0),
        mPeriodTime(0.0),
        mExistenceTimer(),
-        mCurrentResendCount(0)
+        mCurrentResendCount(0),
+        mHeartbeatInterval(circuit_heartbeat_interval), 
+        mHeartbeatTimeout(circuit_timeout)
 {
        // Need to guarantee that this time is up to date, we may be creating a circuit even though we haven't been
        //  running a message system loop.
@@ -113,9 +116,9 @@ LLCircuitData::LLCircuitData(const LLHost &host, TPACKETID in_id)
        F32 distribution_offset = ll_frand();
        
        mPingTime = mt_sec;
-        mLastPingSendTime = mt_sec + PING_INTERVAL * distribution_offset;
+        mLastPingSendTime = mt_sec + mHeartbeatInterval * distribution_offset;
        mLastPingReceivedTime = mt_sec;
-        mNextPingSendTime = mLastPingSendTime + 0.95*PING_INTERVAL + ll_frand(0.1f*PING_INTERVAL);
+        mNextPingSendTime = mLastPingSendTime + 0.95*mHeartbeatInterval + ll_frand(0.1f*mHeartbeatInterval);
        mPeriodTime = mt_sec;
        mTimeoutCallback = NULL;
@@ -429,7 +432,8 @@ S32 LLCircuitData::resendUnackedPackets(const F64 now)
 }
-LLCircuit::LLCircuit() : mLastCircuit(NULL)
+LLCircuit::LLCircuit(const F32 circuit_heartbeat_interval, const F32 circuit_timeout) : mLastCircuit(NULL),  
+        mHeartbeatInterval(circuit_heartbeat_interval), mHeartbeatTimeout(circuit_timeout)
 {
 }
@@ -447,7 +451,7 @@ LLCircuitData *LLCircuit::addCircuitData(const LLHost &host, TPACKETID in_id)
 {
        // This should really validate if one already exists
        llinfos << "LLCircuit::addCircuitData for " << host << llendl;
-        LLCircuitData *tempp = new LLCircuitData(host, in_id);
+        LLCircuitData *tempp = new LLCircuitData(host, in_id, mHeartbeatInterval, mHeartbeatTimeout);
        mCircuitData.insert(circuit_data_map::value_type(host, tempp));
        mPingSet.insert(tempp);
@@ -801,7 +805,7 @@ void LLCircuit::updateWatchDogTimers(LLMessageSystem *msgsys)
                        // Always remember to remove it from the set before changing the sorting
                        // key (mNextPingSendTime)
                        mPingSet.erase(psit);
-                        cdp->mNextPingSendTime = cur_time + PING_INTERVAL;
+                        cdp->mNextPingSendTime = cur_time + mHeartbeatInterval;
                        mPingSet.insert(cdp);
                        continue;
                }
@@ -819,7 +823,7 @@ void LLCircuit::updateWatchDogTimers(LLMessageSystem *msgsys)
                        if (cdp->updateWatchDogTimers(msgsys))
            {
                                // Randomize our pings a bit by doing some up to 5% early or late
-                                F64 dt = 0.95f*PING_INTERVAL + ll_frand(0.1f*PING_INTERVAL);
+                                F64 dt = 0.95f*mHeartbeatInterval + ll_frand(0.1f*mHeartbeatInterval);
                                // Remove it, and reinsert it with the new next ping time.
                                // Always remove before changing the sorting key.
@@ -1047,7 +1051,7 @@ BOOL LLCircuitData::checkCircuitTimeout()
        F64 time_since_last_ping = LLMessageSystem::getMessageTimeSeconds() - mLastPingReceivedTime;
        // Nota Bene: This needs to be turned off if you are debugging multiple simulators
-        if (time_since_last_ping > PING_INTERVAL_MAX)
+        if (time_since_last_ping > mHeartbeatTimeout)
        {
                llwarns << "LLCircuitData::checkCircuitTimeout for " << mHost << " last ping " << time_since_last_ping << " seconds ago." <<llendl;
                setAlive(FALSE);
@@ -1063,10 +1067,7 @@ BOOL LLCircuitData::checkCircuitTimeout()
                        return FALSE;
                }
        }
-        else if (time_since_last_ping > PING_INTERVAL_ALARM)
-        {
-                //llwarns << "Unresponsive circuit: " << mHost << ": " << time_since_last_ping << " seconds since last ping."<< llendl;
-        }
        return TRUE;
 }
@@ -1280,7 +1281,7 @@ void LLCircuitData::pingTimerStop(const U8 ping_id)
                delta_ping += 256;
        }
-        U32 msec = (U32) ((delta_ping*PING_INTERVAL + time) * 1000.f);
+        U32 msec = (U32) ((delta_ping*mHeartbeatInterval  + time) * 1000.f);
        setPingDelay(msec);
        mPingsInTransit = delta_ping;
@@ -1371,7 +1372,8 @@ F32 LLCircuitData::getPingInTransitTime()
        if (mPingsInTransit)
        {
-                time_since_ping_was_sent =  (F32)((mPingsInTransit*PING_INTERVAL - 1) + (LLMessageSystem::getMessageTimeSeconds() - mPingTime))*1000.f;
+                time_since_ping_was_sent =  (F32)((mPingsInTransit*mHeartbeatInterval - 1) 
+                        + (LLMessageSystem::getMessageTimeSeconds() - mPingTime))*1000.f;
        }
        return time_since_ping_was_sent;
diff --git a/linden/indra/llmessage/llcircuit.h b/linden/indra/llmessage/llcircuit.h
index 6df7279..e373cb1 100644
--- a/linden/indra/llmessage/llcircuit.h
+++ b/linden/indra/llmessage/llcircuit.h
@@ -18,7 +18,8 @@
 * 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
+ * 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,
@@ -50,10 +51,6 @@
 //
 // Constants
 //
-const F32 PING_INTERVAL_MAX = 100.f;
-const F32 PING_INTERVAL_ALARM = 50.f;
 const F32 LL_AVERAGED_PING_ALPHA = 0.2f;  // relaxation constant on ping running average
 const F32 LL_AVERAGED_PING_MAX = 2000;    // msec
 const F32 LL_AVERAGED_PING_MIN =  100;    // msec  // IW: increased to avoid retransmits when a process is slow
@@ -85,7 +82,8 @@ class LLSD;
 class LLCircuitData
 {
 public:
-        LLCircuitData(const LLHost &host, TPACKETID in_id);
+        LLCircuitData(const LLHost &host, TPACKETID in_id, 
+                                  const F32 circuit_heartbeat_interval, const F32 circuit_timeout);
        ~LLCircuitData();
        S32             resendUnackedPackets(const F64 now);
@@ -283,6 +281,9 @@ protected:
        S32             mCurrentResendCount;    // Number of resent packets since last spam
    LLStatRate  mOutOfOrderRate;    // Rate of out of order packets coming in.
    U32     mLastPacketGap;         // Gap in sequence number of last packet.
+        const F32 mHeartbeatInterval;
+        const F32 mHeartbeatTimeout;
 };
@@ -292,7 +293,7 @@ class LLCircuit
 {
 public:
        // CREATORS
-        LLCircuit();
+        LLCircuit(const F32 circuit_heartbeat_interval, const F32 circuit_timeout);
        ~LLCircuit();
        // ACCESSORS
@@ -345,5 +346,9 @@ protected:
        // optimize the many, many times we call findCircuit. This may be
        // set in otherwise const methods, so it is declared mutable.
        mutable LLCircuitData* mLastCircuit;
+private:
+        const F32 mHeartbeatInterval;
+        const F32 mHeartbeatTimeout;
 };
 #endif
diff --git a/linden/indra/llmessage/llclassifiedflags.cpp b/linden/indra/llmessage/llclassifiedflags.cpp
index c0579b8..da608e4 100644
--- a/linden/indra/llmessage/llclassifiedflags.cpp
+++ b/linden/indra/llmessage/llclassifiedflags.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -40,18 +41,35 @@
 #include "linden_common.h"
 #include "llclassifiedflags.h"
- 
-ClassifiedFlags pack_classified_flags(BOOL is_mature, BOOL auto_renew)
+ClassifiedFlags pack_classified_flags_request(BOOL auto_renew, BOOL inc_pg, BOOL inc_mature, BOOL inc_adult)
+{
+        U8 rv = 0;
+        if(inc_pg) rv |= CLASSIFIED_QUERY_INC_PG;
+        if(inc_mature) rv |= CLASSIFIED_QUERY_INC_MATURE;
+        if (inc_pg && !inc_mature) rv |= CLASSIFIED_FLAG_MATURE;
+        if(inc_adult) rv |= CLASSIFIED_QUERY_INC_ADULT;
+        if(auto_renew) rv |= CLASSIFIED_FLAG_AUTO_RENEW;
+        return rv;
+}
+ClassifiedFlags pack_classified_flags(BOOL auto_renew, BOOL inc_pg, BOOL inc_mature, BOOL inc_adult)
 {
        U8 rv = 0;
-        if(is_mature) rv |= CLASSIFIED_FLAG_MATURE;
+        if(inc_pg) rv |= CLASSIFIED_QUERY_INC_PG;
+        if(inc_mature)
+    {
+        rv |= CLASSIFIED_QUERY_INC_MATURE;
+        rv |= CLASSIFIED_FLAG_MATURE;
+    }
+        if(inc_adult) rv |= CLASSIFIED_QUERY_INC_ADULT;
        if(auto_renew) rv |= CLASSIFIED_FLAG_AUTO_RENEW;
        return rv;
 }
 bool is_cf_mature(ClassifiedFlags flags)
 {
-        return ((flags & CLASSIFIED_FLAG_MATURE) != 0);
+        return ((flags & CLASSIFIED_FLAG_MATURE) != 0) || ((flags & CLASSIFIED_QUERY_INC_MATURE) != 0);
 }
 // Deprecated, but leaving commented out because someday we might
diff --git a/linden/indra/llmessage/llclassifiedflags.h b/linden/indra/llmessage/llclassifiedflags.h
index 6c15042..9d3e49b 100644
--- a/linden/indra/llmessage/llclassifiedflags.h
+++ b/linden/indra/llmessage/llclassifiedflags.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -42,12 +43,23 @@ const U8 CLASSIFIED_FLAG_UPDATE_TIME= 1 << 4;
 const U8 CLASSIFIED_FLAG_AUTO_RENEW = 1 << 5;
 const U8 CLASSIFIED_QUERY_FILTER_MATURE         = 1 << 1;
-const U8 CLASSIFIED_QUERY_FILTER_ENABLED        = 1 << 2;
+//const U8 CLASSIFIED_QUERY_FILTER_ENABLED      = 1 << 2;
-const U8 CLASSIFIED_QUERY_FILTER_PRICE          = 1 << 3;
+//const U8 CLASSIFIED_QUERY_FILTER_PRICE        = 1 << 3;
+// These are new with Adult-enabled viewers (1.23 and later)
+const U8 CLASSIFIED_QUERY_INC_PG                        = 1 << 2;
+const U8 CLASSIFIED_QUERY_INC_MATURE            = 1 << 3;
+const U8 CLASSIFIED_QUERY_INC_ADULT                     = 1 << 6;
+const U8 CLASSIFIED_QUERY_INC_NEW_VIEWER        = (CLASSIFIED_QUERY_INC_PG | CLASSIFIED_QUERY_INC_MATURE | CLASSIFIED_QUERY_INC_ADULT);
 const S32 MAX_CLASSIFIEDS = 100;
-ClassifiedFlags pack_classified_flags(BOOL is_mature, BOOL auto_renew);
+// This function is used in AO viewers to pack old query flags into the request 
+// so that they can talk to old dataservers properly. When the AO servers are deployed on agni
+// we can revert back to ClassifiedFlags pack_classified_flags and get rider of this one.
+ClassifiedFlags pack_classified_flags_request(BOOL auto_renew, BOOL is_pg, BOOL is_mature, BOOL is_adult);
+ClassifiedFlags pack_classified_flags(BOOL auto_renew, BOOL is_pg, BOOL is_mature, BOOL is_adult);
 bool is_cf_mature(ClassifiedFlags flags);
 //bool is_cf_enabled(ClassifiedFlags flags);
 bool is_cf_update_time(ClassifiedFlags flags);
diff --git a/linden/indra/llmessage/llcurl.cpp b/linden/indra/llmessage/llcurl.cpp
index 266bfac..a4eb90d 100644
--- a/linden/indra/llmessage/llcurl.cpp
+++ b/linden/indra/llmessage/llcurl.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llcurl.h b/linden/indra/llmessage/llcurl.h
index ca231a2..ff63904 100644
--- a/linden/indra/llmessage/llcurl.h
+++ b/linden/indra/llmessage/llcurl.h
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lldatapacker.cpp b/linden/indra/llmessage/lldatapacker.cpp
index 33aa699..1cdb475 100644
--- a/linden/indra/llmessage/lldatapacker.cpp
+++ b/linden/indra/llmessage/lldatapacker.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lldatapacker.h b/linden/indra/llmessage/lldatapacker.h
index 344b313..92bfec6 100644
--- a/linden/indra/llmessage/lldatapacker.h
+++ b/linden/indra/llmessage/lldatapacker.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lldbstrings.h b/linden/indra/llmessage/lldbstrings.h
index d551d49..cdee400 100644
--- a/linden/indra/llmessage/lldbstrings.h
+++ b/linden/indra/llmessage/lldbstrings.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lldispatcher.cpp b/linden/indra/llmessage/lldispatcher.cpp
index 2a0aa67..6632fbb 100644
--- a/linden/indra/llmessage/lldispatcher.cpp
+++ b/linden/indra/llmessage/lldispatcher.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -120,29 +121,32 @@ bool LLDispatcher::unpackMessage(
                // we treat the SParam as binary data (since it might be an 
                // LLUUID in compressed form which may have embedded \0's,)
                size = msg->getSizeFast(_PREHASH_ParamList, i, _PREHASH_Parameter);
-                msg->getBinaryDataFast(
+                if (size >= 0)
-                        _PREHASH_ParamList, _PREHASH_Parameter,
-                        buf, size, i, MAX_STRING-1);
-                // If the last byte of the data is 0x0, this is either a normally
-                // packed string, or a binary packed UUID (which for these messages
-                // are packed with a 17th byte 0x0).  Unpack into a std::string
-                // without the trailing \0, so "abc\0" becomes std::string("abc", 3)
-                // which matches const char* "abc".
-                if (size > 0
-                        && buf[size-1] == 0x0)
-                {
-                        // special char*/size constructor because UUIDs may have embedded
-                        // 0x0 bytes.
-                        std::string binary_data(buf, size-1);
-                        parameters.push_back(binary_data);
-                }
-                else
                {
-                        // This is either a NULL string, or a string that was packed 
+                        msg->getBinaryDataFast(
-                        // incorrectly as binary data, without the usual trailing '\0'.
+                                _PREHASH_ParamList, _PREHASH_Parameter,
-                        std::string string_data(buf, size);
+                                buf, size, i, MAX_STRING-1);
-                        parameters.push_back(string_data);
+                        // If the last byte of the data is 0x0, this is either a normally
+                        // packed string, or a binary packed UUID (which for these messages
+                        // are packed with a 17th byte 0x0).  Unpack into a std::string
+                        // without the trailing \0, so "abc\0" becomes std::string("abc", 3)
+                        // which matches const char* "abc".
+                        if (size > 0
+                                && buf[size-1] == 0x0)
+                        {
+                                // special char*/size constructor because UUIDs may have embedded
+                                // 0x0 bytes.
+                                std::string binary_data(buf, size-1);
+                                parameters.push_back(binary_data);
+                        }
+                        else
+                        {
+                                // This is either a NULL string, or a string that was packed 
+                                // incorrectly as binary data, without the usual trailing '\0'.
+                                std::string string_data(buf, size);
+                                parameters.push_back(string_data);
+                        }
                }
        }
        return true;
diff --git a/linden/indra/llmessage/lldispatcher.h b/linden/indra/llmessage/lldispatcher.h
index 492ac04..520b740 100644
--- a/linden/indra/llmessage/lldispatcher.h
+++ b/linden/indra/llmessage/lldispatcher.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lleventflags.h b/linden/indra/llmessage/lleventflags.h
index 431ca01..965d978 100644
--- a/linden/indra/llmessage/lleventflags.h
+++ b/linden/indra/llmessage/lleventflags.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -36,5 +37,6 @@ const U32 EVENT_FLAG_NONE   = 0x0000;
 // set for mature events
 const U32 EVENT_FLAG_MATURE = 0x0001;
+const U32 EVENT_FLAG_ADULT  = 0x0002;
 #endif
diff --git a/linden/indra/llmessage/llfiltersd2xmlrpc.cpp b/linden/indra/llmessage/llfiltersd2xmlrpc.cpp
index 5a173f3..0560a31 100644
--- a/linden/indra/llmessage/llfiltersd2xmlrpc.cpp
+++ b/linden/indra/llmessage/llfiltersd2xmlrpc.cpp
@@ -18,7 +18,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llfiltersd2xmlrpc.h b/linden/indra/llmessage/llfiltersd2xmlrpc.h
index 6be090a..f907bbd 100644
--- a/linden/indra/llmessage/llfiltersd2xmlrpc.h
+++ b/linden/indra/llmessage/llfiltersd2xmlrpc.h
@@ -18,7 +18,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llfollowcamparams.h b/linden/indra/llmessage/llfollowcamparams.h
index ca9ca75..7dd8d56 100644
--- a/linden/indra/llmessage/llfollowcamparams.h
+++ b/linden/indra/llmessage/llfollowcamparams.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llhost.cpp b/linden/indra/llmessage/llhost.cpp
index 77126a5..8e9e233 100644
--- a/linden/indra/llmessage/llhost.cpp
+++ b/linden/indra/llmessage/llhost.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llhost.h b/linden/indra/llmessage/llhost.h
index 39e29f4..ac35980 100644
--- a/linden/indra/llmessage/llhost.h
+++ b/linden/indra/llmessage/llhost.h
@@ -18,7 +18,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llhttpassetstorage.cpp b/linden/indra/llmessage/llhttpassetstorage.cpp
index d1ea777..dfdad59 100644
--- a/linden/indra/llmessage/llhttpassetstorage.cpp
+++ b/linden/indra/llmessage/llhttpassetstorage.cpp
@@ -18,7 +18,8 @@
 * 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
+ * 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,
@@ -234,6 +235,7 @@ LLSD LLHTTPAssetRequest::getFullDetails() const
 void LLHTTPAssetRequest::setupCurlHandle()
 {
+        // *NOTE: Similar code exists in mapserver/llcurlutil.cpp  JC
        mCurlHandle = curl_easy_init();
        curl_easy_setopt(mCurlHandle, CURLOPT_NOSIGNAL, 1);
        curl_easy_setopt(mCurlHandle, CURLOPT_NOPROGRESS, 1);
diff --git a/linden/indra/llmessage/llhttpassetstorage.h b/linden/indra/llmessage/llhttpassetstorage.h
index 8704a04..5786c5d 100644
--- a/linden/indra/llmessage/llhttpassetstorage.h
+++ b/linden/indra/llmessage/llhttpassetstorage.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index 88a6afd..a6041b4 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -1,4 +1,4 @@
- /** 
+/** 
 * @file llhttpclient.cpp
 * @brief Implementation of classes for making HTTP requests.
 *
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -310,9 +311,13 @@ void LLHTTPClient::getByteRange(
    request(url,LLURLRequest::HTTP_GET, NULL, responder, timeout, headers);
 }
-void LLHTTPClient::head(const std::string& url, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::head(
+        const std::string& url,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_HEAD, NULL, responder, timeout);
+        request(url, LLURLRequest::HTTP_HEAD, NULL, responder, timeout, headers);
 }
 void LLHTTPClient::get(const std::string& url, ResponderPtr responder, const LLSD& headers, const F32 timeout)
@@ -397,6 +402,14 @@ LLSD LLHTTPClient::blockingGet(const std::string& url)
        curl_easy_setopt(curlp, CURLOPT_ERRORBUFFER, curl_error_buffer);
        curl_easy_setopt(curlp, CURLOPT_FAILONERROR, 1);
+        struct curl_slist *header_list = NULL;
+        header_list = curl_slist_append(header_list, "Accept: application/llsd+xml");
+        CURLcode curl_result = curl_easy_setopt(curlp, CURLOPT_HTTPHEADER, header_list);
+        if ( curl_result != CURLE_OK )
+        {
+                llinfos << "Curl is hosed - can't add Accept header for llsd+xml" << llendl;
+        }
        LLSD response = LLSD::emptyMap();
        S32 curl_success = curl_easy_perform(curlp);
@@ -418,44 +431,77 @@ LLSD LLHTTPClient::blockingGet(const std::string& url)
                response["body"] = http_buffer.asLLSD();
        }
        
+        if(header_list)
+        {       // free the header list  
+                curl_slist_free_all(header_list); 
+                header_list = NULL;
+        }
        curl_easy_cleanup(curlp);
        return response;
 }
-void LLHTTPClient::put(const std::string& url, const LLSD& body, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::put(
+        const std::string& url,
+        const LLSD& body,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_PUT, new LLSDInjector(body), responder, timeout);
+        request(url, LLURLRequest::HTTP_PUT, new LLSDInjector(body), responder, timeout, headers);
 }
-void LLHTTPClient::post(const std::string& url, const LLSD& body, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::post(
+        const std::string& url,
+        const LLSD& body,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_POST, new LLSDInjector(body), responder, timeout);
+        request(url, LLURLRequest::HTTP_POST, new LLSDInjector(body), responder, timeout, headers);
 }
-void LLHTTPClient::postRaw(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 LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_POST, new RawInjector(data, size), responder, timeout);
+        request(url, LLURLRequest::HTTP_POST, new RawInjector(data, size), responder, timeout, headers);
 }
-void LLHTTPClient::postFile(const std::string& url, const std::string& filename, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::postFile(
+        const std::string& url,
+        const std::string& filename,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_POST, new FileInjector(filename), responder, timeout);
+        request(url, LLURLRequest::HTTP_POST, new FileInjector(filename), responder, timeout, headers);
 }
-void LLHTTPClient::postFile(const std::string& url, const LLUUID& uuid,
+void LLHTTPClient::postFile(
-                                                        LLAssetType::EType asset_type, ResponderPtr responder, const F32 timeout)
+        const std::string& url,
+        const LLUUID& uuid,
+        LLAssetType::EType asset_type,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_POST, new VFileInjector(uuid, asset_type), responder, timeout);
+        request(url, LLURLRequest::HTTP_POST, new VFileInjector(uuid, asset_type), responder, timeout, headers);
 }
 // static
 void LLHTTPClient::del(
        const std::string& url,
        ResponderPtr responder,
+        const LLSD& headers,
        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_DELETE, NULL, responder, timeout);
+        request(url, LLURLRequest::HTTP_DELETE, NULL, responder, timeout, headers);
 }
 // static
@@ -463,9 +509,10 @@ void LLHTTPClient::move(
        const std::string& url,
        const std::string& destination,
        ResponderPtr responder,
+        const LLSD& hdrs,
        const F32 timeout)
 {
-        LLSD headers;
+        LLSD headers = hdrs;
        headers["Destination"] = destination;
        request(url, LLURLRequest::HTTP_MOVE, NULL, responder, timeout, headers);
 }
diff --git a/linden/indra/llmessage/llhttpclient.h b/linden/indra/llmessage/llhttpclient.h
index bfefc3a..a0c9fac 100644
--- a/linden/indra/llmessage/llhttpclient.h
+++ b/linden/indra/llmessage/llhttpclient.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -62,28 +63,56 @@ public:
        /** @name non-blocking API */
        //@{
-        static void head(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void head(
+                const std::string& url,
+                ResponderPtr,
+                const LLSD& headers = LLSD(),
+                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);
        static void get(const std::string& url, const LLSD& query, ResponderPtr, const LLSD& headers = LLSD(), const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
-        static void put(const std::string& url, const LLSD& body, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void put(
+                const std::string& url,
+                const LLSD& body,
+                ResponderPtr,
+                const LLSD& headers = LLSD(),
+                const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
        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);
-        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 LLSD& body,
+                ResponderPtr,
+                const LLSD& headers = LLSD(),
+                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 postRaw(
-        
+                const std::string& url,
-        static void postFile(const std::string& url, const std::string& filename, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+                const U8* data,
-        #
+                S32 size,
-        static void postFile(const std::string& url, const LLUUID& uuid,
+                ResponderPtr responder,
-                LLAssetType::EType asset_type, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+                const LLSD& headers = LLSD(),
+                const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void postFile(
+                const std::string& url,
+                const std::string& filename,
+                ResponderPtr,
+                const LLSD& headers = LLSD(),
+                const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void postFile(
+                const std::string& url,
+                const LLUUID& uuid,
+                LLAssetType::EType asset_type,
+                ResponderPtr responder,
+                const LLSD& headers = LLSD(),
+                const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
        static void del(
                const std::string& url,
                ResponderPtr responder,
+                const LLSD& headers = LLSD(),
                const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
                ///< sends a DELETE method, but we can't call it delete in c++
        
@@ -93,12 +122,14 @@ public:
         * @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 headers A map of key:value headers to pass to the request
         * @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 LLSD& headers = LLSD(),
                const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
        //@}
diff --git a/linden/indra/llmessage/llhttpclientadapter.cpp b/linden/indra/llmessage/llhttpclientadapter.cpp
new file mode 100644
index 0000000..b698822
--- /dev/null
+++ b/linden/indra/llmessage/llhttpclientadapter.cpp
@@ -0,0 +1,61 @@
+/** 
+ * @file 
+ * @brief 
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, 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 "llhttpclientadapter.h"
+#include "llhttpclient.h"
+LLHTTPClientAdapter::~LLHTTPClientAdapter() 
+{
+}
+void LLHTTPClientAdapter::get(const std::string& url, LLCurl::ResponderPtr responder) 
+{
+        LLSD empty_pragma_header;
+        // Pragma is required to stop curl adding "no-cache"
+        // Space is required to stop llurlrequest from turnning off proxying
+        empty_pragma_header["Pragma"] = " "; 
+        LLHTTPClient::get(url, responder, empty_pragma_header);
+}
+void LLHTTPClientAdapter::get(const std::string& url, LLCurl::ResponderPtr responder, const LLSD& headers) 
+{
+        LLSD empty_pragma_header = headers;
+        // as above
+        empty_pragma_header["Pragma"] = " ";
+        LLHTTPClient::get(url, responder, empty_pragma_header);
+}
+void LLHTTPClientAdapter::put(const std::string& url, const LLSD& body, LLCurl::ResponderPtr responder) 
+{
+        LLHTTPClient::put(url, body, responder);
+}
diff --git a/linden/indra/llmessage/llhttpclientadapter.h b/linden/indra/llmessage/llhttpclientadapter.h
new file mode 100644
index 0000000..7d61357
--- /dev/null
+++ b/linden/indra/llmessage/llhttpclientadapter.h
@@ -0,0 +1,49 @@
+/** 
+ * @file 
+ * @brief 
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, 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_HTTPCLIENTADAPTER_H
+#define LL_HTTPCLIENTADAPTER_H
+#include "llhttpclientinterface.h"
+#include "llmemory.h"   // LLSingleton<>
+class LLHTTPClientAdapter : public LLHTTPClientInterface, public LLSingleton<LLHTTPClientAdapter>
+{
+public:
+        virtual ~LLHTTPClientAdapter();
+        virtual void get(const std::string& url, LLCurl::ResponderPtr responder);
+        virtual void get(const std::string& url, LLCurl::ResponderPtr responder, const LLSD& headers);
+        virtual void put(const std::string& url, const LLSD& body, LLCurl::ResponderPtr responder);
+};
+#endif
diff --git a/linden/indra/llmessage/llhttpclientinterface.h b/linden/indra/llmessage/llhttpclientinterface.h
new file mode 100644
index 0000000..42a8e5c
--- /dev/null
+++ b/linden/indra/llmessage/llhttpclientinterface.h
@@ -0,0 +1,51 @@
+/** 
+ * @file 
+ * @brief 
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, 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_LLHTTPCLIENTINTERFACE_H
+#define LL_LLHTTPCLIENTINTERFACE_H
+#include "linden_common.h"
+#include "llcurl.h"
+#include <string>
+class LLHTTPClientInterface
+{
+public:
+        virtual ~LLHTTPClientInterface() {}
+        virtual void get(const std::string& url, LLCurl::ResponderPtr responder) = 0;
+        virtual void get(const std::string& url, LLCurl::ResponderPtr responder, const LLSD& headers) = 0;
+        virtual void put(const std::string& url, const LLSD& body, LLCurl::ResponderPtr responder) = 0;
+};
+#endif // LL_LLHTTPCLIENTINTERFACE_H
diff --git a/linden/indra/llmessage/llhttpnode.cpp b/linden/indra/llmessage/llhttpnode.cpp
index 0d60a64..2ba900a 100644
--- a/linden/indra/llmessage/llhttpnode.cpp
+++ b/linden/indra/llmessage/llhttpnode.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -35,8 +36,8 @@
 #include <boost/tokenizer.hpp>
 #include "llstl.h"
+#include "lliohttpserver.h" // for string constants
-static const std::string CONTEXT_REQUEST("request");
 static const std::string CONTEXT_WILDCARD("wildcard");
 /**
@@ -180,7 +181,8 @@ 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();
+        std::string host(
+                context[CONTEXT_REQUEST][CONTEXT_HEADERS]["host"].asString());
        if(host.empty())
        {
                response->status(400, "Bad Request -- need Host header");
@@ -474,6 +476,11 @@ void LLSimpleResponse::result(const LLSD& result)
        status(200, "OK");
 }
+void LLSimpleResponse::extendedResult(S32 code, const std::string& body, const LLSD& headers)
+{
+        status(code,body);
+}
 void LLSimpleResponse::status(S32 code, const std::string& message)
 {
        mCode = code;
diff --git a/linden/indra/llmessage/llhttpnode.h b/linden/indra/llmessage/llhttpnode.h
index ea89ee2..17ffd66 100644
--- a/linden/indra/llmessage/llhttpnode.h
+++ b/linden/indra/llmessage/llhttpnode.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -37,7 +38,6 @@
 class LLChainIOFactory;
 /**
 * These classes represent the HTTP framework: The URL tree, and the LLSD
 * REST interface that such nodes implement.
@@ -88,6 +88,9 @@ public:
        virtual LLSD post(const LLSD& input) const;
        virtual LLSD del(const LLSD& context) const;
+        /**
+        * @brief Abstract Base Class declaring Response interface.
+        */
        class Response : public LLRefCount
        {
        protected:
@@ -95,53 +98,57 @@ public:
        public:
                /**
-                 * @brief Return the LLSD content and a 200 OK.
+                * @brief Return the LLSD content and a 200 OK.
-                 */
+                */
                virtual void result(const LLSD&) = 0;
                /**
+                 * @brief return status code and message with headers.
+                 */
+                virtual void extendedResult(S32 code, const std::string& message, const LLSD& headers) = 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'.
+                * @brief Return no body, just status code and 'UNKNOWN ERROR'.
-                 */
+                */
-                void status(S32 code);
+                virtual void status(S32 code);
-                void notFound(const std::string& message);
+                virtual void notFound(const std::string& message);
-                void notFound();
+                virtual void notFound();
-                void methodNotAllowed();
+                virtual void methodNotAllowed();
                /**
-                 * @breif Add a name: value http header.
+                * @breif Add a name: value http header.
-                 *
+                *
-                 * No effort is made to ensure the response is a valid http
+                * No effort is made to ensure the response is a valid http
-                 * header.
+                * header.
-                 * The headers are stored as a map of header name : value.
+                * The headers are stored as a map of header name : value.
-                 * Though HTTP allows the same header name to be transmitted
+                * Though HTTP allows the same header name to be transmitted
-                 * more than once, this implementation only stores a header
+                * more than once, this implementation only stores a header
-                 * name once.
+                * name once.
-                 * @param name The name of the header, eg, "Content-Encoding"
+                * @param name The name of the header, eg, "Content-Encoding"
-                 * @param value The value of the header, eg, "gzip"
+                * @param value The value of the header, eg, "gzip"
-                 */
+                */
-                void addHeader(const std::string& name, const std::string& value);
+                virtual void addHeader(const std::string& name, const std::string& value);
        protected:
                /**
-                 * @brief Headers to be sent back with the HTTP response.
+                * @brief Headers to be sent back with the HTTP response.
-                 *
+                *
-                 * Protected class membership since derived classes are
+                * Protected class membership since derived classes are
-                 * expected to use it and there is no use case yet for other
+                * expected to use it and there is no use case yet for other
-                 * uses. If such a use case arises, I suggest making a
+                * uses. If such a use case arises, I suggest making a
-                 * headers() public method, and moving this member data into
+                * headers() public method, and moving this member data into
-                 * private.
+                * private.
-                 */
+                */
                LLSD mHeaders;
        };
        typedef LLPointer<Response> ResponsePtr;
        virtual void get(ResponsePtr, const LLSD& context) const;
@@ -217,6 +224,14 @@ public:
        const LLHTTPNode* rootNode() const;
        const LLHTTPNode* findNode(const std::string& name) const;
+        enum EHTTPNodeContentType
+        {
+                CONTENT_TYPE_LLSD,
+                CONTENT_TYPE_TEXT
+        };
+        virtual EHTTPNodeContentType getContentType() const { return CONTENT_TYPE_LLSD; }
        //@}
        /* @name Description system
@@ -276,6 +291,7 @@ public:
        static LLPointer<LLSimpleResponse> create();
        
        void result(const LLSD& result);
+        void extendedResult(S32 code, const std::string& body, const LLSD& headers);
        void status(S32 code, const std::string& message);
        void print(std::ostream& out) const;
diff --git a/linden/indra/llmessage/llhttpnodeadapter.h b/linden/indra/llmessage/llhttpnodeadapter.h
new file mode 100644
index 0000000..7c3e9d8
--- /dev/null
+++ b/linden/indra/llmessage/llhttpnodeadapter.h
@@ -0,0 +1,58 @@
+/**
+ * @file llhttpnodeadapter.h
+ * @brief Declaration of llhttpnode adapter classes
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, 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_HTTP_NODE_ADAPTER_H
+#define LL_HTTP_NODE_ADAPTER_H
+#include "llhttpnode.h"
+template<typename T>
+class LLHTTPNodeAdapter : public LLHTTPNode
+{
+public:
+        virtual bool validate(const std::string& name, LLSD& context) const
+        {
+                T node;
+                return node.validate(name, context);
+        }
+        
+        virtual void post(LLHTTPNode::ResponsePtr response,
+                                          const LLSD& context,
+                                          const LLSD& input) const
+        {
+                T node;
+                return node.post(response, context, input);
+        }
+};
+#endif // LL_HTTP_NODE_ADAPTER_H
diff --git a/linden/indra/llmessage/llhttpsender.cpp b/linden/indra/llmessage/llhttpsender.cpp
index 30b2cf0..0acd728 100644
--- a/linden/indra/llmessage/llhttpsender.cpp
+++ b/linden/indra/llmessage/llhttpsender.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llhttpsender.h b/linden/indra/llmessage/llhttpsender.h
index 1df9824..b6d8a3a 100644
--- a/linden/indra/llmessage/llhttpsender.h
+++ b/linden/indra/llmessage/llhttpsender.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llinstantmessage.cpp b/linden/indra/llmessage/llinstantmessage.cpp
index dbee96b..44be3ae 100644
--- a/linden/indra/llmessage/llinstantmessage.cpp
+++ b/linden/indra/llmessage/llinstantmessage.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llinstantmessage.h b/linden/indra/llmessage/llinstantmessage.h
index 0468c5a..96a2cf9 100644
--- a/linden/indra/llmessage/llinstantmessage.h
+++ b/linden/indra/llmessage/llinstantmessage.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -158,7 +159,7 @@ enum EInstantMessage
        IM_FRIENDSHIP_OFFERED = 38,
        IM_FRIENDSHIP_ACCEPTED = 39,
-        IM_FRIENDSHIP_DECLINED = 40,
+        IM_FRIENDSHIP_DECLINED_DEPRECATED = 40,
        IM_TYPING_START = 41,
        IM_TYPING_STOP = 42,
diff --git a/linden/indra/llmessage/llinvite.h b/linden/indra/llmessage/llinvite.h
index 1a7e5e3..7bafccb 100644
--- a/linden/indra/llmessage/llinvite.h
+++ b/linden/indra/llmessage/llinvite.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lliobuffer.cpp b/linden/indra/llmessage/lliobuffer.cpp
index a628bf6..71c1df8 100644
--- a/linden/indra/llmessage/lliobuffer.cpp
+++ b/linden/indra/llmessage/lliobuffer.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lliobuffer.h b/linden/indra/llmessage/lliobuffer.h
index ae776f9..16bef15 100644
--- a/linden/indra/llmessage/lliobuffer.h
+++ b/linden/indra/llmessage/lliobuffer.h
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lliohttpserver.cpp b/linden/indra/llmessage/lliohttpserver.cpp
index 167f212..83dfa94 100644
--- a/linden/indra/llmessage/lliohttpserver.cpp
+++ b/linden/indra/llmessage/lliohttpserver.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
@@ -56,15 +57,15 @@
 #include <boost/tokenizer.hpp>
 static const char HTTP_VERSION_STR[] = "HTTP/1.0";
-static const std::string CONTEXT_REQUEST("request");
+const std::string CONTEXT_REQUEST("request");
-static const std::string CONTEXT_RESPONSE("response");
+const std::string CONTEXT_RESPONSE("response");
-static const std::string CONTEXT_VERB("verb");
+const std::string CONTEXT_VERB("verb");
-static const std::string CONTEXT_HEADERS("headers");
+const std::string CONTEXT_HEADERS("headers");
-static const std::string HTTP_VERB_GET("GET");
+const std::string HTTP_VERB_GET("GET");
-static const std::string HTTP_VERB_PUT("PUT");
+const std::string HTTP_VERB_PUT("PUT");
-static const std::string HTTP_VERB_POST("POST");
+const std::string HTTP_VERB_POST("POST");
-static const std::string HTTP_VERB_DELETE("DELETE");
+const std::string HTTP_VERB_DELETE("DELETE");
-static const std::string HTTP_VERB_OPTIONS("OPTIONS");
+const std::string HTTP_VERB_OPTIONS("OPTIONS");
 static LLIOHTTPServer::timing_callback_t sTimingCallback = NULL;
 static void* sTimingCallbackData = NULL;
@@ -103,6 +104,7 @@ private:
                // from LLHTTPNode::Response
                virtual void result(const LLSD&);
+                virtual void extendedResult(S32 code, const std::string& body, const LLSD& headers);
                virtual void status(S32 code, const std::string& message);
                void nullPipe();
@@ -121,7 +123,8 @@ private:
                STATE_DELAYED,
                STATE_LOCKED,
                STATE_GOOD_RESULT,
-                STATE_STATUS_RESULT
+                STATE_STATUS_RESULT,
+                STATE_EXTENDED_RESULT
        };
        State mState;
@@ -179,14 +182,32 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
                {
            LLPerfBlock putblock("http_put");
                        LLSD input;
-                        LLSDSerialize::fromXML(input, istr);
+                        if (mNode.getContentType() == LLHTTPNode::CONTENT_TYPE_LLSD)
+                        {
+                                LLSDSerialize::fromXML(input, istr);
+                        }
+                        else if (mNode.getContentType() == LLHTTPNode::CONTENT_TYPE_TEXT)
+                        {
+                                std::stringstream strstrm;
+                                strstrm << istr.rdbuf();
+                                input = strstrm.str();
+                        }
                        mNode.put(LLHTTPNode::ResponsePtr(mResponse), context, input);
                }
                else if(verb == HTTP_VERB_POST)
                {
            LLPerfBlock postblock("http_post");
                        LLSD input;
-                        LLSDSerialize::fromXML(input, istr);
+                        if (mNode.getContentType() == LLHTTPNode::CONTENT_TYPE_LLSD)
+                        {
+                                LLSDSerialize::fromXML(input, istr);
+                        }
+                        else if (mNode.getContentType() == LLHTTPNode::CONTENT_TYPE_TEXT)
+                        {
+                                std::stringstream strstrm;
+                                strstrm << istr.rdbuf();
+                                input = strstrm.str();
+                        }
                        mNode.post(LLHTTPNode::ResponsePtr(mResponse), context, input);
                }
                else if(verb == HTTP_VERB_DELETE)
@@ -261,7 +282,16 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
                        context[CONTEXT_RESPONSE]["statusCode"] = mStatusCode;
                        context[CONTEXT_RESPONSE]["statusMessage"] = mStatusMessage;
                        LLBufferStream ostr(channels, buffer.get());
-                        ostr << mStatusMessage << std::ends;
+                        ostr << mStatusMessage;
+                        return STATUS_DONE;
+                }
+                case STATE_EXTENDED_RESULT:
+                {
+                        context[CONTEXT_RESPONSE][CONTEXT_HEADERS] = mHeaders;
+                        context[CONTEXT_RESPONSE]["statusCode"] = mStatusCode;
+                        LLBufferStream ostr(channels, buffer.get());
+                        ostr << mStatusMessage;
                        return STATUS_DONE;
                }
@@ -308,6 +338,21 @@ void LLHTTPPipe::Response::result(const LLSD& r)
        mPipe->unlockChain();   
 }
+void LLHTTPPipe::Response::extendedResult(S32 code, const std::string& body, const LLSD& headers)
+{
+        if(! mPipe)
+        {
+                llwarns << "LLHTTPPipe::Response::status: NULL pipe" << llendl;
+                return;
+        }
+        mPipe->mStatusCode = code;
+        mPipe->mStatusMessage = body;
+        mPipe->mHeaders = headers;
+        mPipe->mState = STATE_EXTENDED_RESULT;
+        mPipe->unlockChain();
+}
 // virtual
 void LLHTTPPipe::Response::status(S32 code, const std::string& message)
 {
@@ -408,6 +453,7 @@ LLIOPipe::EStatus LLHTTPResponseHeader::process_impl(
                }
                
                ostr << HTTP_VERSION_STR << " " << code << " " << message << "\r\n";
                S32 content_length = buffer->countAfter(channels.in(), NULL);
                if(0 < content_length)
                {
@@ -798,6 +844,7 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
                                = node->getProtocolHandler();
                        if (protocolHandler)
                        {
+                                lldebugs << "HTTP context: " << context << llendl;
                                protocolHandler->build(chain, context);
                        }
                        else
diff --git a/linden/indra/llmessage/lliohttpserver.h b/linden/indra/llmessage/lliohttpserver.h
index 0f39c30..d1c9bdd 100644
--- a/linden/indra/llmessage/lliohttpserver.h
+++ b/linden/indra/llmessage/lliohttpserver.h
@@ -18,7 +18,8 @@
 * 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
+ * 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,
@@ -39,6 +40,18 @@
 class LLPumpIO;
+// common strings use for populating the context. bascally 'request',
+// 'wildcard', and 'headers'.
+extern const std::string CONTEXT_REQUEST;
+extern const std::string CONTEXT_RESPONSE;
+extern const std::string CONTEXT_VERB;
+extern const std::string CONTEXT_HEADERS;
+extern const std::string HTTP_VERB_GET;
+extern const std::string HTTP_VERB_PUT;
+extern const std::string HTTP_VERB_POST;
+extern const std::string HTTP_VERB_DELETE;
+extern const std::string HTTP_VERB_OPTIONS;
 class LLIOHTTPServer
 {
 public:
diff --git a/linden/indra/llmessage/lliopipe.cpp b/linden/indra/llmessage/lliopipe.cpp
index 05a54d3..af9737d 100644
--- a/linden/indra/llmessage/lliopipe.cpp
+++ b/linden/indra/llmessage/lliopipe.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lliopipe.h b/linden/indra/llmessage/lliopipe.h
index 999916f..8c5f151 100644
--- a/linden/indra/llmessage/lliopipe.h
+++ b/linden/indra/llmessage/lliopipe.h
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lliosocket.cpp b/linden/indra/llmessage/lliosocket.cpp
index 2b9c478..7ec577c 100644
--- a/linden/indra/llmessage/lliosocket.cpp
+++ b/linden/indra/llmessage/lliosocket.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lliosocket.h b/linden/indra/llmessage/lliosocket.h
index 02610d9..ec09ad8 100644
--- a/linden/indra/llmessage/lliosocket.h
+++ b/linden/indra/llmessage/lliosocket.h
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llioutil.cpp b/linden/indra/llmessage/llioutil.cpp
index 494ac55..d282a7d 100644
--- a/linden/indra/llmessage/llioutil.cpp
+++ b/linden/indra/llmessage/llioutil.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llioutil.h b/linden/indra/llmessage/llioutil.h
index 668de97..5bc674a 100644
--- a/linden/indra/llmessage/llioutil.h
+++ b/linden/indra/llmessage/llioutil.h
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llloginflags.h b/linden/indra/llmessage/llloginflags.h
index 064e893..6f119e7 100644
--- a/linden/indra/llmessage/llloginflags.h
+++ b/linden/indra/llmessage/llloginflags.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llmail.cpp b/linden/indra/llmessage/llmail.cpp
index 6945a45..d52ff6c 100644
--- a/linden/indra/llmessage/llmail.cpp
+++ b/linden/indra/llmessage/llmail.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llmail.h b/linden/indra/llmessage/llmail.h
index 7049a5b..7effb84 100644
--- a/linden/indra/llmessage/llmail.h
+++ b/linden/indra/llmessage/llmail.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llmessagebuilder.cpp b/linden/indra/llmessage/llmessagebuilder.cpp
index 21c2db6..def9f47 100644
--- a/linden/indra/llmessage/llmessagebuilder.cpp
+++ b/linden/indra/llmessage/llmessagebuilder.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llmessagebuilder.h b/linden/indra/llmessage/llmessagebuilder.h
index 180cf1e..6fa218d 100644
--- a/linden/indra/llmessage/llmessagebuilder.h
+++ b/linden/indra/llmessage/llmessagebuilder.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llmessageconfig.cpp b/linden/indra/llmessage/llmessageconfig.cpp
index 8721b09..d427935 100644
--- a/linden/indra/llmessage/llmessageconfig.cpp
+++ b/linden/indra/llmessage/llmessageconfig.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llmessageconfig.h b/linden/indra/llmessage/llmessageconfig.h
index 17bcf00..e8b5164 100644
--- a/linden/indra/llmessage/llmessageconfig.h
+++ b/linden/indra/llmessage/llmessageconfig.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llmessagereader.cpp b/linden/indra/llmessage/llmessagereader.cpp
index a7a4597..6237172 100644
--- a/linden/indra/llmessage/llmessagereader.cpp
+++ b/linden/indra/llmessage/llmessagereader.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llmessagereader.h b/linden/indra/llmessage/llmessagereader.h
index b1aa6e1..6edc2f3 100644
--- a/linden/indra/llmessage/llmessagereader.h
+++ b/linden/indra/llmessage/llmessagereader.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -43,6 +44,12 @@ class LLVector3;
 class LLVector3d;
 class LLVector4;
+// Error return values for getSize() functions
+const S32 LL_BLOCK_NOT_IN_MESSAGE = -1;
+const S32 LL_VARIABLE_NOT_IN_BLOCK = -2;
+const S32 LL_MESSAGE_ERROR = -3;
 class LLMessageReader
 {
 public:
diff --git a/linden/indra/llmessage/network.h b/linden/indra/llmessage/llmessagesenderinterface.h
index 781c4f4..119eb1d 100644
--- a/linden/indra/llmessage/network.h
+++ b/linden/indra/llmessage/llmessagesenderinterface.h
@@ -1,10 +1,10 @@
 /** 
- * @file network.h
+ * @file 
- * @brief Legacy file.
+ * @brief 
 *
- * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
 * 
- * Copyright (c) 2000-2009, Linden Research, Inc.
+ * Copyright (c) 2008-2009, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -29,3 +30,21 @@
 * $/LicenseInfo$
 */
+#ifndef LL_LLMESSAGESENDERINTERFACE_H
+#define LL_LLMESSAGESENDERINTERFACE_H
+#include "linden_common.h"
+#include "llstoredmessage.h"
+class LLHost;
+class LLSD;
+class LLMessageSenderInterface
+{
+public:
+        virtual ~LLMessageSenderInterface() {}
+        virtual S32 sendMessage(const LLHost& host, LLStoredMessagePtr message) = 0;
+};
+#endif // LL_LLMESSAGESENDERINTERFACE_H
diff --git a/linden/indra/llmessage/llmessagetemplate.cpp b/linden/indra/llmessage/llmessagetemplate.cpp
index 6cbffca..7f3a97f 100644
--- a/linden/indra/llmessage/llmessagetemplate.cpp
+++ b/linden/indra/llmessage/llmessagetemplate.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llmessagetemplate.h b/linden/indra/llmessage/llmessagetemplate.h
index 2390eea..d7f02eb 100644
--- a/linden/indra/llmessage/llmessagetemplate.h
+++ b/linden/indra/llmessage/llmessagetemplate.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llmessagetemplateparser.cpp b/linden/indra/llmessage/llmessagetemplateparser.cpp
index b7fe8f9..283547e 100644
--- a/linden/indra/llmessage/llmessagetemplateparser.cpp
+++ b/linden/indra/llmessage/llmessagetemplateparser.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llmessagetemplateparser.h b/linden/indra/llmessage/llmessagetemplateparser.h
index 97e51c4..af66131 100644
--- a/linden/indra/llmessage/llmessagetemplateparser.h
+++ b/linden/indra/llmessage/llmessagetemplateparser.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llmessagethrottle.cpp b/linden/indra/llmessage/llmessagethrottle.cpp
index 0d61f90..8fec4b3 100644
--- a/linden/indra/llmessage/llmessagethrottle.cpp
+++ b/linden/indra/llmessage/llmessagethrottle.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -119,7 +120,7 @@ BOOL LLMessageThrottle::addViewerAlert(const LLUUID& to, const std::string& mesg
        full_mesg << to << mesg;
        // Create an entry for this message.
-        size_t hash = llhash<const char*> (full_mesg.str().c_str());
+        size_t hash = llhash(full_mesg.str().c_str());
        LLMessageThrottleEntry entry(hash, LLFrameTimer::getTotalTime());
        // Check if this message is already in the list.
@@ -153,7 +154,7 @@ BOOL LLMessageThrottle::addAgentAlert(const LLUUID& agent, const LLUUID& task, c
        full_mesg << agent << task << mesg;
        // Create an entry for this message.
-        size_t hash = llhash<const char*> (full_mesg.str().c_str());
+        size_t hash = llhash(full_mesg.str().c_str());
        LLMessageThrottleEntry entry(hash, LLFrameTimer::getTotalTime());
        // Check if this message is already in the list.
diff --git a/linden/indra/llmessage/llmessagethrottle.h b/linden/indra/llmessage/llmessagethrottle.h
index fdd1b4b..b8a5de0 100644
--- a/linden/indra/llmessage/llmessagethrottle.h
+++ b/linden/indra/llmessage/llmessagethrottle.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llmime.cpp b/linden/indra/llmessage/llmime.cpp
index 355d0b7..fa623b6 100644
--- a/linden/indra/llmessage/llmime.cpp
+++ b/linden/indra/llmessage/llmime.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llmime.h b/linden/indra/llmessage/llmime.h
index 9fbfcd7..29211a9 100644
--- a/linden/indra/llmessage/llmime.h
+++ b/linden/indra/llmessage/llmime.h
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llmsgvariabletype.h b/linden/indra/llmessage/llmsgvariabletype.h
index 08e5aef..b3b3589 100644
--- a/linden/indra/llmessage/llmsgvariabletype.h
+++ b/linden/indra/llmessage/llmsgvariabletype.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llnamevalue.cpp b/linden/indra/llmessage/llnamevalue.cpp
index d4db063..01e922e 100644
--- a/linden/indra/llmessage/llnamevalue.cpp
+++ b/linden/indra/llmessage/llnamevalue.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -38,7 +39,6 @@
 #include "u64.h"
 #include "llstring.h"
-#include "llcamera.h"
 #include "string_table.h"
 // Anonymous enumeration to provide constants in this file.
diff --git a/linden/indra/llmessage/llnamevalue.h b/linden/indra/llmessage/llnamevalue.h
index eecfd4c..ad69d3a 100644
--- a/linden/indra/llmessage/llnamevalue.h
+++ b/linden/indra/llmessage/llnamevalue.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llnullcipher.cpp b/linden/indra/llmessage/llnullcipher.cpp
index 89c66cc..30279bc 100644
--- a/linden/indra/llmessage/llnullcipher.cpp
+++ b/linden/indra/llmessage/llnullcipher.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llnullcipher.h b/linden/indra/llmessage/llnullcipher.h
index 2b5a4a5..6e87720 100644
--- a/linden/indra/llmessage/llnullcipher.h
+++ b/linden/indra/llmessage/llnullcipher.h
@@ -16,7 +16,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llpacketack.cpp b/linden/indra/llmessage/llpacketack.cpp
index 8eb6694..f7de44c 100644
--- a/linden/indra/llmessage/llpacketack.cpp
+++ b/linden/indra/llmessage/llpacketack.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llpacketack.h b/linden/indra/llmessage/llpacketack.h
index 1023295..6f78dda 100644
--- a/linden/indra/llmessage/llpacketack.h
+++ b/linden/indra/llmessage/llpacketack.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llpacketbuffer.cpp b/linden/indra/llmessage/llpacketbuffer.cpp
index cb42ab3..027d35c 100644
--- a/linden/indra/llmessage/llpacketbuffer.cpp
+++ b/linden/indra/llmessage/llpacketbuffer.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -73,5 +74,6 @@ void LLPacketBuffer::init (S32 hSocket)
 {
        mSize = receive_packet(hSocket, mData);
        mHost = ::get_sender();
+        mReceivingIF = ::get_receiving_interface();
 }
-        
diff --git a/linden/indra/llmessage/llpacketbuffer.h b/linden/indra/llmessage/llpacketbuffer.h
index b8c9f83..bbcbdf2 100644
--- a/linden/indra/llmessage/llpacketbuffer.h
+++ b/linden/indra/llmessage/llpacketbuffer.h
@@ -18,7 +18,8 @@
 * 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
+ * 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,
@@ -43,15 +44,17 @@ public:
        LLPacketBuffer(S32 hSocket);           // receive a packet
        ~LLPacketBuffer();
-        S32                     getSize() const         { return mSize; }
+        S32                     getSize() const                                 { return mSize; }
-        const char      *getData() const        { return mData; }
+        const char      *getData() const                                { return mData; }
-        LLHost          getHost() const         { return mHost; }
+        LLHost          getHost() const                                 { return mHost; }
+        LLHost          getReceivingInterface() const   { return mReceivingIF; }
        void init(S32 hSocket);
 protected:
        char    mData[NET_BUFFER_SIZE];        // packet data           /* Flawfinder : ignore */
        S32             mSize;          // size of buffer in bytes
        LLHost  mHost;         // source/dest IP and port
+        LLHost  mReceivingIF;         // source/dest IP and port
 };
 #endif
diff --git a/linden/indra/llmessage/llpacketring.cpp b/linden/indra/llmessage/llpacketring.cpp
index cd59b12..35d5aac 100644
--- a/linden/indra/llmessage/llpacketring.cpp
+++ b/linden/indra/llmessage/llpacketring.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -140,6 +141,7 @@ S32 LLPacketRing::receiveFromRing (S32 socket, char *datap)
        }
        // need to set sender IP/port!!
        mLastSender = packetp->getHost();
+        mLastReceivingIF = packetp->getReceivingInterface();
        delete packetp;
        this->mInBufferLength -= packet_size;
@@ -222,6 +224,7 @@ S32 LLPacketRing::receivePacket (S32 socket, char *datap)
                // no delay, pull straight from net
                packet_size = receive_packet(socket, datap);            
                mLastSender = ::get_sender();
+                mLastReceivingIF = ::get_receiving_interface();
                if (packet_size)  // did we actually get a packet?
                {
diff --git a/linden/indra/llmessage/llpacketring.h b/linden/indra/llmessage/llpacketring.h
index e914a32..4408abe 100644
--- a/linden/indra/llmessage/llpacketring.h
+++ b/linden/indra/llmessage/llpacketring.h
@@ -18,7 +18,8 @@
 * 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
+ * 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,
@@ -61,6 +62,7 @@ public:
        BOOL sendPacket(int h_socket, char * send_buffer, S32 buf_size, LLHost host);
        inline LLHost getLastSender();
+        inline LLHost getLastReceivingInterface();
        S32 getAndResetActualInBits()                           { S32 bits = mActualBitsIn; mActualBitsIn = 0; return bits;}
        S32 getAndResetActualOutBits()                          { S32 bits = mActualBitsOut; mActualBitsOut = 0; return bits;}
@@ -85,6 +87,7 @@ protected:
        std::queue<LLPacketBuffer *> mSendQueue;
        LLHost mLastSender;
+        LLHost mLastReceivingIF;
 };
@@ -93,4 +96,9 @@ inline LLHost LLPacketRing::getLastSender()
        return mLastSender;
 }
+inline LLHost LLPacketRing::getLastReceivingInterface()
+{
+        return mLastReceivingIF;
+}
 #endif
diff --git a/linden/indra/llmessage/llpartdata.cpp b/linden/indra/llmessage/llpartdata.cpp
index fe859fe..485bc6a 100644
--- a/linden/indra/llmessage/llpartdata.cpp
+++ b/linden/indra/llmessage/llpartdata.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llpartdata.h b/linden/indra/llmessage/llpartdata.h
index a72c6b2..6dcb311 100644
--- a/linden/indra/llmessage/llpartdata.h
+++ b/linden/indra/llmessage/llpartdata.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llpumpio.cpp b/linden/indra/llmessage/llpumpio.cpp
index 01a43ec..3e3f0b3 100644
--- a/linden/indra/llmessage/llpumpio.cpp
+++ b/linden/indra/llmessage/llpumpio.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
@@ -180,6 +181,8 @@ LLPumpIO::LLPumpIO(apr_pool_t* pool) :
        mCallbackMutex(NULL),
        mCurrentChain(mRunningChains.end())
 {
+        mCurrentChain = mRunningChains.end();
        LLMemType m1(LLMemType::MTYPE_IO_PUMP);
        initialize(pool);
 }
@@ -273,12 +276,11 @@ bool LLPumpIO::setTimeoutSeconds(F32 timeout)
 void LLPumpIO::adjustTimeoutSeconds(F32 delta)
 {
-        // If no chain is running, bail
+        // Ensure a chain is running
-        if(mRunningChains.end() == mCurrentChain) 
+        if(mRunningChains.end() != mCurrentChain)
        {
-                return;
+                (*mCurrentChain).adjustTimeoutSeconds(delta);
        }
-        (*mCurrentChain).adjustTimeoutSeconds(delta);
 }
 static std::string events_2_string(apr_int16_t events)
@@ -548,7 +550,7 @@ void LLPumpIO::pump(const S32& poll_timeout)
        //lldebugs << "Running chain count: " << mRunningChains.size() << llendl;
        running_chains_t::iterator run_chain = mRunningChains.begin();
        bool process_this_chain = false;
-        for(; run_chain != mRunningChains.end(); )
+        while( run_chain != mRunningChains.end() )
        {
                PUMP_DEBUG;
                if((*run_chain).mInit
diff --git a/linden/indra/llmessage/llpumpio.h b/linden/indra/llmessage/llpumpio.h
index bf62832..fc0bfab 100644
--- a/linden/indra/llmessage/llpumpio.h
+++ b/linden/indra/llmessage/llpumpio.h
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llqueryflags.h b/linden/indra/llmessage/llqueryflags.h
index b4f7373..960d777 100644
--- a/linden/indra/llmessage/llqueryflags.h
+++ b/linden/indra/llmessage/llqueryflags.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -64,6 +65,13 @@ const U32 DFQ_LIMIT_BY_AREA		= 0x1 << 21;
 const U32 DFQ_FILTER_MATURE             = 0x1 << 22;
 const U32 DFQ_PG_PARCELS_ONLY   = 0x1 << 23;
+const U32 DFQ_INC_PG                    = 0x1 << 24;    // Flags appear in 1.23 viewer or later
+const U32 DFQ_INC_MATURE        = 0x1 << 25;
+const U32 DFQ_INC_ADULT         = 0x1 << 26;
+const U32 DFQ_INC_NEW_VIEWER    = (DFQ_INC_PG | DFQ_INC_MATURE | DFQ_INC_ADULT);        // Indicates 1.23 viewer or later
+const U32 DFQ_ADULT_SIMS_ONLY   = 0x1 << 27;
 // Sell Type flags
 const U32 ST_AUCTION    = 0x1 << 1;
 const U32 ST_NEWBIE             = 0x1 << 2;
@@ -72,4 +80,29 @@ const U32 ST_ESTATE		= 0x1 << 4;
 const U32 ST_ALL                = 0xFFFFFFFF;
+// status flags embedded in search replay messages of classifieds, events, groups, and places.
+// Places
+const U32 STATUS_SEARCH_PLACES_NONE                             = 0x0;
+const U32 STATUS_SEARCH_PLACES_BANNEDWORD               = 0x1 << 0;
+const U32 STATUS_SEARCH_PLACES_SHORTSTRING              = 0x1 << 1;
+const U32 STATUS_SEARCH_PLACES_FOUNDNONE                = 0x1 << 2;
+const U32 STATUS_SEARCH_PLACES_SEARCHDISABLED   = 0x1 << 3;
+const U32 STATUS_SEARCH_PLACES_ESTATEEMPTY              = 0x1 << 4;
+// Events
+const U32 STATUS_SEARCH_EVENTS_NONE                             = 0x0;
+const U32 STATUS_SEARCH_EVENTS_BANNEDWORD               = 0x1 << 0;
+const U32 STATUS_SEARCH_EVENTS_SHORTSTRING              = 0x1 << 1;
+const U32 STATUS_SEARCH_EVENTS_FOUNDNONE                = 0x1 << 2;
+const U32 STATUS_SEARCH_EVENTS_SEARCHDISABLED   = 0x1 << 3;
+const U32 STATUS_SEARCH_EVENTS_NODATEOFFSET             = 0x1 << 4;
+const U32 STATUS_SEARCH_EVENTS_NOCATEGORY               = 0x1 << 5;
+const U32 STATUS_SEARCH_EVENTS_NOQUERY          = 0x1 << 6;
+//Classifieds
+const U32 STATUS_SEARCH_CLASSIFIEDS_NONE                        = 0x0;
+const U32 STATUS_SEARCH_CLASSIFIEDS_BANNEDWORD          = 0x1 << 0;
+const U32 STATUS_SEARCH_CLASSIFIEDS_SHORTSTRING         = 0x1 << 1;
+const U32 STATUS_SEARCH_CLASSIFIEDS_FOUNDNONE           = 0x1 << 2;
+const U32 STATUS_SEARCH_CLASSIFIEDS_SEARCHDISABLED      = 0x1 << 3;
 #endif
diff --git a/linden/indra/llmessage/llregionflags.h b/linden/indra/llmessage/llregionflags.h
index 4c47199..2324785 100644
--- a/linden/indra/llmessage/llregionflags.h
+++ b/linden/indra/llmessage/llregionflags.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -60,8 +61,10 @@ const U32 REGION_FLAGS_BLOCK_LAND_RESELL		= (1 << 7);
 // All content wiped once per night
 const U32 REGION_FLAGS_SANDBOX                                  = (1 << 8);
 const U32 REGION_FLAGS_NULL_LAYER                               = (1 << 9);
-const U32 REGION_FLAGS_SKIP_AGENT_ACTION                = (1 << 10);
+// const U32 REGION_FLAGS_SKIP_AGENT_ACTION             = (1 << 10);
-const U32 REGION_FLAGS_SKIP_UPDATE_INTEREST_LIST= (1 << 11);
+const U32 REGION_FLAGS_HARD_ALLOW_LAND_TRANSFER = (1 << 10);    // Region allows land reselling
+// const U32 REGION_FLAGS_SKIP_UPDATE_INTEREST_LIST= (1 << 11);
+const U32 REGION_FLAGS_HARD_ALLOW_POST_CLASSIFIED       = (1 << 11);    // Region allows posting of classified ads
 const U32 REGION_FLAGS_SKIP_COLLISIONS                  = (1 << 12); // Pin all non agent rigid bodies
 const U32 REGION_FLAGS_SKIP_SCRIPTS                             = (1 << 13);
 const U32 REGION_FLAGS_SKIP_PHYSICS                             = (1 << 14); // Skip all physics
diff --git a/linden/indra/llmessage/llregionhandle.h b/linden/indra/llmessage/llregionhandle.h
index 80b79cd..da899cd 100644
--- a/linden/indra/llmessage/llregionhandle.h
+++ b/linden/indra/llmessage/llregionhandle.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llregionpresenceverifier.cpp b/linden/indra/llmessage/llregionpresenceverifier.cpp
new file mode 100644
index 0000000..24410a7
--- /dev/null
+++ b/linden/indra/llmessage/llregionpresenceverifier.cpp
@@ -0,0 +1,98 @@
+/** 
+ * @file 
+ * @brief 
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, 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 "llregionpresenceverifier.h"
+#include "llhttpclientinterface.h"
+#include <sstream>
+#include "net.h"
+#include "message.h"
+LLRegionPresenceVerifier::RegionResponder::RegionResponder(ResponsePtr data) : mSharedData(data)
+{
+}
+void LLRegionPresenceVerifier::RegionResponder::result(const LLSD& content)
+{
+        std::string host = content["private_host"].asString();
+        U32 port = content["private_port"].asInteger();
+        LLHost destination(host, port);
+        LLUUID id = content["region_id"];
+        llinfos << "Verifying " << destination.getString() << " is region " << id << llendl;
+        std::stringstream uri;
+        uri << "http://" << destination.getString() << "/state/basic";
+        mSharedData->getHttpClient().get(uri.str(), new VerifiedDestinationResponder(mSharedData, content));
+}
+void LLRegionPresenceVerifier::RegionResponder::completed(
+        U32 status,
+        const std::string& reason,
+        const LLSD& content)
+{
+        LLHTTPClient::Responder::completed(status, reason, content);
+        
+        mSharedData->onCompletedRegionRequest();
+}
+LLRegionPresenceVerifier::VerifiedDestinationResponder::VerifiedDestinationResponder(ResponsePtr data, const LLSD& content) : mSharedData(data), mContent(content)
+{
+}
+void LLRegionPresenceVerifier::VerifiedDestinationResponder::result(const LLSD& content)
+{
+        LLUUID actual_region_id = content["region_id"];
+        LLUUID expected_region_id = mContent["region_id"];
+        if (mSharedData->checkValidity(content))
+        {
+                mSharedData->onRegionVerified(mContent);
+        }
+        else if ((mSharedData->shouldRetry()) && (actual_region_id != expected_region_id)) // If the region is correct, then it means we've deliberately changed the data
+        {
+                LLSD headers;
+                headers["Cache-Control"] = "no-cache, max-age=0";
+                llinfos << "Requesting region information, get uncached for region " << mSharedData->getRegionUri() << llendl;
+                mSharedData->decrementRetries();
+                mSharedData->getHttpClient().get(mSharedData->getRegionUri(), new RegionResponder(mSharedData), headers);
+        }
+        else
+        {
+                llwarns << "Could not correctly look up region from region presence service. Region: " << mSharedData->getRegionUri() << llendl;
+        }
+}
diff --git a/linden/indra/llmessage/llregionpresenceverifier.h b/linden/indra/llmessage/llregionpresenceverifier.h
new file mode 100644
index 0000000..54a7cce
--- /dev/null
+++ b/linden/indra/llmessage/llregionpresenceverifier.h
@@ -0,0 +1,92 @@
+/** 
+ * @file 
+ * @brief 
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-2009, 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$
+ */
+/* Macro Definitions */
+#ifndef LL_LLREGIONPRESENCEVERIFIER_H
+#define LL_LLREGIONPRESENCEVERIFIER_H
+#include "llhttpclient.h"
+#include <string>
+#include "llsd.h"
+#include <boost/shared_ptr.hpp>
+class LLHTTPClientInterface;
+class LLRegionPresenceVerifier
+{
+public:
+        class Response
+        {
+        public:
+                virtual ~Response() {}
+                virtual bool checkValidity(const LLSD& content) const = 0;
+                virtual void onRegionVerified(const LLSD& region_details) = 0;
+                virtual void decrementRetries() = 0;
+                virtual LLHTTPClientInterface& getHttpClient() = 0;
+                virtual std::string getRegionUri() const = 0;
+                virtual bool shouldRetry() const = 0;
+                virtual void onCompletedRegionRequest() {}
+        };
+        typedef boost::shared_ptr<Response> ResponsePtr;
+        class RegionResponder : public LLHTTPClient::Responder
+        {
+        public:
+                RegionResponder(ResponsePtr data);
+                virtual void result(const LLSD& content);
+                virtual void completed(
+                        U32 status,
+                        const std::string& reason,
+                        const LLSD& content);
+        private:
+                ResponsePtr mSharedData;
+        };
+        class VerifiedDestinationResponder : public LLHTTPClient::Responder
+        {
+        public:
+                VerifiedDestinationResponder(ResponsePtr data, const LLSD& content);
+                virtual void result(const LLSD& content);
+        private:
+                ResponsePtr mSharedData;
+                LLSD mContent;
+        };
+};
+#endif //LL_LLREGIONPRESENCEVERIFIER_H
diff --git a/linden/indra/llmessage/llsdappservices.cpp b/linden/indra/llmessage/llsdappservices.cpp
index a051b4f..dc135c5 100644
--- a/linden/indra/llmessage/llsdappservices.cpp
+++ b/linden/indra/llmessage/llsdappservices.cpp
@@ -18,7 +18,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llsdappservices.h b/linden/indra/llmessage/llsdappservices.h
index 71d7c4a..8f145e8 100644
--- a/linden/indra/llmessage/llsdappservices.h
+++ b/linden/indra/llmessage/llsdappservices.h
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llsdhttpserver.cpp b/linden/indra/llmessage/llsdhttpserver.cpp
index 9249d0a..00fc170 100644
--- a/linden/indra/llmessage/llsdhttpserver.cpp
+++ b/linden/indra/llmessage/llsdhttpserver.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llsdhttpserver.h b/linden/indra/llmessage/llsdhttpserver.h
index 432cd59..63ec195 100644
--- a/linden/indra/llmessage/llsdhttpserver.h
+++ b/linden/indra/llmessage/llsdhttpserver.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llsdmessagebuilder.cpp b/linden/indra/llmessage/llsdmessagebuilder.cpp
index d709f91..21937f0 100755
--- a/linden/indra/llmessage/llsdmessagebuilder.cpp
+++ b/linden/indra/llmessage/llsdmessagebuilder.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -267,10 +268,125 @@ void LLSDMessageBuilder::copyFromMessageData(const LLMsgData& data)
                
                for(; dit != dend; ++dit)
                {
-                        //const LLMsgVarData& mvci = *dit;
+                        const LLMsgVarData& mvci = *dit;
+                        const char* varname = mvci.getName();
-                        // TODO: Copy mvci data in to block:
-                        // (*mCurrentBlock)[varname] = v;
+                        switch(mvci.getType())
+                        {
+                        case MVT_FIXED:
+                                addBinaryData(varname, mvci.getData(), mvci.getSize());
+                                break;
+                        case MVT_VARIABLE:
+                                {
+                                        const char end = ((const char*)mvci.getData())[mvci.getSize()-1]; // Ensure null terminated
+                                        if (mvci.getDataSize() == 1 && end == 0) 
+                                        {
+                                                addString(varname, (const char*)mvci.getData());
+                                        }
+                                        else
+                                        {
+                                                addBinaryData(varname, mvci.getData(), mvci.getSize());
+                                        }
+                                        break;
+                                }
+                        case MVT_U8:
+                                addU8(varname, *(U8*)mvci.getData());
+                                break;
+                        case MVT_U16:
+                                addU16(varname, *(U16*)mvci.getData());
+                                break;
+                        case MVT_U32:
+                                addU32(varname, *(U32*)mvci.getData());
+                                break;
+                        case MVT_U64:
+                                addU64(varname, *(U64*)mvci.getData());
+                                break;
+                        case MVT_S8:
+                                addS8(varname, *(S8*)mvci.getData());
+                                break;
+                        case MVT_S16:
+                                addS16(varname, *(S16*)mvci.getData());
+                                break;
+                        case MVT_S32:
+                                addS32(varname, *(S32*)mvci.getData());
+                                break;
+                        // S64 not supported in LLSD so we just truncate it
+                        case MVT_S64:
+                                addS32(varname, *(S64*)mvci.getData());
+                                break;
+                        case MVT_F32:
+                                addF32(varname, *(F32*)mvci.getData());
+                                break;
+                        case MVT_F64:
+                                addF64(varname, *(F64*)mvci.getData());
+                                break;
+                        case MVT_LLVector3:
+                                addVector3(varname, *(LLVector3*)mvci.getData());
+                                break;
+                        case MVT_LLVector3d:
+                                addVector3d(varname, *(LLVector3d*)mvci.getData());
+                                break;
+                        case MVT_LLVector4:
+                                addVector4(varname, *(LLVector4*)mvci.getData());
+                                break;
+                        case MVT_LLQuaternion:
+                                {
+                                        LLVector3 v = *(LLVector3*)mvci.getData();
+                                        LLQuaternion q;
+                                        q.unpackFromVector3(v);
+                                        addQuat(varname, q);
+                                        break;
+                                }
+                        case MVT_LLUUID:
+                                addUUID(varname, *(LLUUID*)mvci.getData());
+                                break;  
+                        case MVT_BOOL:
+                                addBOOL(varname, *(BOOL*)mvci.getData());
+                                break;
+                        case MVT_IP_ADDR:
+                                addIPAddr(varname, *(U32*)mvci.getData());
+                                break;
+                        case MVT_IP_PORT:
+                                addIPPort(varname, *(U16*)mvci.getData());
+                                break;
+                        case MVT_U16Vec3:
+                                //treated as an array of 6 bytes
+                                addBinaryData(varname, mvci.getData(), 6);
+                                break;
+                        case MVT_U16Quat:
+                                //treated as an array of 8 bytes
+                                addBinaryData(varname, mvci.getData(), 8);
+                                break;
+                        case MVT_S16Array:
+                                addBinaryData(varname, mvci.getData(), mvci.getSize());
+                                break;
+                        default:
+                                llwarns << "Unknown type in conversion of message to LLSD" << llendl;
+                                break;
+                        }
                }
        }
 }
diff --git a/linden/indra/llmessage/llsdmessagebuilder.h b/linden/indra/llmessage/llsdmessagebuilder.h
index 3bebef7..ef9ca35 100755
--- a/linden/indra/llmessage/llsdmessagebuilder.h
+++ b/linden/indra/llmessage/llsdmessagebuilder.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llsdmessagereader.cpp b/linden/indra/llmessage/llsdmessagereader.cpp
index 2cf74e8..e699ec9 100755
--- a/linden/indra/llmessage/llsdmessagereader.cpp
+++ b/linden/indra/llmessage/llsdmessagereader.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -107,6 +108,12 @@ void LLSDMessageReader::getBinaryData(const char *block, const char *var,
                data_size = max_size;
        }
        
+        // Calls to memcpy will fail if data_size is not positive.
+        // Phoenix 2009-02-27
+        if(data_size <= 0)
+        {
+                return;
+        }
        memcpy(datap, &(data[0]), data_size);
 }
diff --git a/linden/indra/llmessage/llsdmessagereader.h b/linden/indra/llmessage/llsdmessagereader.h
index 2f824d3..7b38659 100755
--- a/linden/indra/llmessage/llsdmessagereader.h
+++ b/linden/indra/llmessage/llsdmessagereader.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llsdrpcclient.cpp b/linden/indra/llmessage/llsdrpcclient.cpp
index 4b2f069..3f36d23 100644
--- a/linden/indra/llmessage/llsdrpcclient.cpp
+++ b/linden/indra/llmessage/llsdrpcclient.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llsdrpcclient.h b/linden/indra/llmessage/llsdrpcclient.h
index 447af00..7d2d21e 100644
--- a/linden/indra/llmessage/llsdrpcclient.h
+++ b/linden/indra/llmessage/llsdrpcclient.h
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llsdrpcserver.cpp b/linden/indra/llmessage/llsdrpcserver.cpp
index f81f9a8..0c92e7d 100644
--- a/linden/indra/llmessage/llsdrpcserver.cpp
+++ b/linden/indra/llmessage/llsdrpcserver.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llsdrpcserver.h b/linden/indra/llmessage/llsdrpcserver.h
index dd54ad4..9307323 100644
--- a/linden/indra/llmessage/llsdrpcserver.h
+++ b/linden/indra/llmessage/llsdrpcserver.h
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llservice.cpp b/linden/indra/llmessage/llservice.cpp
index d9e70dd..9824c19 100644
--- a/linden/indra/llmessage/llservice.cpp
+++ b/linden/indra/llmessage/llservice.cpp
@@ -18,7 +18,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llservice.h b/linden/indra/llmessage/llservice.h
index 0e37221..ab5abe0 100644
--- a/linden/indra/llmessage/llservice.h
+++ b/linden/indra/llmessage/llservice.h
@@ -19,7 +19,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llservicebuilder.cpp b/linden/indra/llmessage/llservicebuilder.cpp
index 39f2f85..3f07147 100644
--- a/linden/indra/llmessage/llservicebuilder.cpp
+++ b/linden/indra/llmessage/llservicebuilder.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -85,6 +86,14 @@ void LLServiceBuilder::createServiceDefinition(
        }
 }
+static
+bool starts_with(const std::string& text, const char* prefix)
+{
+        return text.substr(0, strlen(prefix)) == prefix;
+}
+// TODO: Build a real services.xml for windows development.
+//       and remove the base_url logic below.
 std::string LLServiceBuilder::buildServiceURI(const std::string& service_name)
 {
        std::ostringstream service_url;
@@ -95,7 +104,19 @@ std::string LLServiceBuilder::buildServiceURI(const std::string& service_name)
                LLApp* app = LLApp::instance();
                if(app)
                {
-                        LLSD base_url = app->getOption("services-base-url");
+                        // We define a base-url for some development configurations
+                        // In production neither of these are defined and all services have full urls
+                        LLSD base_url;
+                        if (starts_with(service_name,"cap"))
+                        {
+                                base_url = app->getOption("cap-base-url");
+                        }
+                        if (base_url.asString().empty())
+                        {
+                                base_url = app->getOption("services-base-url");
+                        }
                        service_url << base_url.asString();
                }
                service_url << mServiceMap[service_name];
diff --git a/linden/indra/llmessage/llservicebuilder.h b/linden/indra/llmessage/llservicebuilder.h
index 9b4c925..40061a0 100644
--- a/linden/indra/llmessage/llservicebuilder.h
+++ b/linden/indra/llmessage/llservicebuilder.h
@@ -17,7 +17,8 @@
 * 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
+* 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,
diff --git a/linden/indra/llmessage/network.cpp b/linden/indra/llmessage/llstoredmessage.cpp
index a5c5ea4..32cbb15 100644
--- a/linden/indra/llmessage/network.cpp
+++ b/linden/indra/llmessage/llstoredmessage.cpp
@@ -1,10 +1,10 @@
 /** 
- * @file network.cpp
+ * @file 
- * @brief Legacy file
+ * @brief 
 *
- * $LicenseInfo:firstyear=2000&license=viewergpl$
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
 * 
- * Copyright (c) 2000-2009, Linden Research, Inc.
+ * Copyright (c) 2009, Linden Research, Inc.
 * 
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -29,3 +30,9 @@
 * $/LicenseInfo$
 */
+#include "llstoredmessage.h"
+LLStoredMessage::LLStoredMessage(const std::string& name, const LLSD& message) : mMessage(message), mName(name)
+{
+}
diff --git a/linden/indra/llmessage/llstoredmessage.h b/linden/indra/llmessage/llstoredmessage.h
new file mode 100644
index 0000000..5069c2c
--- /dev/null
+++ b/linden/indra/llmessage/llstoredmessage.h
@@ -0,0 +1,58 @@
+/** 
+ * @file 
+ * @brief 
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, 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_STOREDMESSAGE_H
+#define LL_STOREDMESSAGE_H
+#include "linden_common.h"
+#include "llsd.h"
+#include <boost/shared_ptr.hpp>
+#include <string>
+class LLMessageSystem;
+class LLStoredMessage
+{
+public:
+        LLStoredMessage(const std::string& name, const LLSD& message);
+private:
+        friend class LLMessageSystem;
+        LLSD mMessage;
+        std::string mName;
+};
+typedef boost::shared_ptr<LLStoredMessage> LLStoredMessagePtr;
+#endif // LL_STOREDMESSAGE_H
diff --git a/linden/indra/llmessage/lltaskname.h b/linden/indra/llmessage/lltaskname.h
index cae642d..401d355 100644
--- a/linden/indra/llmessage/lltaskname.h
+++ b/linden/indra/llmessage/lltaskname.h
@@ -18,7 +18,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llteleportflags.h b/linden/indra/llmessage/llteleportflags.h
index 1eb5a74..c418865 100644
--- a/linden/indra/llmessage/llteleportflags.h
+++ b/linden/indra/llmessage/llteleportflags.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lltemplatemessagebuilder.cpp b/linden/indra/llmessage/lltemplatemessagebuilder.cpp
index 2d8f3cf..e641980 100644
--- a/linden/indra/llmessage/lltemplatemessagebuilder.cpp
+++ b/linden/indra/llmessage/lltemplatemessagebuilder.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -40,7 +41,7 @@
 #include "v3math.h"
 #include "v4math.h"
-LLTemplateMessageBuilder::LLTemplateMessageBuilder(message_template_name_map_t& name_template_map) :
+LLTemplateMessageBuilder::LLTemplateMessageBuilder(const message_template_name_map_t& name_template_map) :
        mCurrentSMessageData(NULL),
        mCurrentSMessageTemplate(NULL),
        mCurrentSDataBlock(NULL),
@@ -74,14 +75,14 @@ void LLTemplateMessageBuilder::newMessage(const char *name)
        char* namep = (char*)name; 
        if (mMessageTemplates.count(namep) > 0)
        {
-                mCurrentSMessageTemplate = mMessageTemplates[namep];
+                mCurrentSMessageTemplate = mMessageTemplates.find(name)->second;
                mCurrentSMessageData = new LLMsgData(namep);
                mCurrentSMessageName = namep;
                mCurrentSDataBlock = NULL;
                mCurrentSBlockName = NULL;
                // add at one of each block
-                const LLMessageTemplate* msg_template = mMessageTemplates[namep];
+                const LLMessageTemplate* msg_template = mMessageTemplates.find(name)->second;
                if (msg_template->getDeprecation() != MD_NOTDEPRECATED)
                {
diff --git a/linden/indra/llmessage/lltemplatemessagebuilder.h b/linden/indra/llmessage/lltemplatemessagebuilder.h
index f4048fa..96e7ae1 100644
--- a/linden/indra/llmessage/lltemplatemessagebuilder.h
+++ b/linden/indra/llmessage/lltemplatemessagebuilder.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -48,7 +49,7 @@ public:
        
        typedef std::map<const char* , LLMessageTemplate*> message_template_name_map_t;
-        LLTemplateMessageBuilder(message_template_name_map_t&);
+        LLTemplateMessageBuilder(const message_template_name_map_t&);
        virtual ~LLTemplateMessageBuilder();
        virtual void newMessage(const char* name);
@@ -98,6 +99,7 @@ public:
        virtual void copyFromMessageData(const LLMsgData& data);
        virtual void copyFromLLSD(const LLSD&);
+        LLMsgData* getCurrentMessage() const { return mCurrentSMessageData; }
 private:
        void addData(const char* varname, const void* data, 
                                         EMsgVariableType type, S32 size);
@@ -113,7 +115,7 @@ private:
        BOOL mbSBuilt;
        BOOL mbSClear;
        S32      mCurrentSendTotal;
-        message_template_name_map_t& mMessageTemplates;
+        const message_template_name_map_t& mMessageTemplates;
 };
 #endif // LL_LLTEMPLATEMESSAGEBUILDER_H
diff --git a/linden/indra/llmessage/lltemplatemessagedispatcher.cpp b/linden/indra/llmessage/lltemplatemessagedispatcher.cpp
new file mode 100644
index 0000000..ab1beb3
--- /dev/null
+++ b/linden/indra/llmessage/lltemplatemessagedispatcher.cpp
@@ -0,0 +1,73 @@
+/**
+ * @file lltemplatemessagedispatcher.h
+ * @brief LLTemplateMessageDispatcher class
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, 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 "lltemplatemessagedispatcher.h"
+#include "llhttpnode.h"
+#include "llhost.h"
+#include "message.h"
+#include "llsd.h"
+#include "lltemplatemessagereader.h"
+LLTemplateMessageDispatcher::LLTemplateMessageDispatcher(LLTemplateMessageReader &template_message_reader) :
+        mTemplateMessageReader(template_message_reader)
+{
+}
+void LLTemplateMessageDispatcher::dispatch(const std::string& msg_name,
+                                                                                   const LLSD& message,
+                                                                                   LLHTTPNode::ResponsePtr responsep)
+{
+        std::vector<U8> data = message["body"]["binary-template-data"].asBinary();
+        U32 size = data.size();
+        if(size == 0)
+        {
+                return;
+        }
+        LLHost host;
+        host = gMessageSystem->getSender();
+        bool validate_message = mTemplateMessageReader.validateMessage(&(data[0]), data.size(), host, true);
+        if (validate_message)
+        {
+                mTemplateMessageReader.readMessage(&(data[0]),host);
+        } 
+        else 
+        {
+                gMessageSystem->clearReceiveState();
+        }
+}
diff --git a/linden/indra/llmessage/lltemplatemessagedispatcher.h b/linden/indra/llmessage/lltemplatemessagedispatcher.h
new file mode 100644
index 0000000..fa861e4
--- /dev/null
+++ b/linden/indra/llmessage/lltemplatemessagedispatcher.h
@@ -0,0 +1,54 @@
+/**
+ * @file lltemplatemessagedispatcher.h
+ * @brief LLTemplateMessageDispatcher class
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, 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 LLTEMPLATEMESSAGEDISPATCHER_H
+#define LLTEMPLATEMESSAGEDISPATCHER_H
+#include "linden_common.h"
+#include "llsd.h"
+#include "llhttpnode.h"
+#include "lltemplatemessagereader.h"
+class LLTemplateMessageDispatcher
+{
+public:
+        LLTemplateMessageDispatcher(LLTemplateMessageReader& template_message_reader);
+        void dispatch(const std::string& msg_name,
+                                  const LLSD& message,
+                                  LLHTTPNode::ResponsePtr responsep);
+private:
+        LLTemplateMessageReader &mTemplateMessageReader;
+};
+#endif // LLTEMPLATEMESSAGEDISPATCHER_H
diff --git a/linden/indra/llmessage/lltemplatemessagereader.cpp b/linden/indra/llmessage/lltemplatemessagereader.cpp
index 7a7d3bb..af04956 100644
--- a/linden/indra/llmessage/lltemplatemessagereader.cpp
+++ b/linden/indra/llmessage/lltemplatemessagereader.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -181,15 +182,15 @@ S32 LLTemplateMessageReader::getSize(const char *blockname, const char *varname)
 {
        // is there a message ready to go?
        if (mReceiveSize == -1)
-        {
+        {       // This is a serious error - crash 
                llerrs << "No message waiting for decode 4!" << llendl;
-                return -1;
+                return LL_MESSAGE_ERROR;
        }
        if (!mCurrentRMessageData)
-        {
+        {       // This is a serious error - crash
                llerrs << "Invalid mCurrentRMessageData in getData!" << llendl;
-                return -1;
+                return LL_MESSAGE_ERROR;
        }
        char *bnamep = (char *)blockname; 
@@ -197,10 +198,10 @@ S32 LLTemplateMessageReader::getSize(const char *blockname, const char *varname)
        LLMsgData::msg_blk_data_map_t::const_iterator iter = mCurrentRMessageData->mMemberBlocks.find(bnamep);
        
        if (iter == mCurrentRMessageData->mMemberBlocks.end())
-        {
+        {       // don't crash
-                llerrs << "Block " << bnamep << " not in message "
+                llinfos << "Block " << bnamep << " not in message "
                        << mCurrentRMessageData->mName << llendl;
-                return -1;
+                return LL_BLOCK_NOT_IN_MESSAGE;
        }
        char *vnamep = (char *)varname; 
@@ -209,17 +210,17 @@ S32 LLTemplateMessageReader::getSize(const char *blockname, const char *varname)
        LLMsgVarData& vardata = msg_data->mMemberVarData[vnamep];
        
        if (!vardata.getName())
-        {
+        {       // don't crash
-                llerrs << "Variable " << varname << " not in message "
+                llinfos << "Variable " << varname << " not in message "
                        << mCurrentRMessageData->mName << " block " << bnamep << llendl;
-                return -1;
+                return LL_VARIABLE_NOT_IN_BLOCK;
        }
        if (mCurrentRMessageTemplate->mMemberBlocks[bnamep]->mType != MBT_SINGLE)
-        {
+        {       // This is a serious error - crash
                llerrs << "Block " << bnamep << " isn't type MBT_SINGLE,"
                        " use getSize with blocknum argument!" << llendl;
-                return -1;
+                return LL_MESSAGE_ERROR;
        }
        return vardata.getSize();
@@ -229,15 +230,15 @@ S32 LLTemplateMessageReader::getSize(const char *blockname, S32 blocknum, const
 {
        // is there a message ready to go?
        if (mReceiveSize == -1)
-        {
+        {       // This is a serious error - crash
                llerrs << "No message waiting for decode 5!" << llendl;
-                return -1;
+                return LL_MESSAGE_ERROR;
        }
        if (!mCurrentRMessageData)
-        {
+        {       // This is a serious error - crash
                llerrs << "Invalid mCurrentRMessageData in getData!" << llendl;
-                return -1;
+                return LL_MESSAGE_ERROR;
        }
        char *bnamep = (char *)blockname + blocknum; 
@@ -246,20 +247,20 @@ S32 LLTemplateMessageReader::getSize(const char *blockname, S32 blocknum, const
        LLMsgData::msg_blk_data_map_t::const_iterator iter = mCurrentRMessageData->mMemberBlocks.find(bnamep);
        
        if (iter == mCurrentRMessageData->mMemberBlocks.end())
-        {
+        {       // don't crash
-                llerrs << "Block " << bnamep << " not in message "
+                llinfos << "Block " << bnamep << " not in message " 
                        << mCurrentRMessageData->mName << llendl;
-                return -1;
+                return LL_BLOCK_NOT_IN_MESSAGE;
        }
        LLMsgBlkData* msg_data = iter->second;
        LLMsgVarData& vardata = msg_data->mMemberVarData[vnamep];
        
        if (!vardata.getName())
-        {
+        {       // don't crash
-                llerrs << "Variable " << vnamep << " not in message "
+                llinfos << "Variable " << vnamep << " not in message "
                        <<  mCurrentRMessageData->mName << " block " << bnamep << llendl;
-                return -1;
+                return LL_VARIABLE_NOT_IN_BLOCK;
        }
        return vardata.getSize();
@@ -754,18 +755,38 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
 BOOL LLTemplateMessageReader::validateMessage(const U8* buffer, 
                                                                                          S32 buffer_size, 
-                                                                                          const LLHost& sender)
+                                                                                          const LLHost& sender,
+                                                                                          bool trusted)
 {
        mReceiveSize = buffer_size;
-        BOOL result = decodeTemplate(buffer, buffer_size, &mCurrentRMessageTemplate );
+        BOOL valid = decodeTemplate(buffer, buffer_size, &mCurrentRMessageTemplate );
-        if(result)
+        if(valid)
        {
                mCurrentRMessageTemplate->mReceiveCount++;
-                //lldebugs << "MessageRecvd:" 
+                //lldebugs << "MessageRecvd:"
                //                                               << mCurrentRMessageTemplate->mName 
                //                                               << " from " << sender << llendl;
        }
-        return result;
+        if (valid && isBanned(trusted))
+        {
+                LL_WARNS("Messaging") << "LLMessageSystem::checkMessages "
+                        << "received banned message "
+                        << getMessageName()
+                        << " from "
+                        << ((trusted) ? "trusted " : "untrusted ")
+                        << sender << llendl;
+                valid = FALSE;
+        }
+        if(valid && isUdpBanned())
+        {
+                llwarns << "Received UDP black listed message "
+                                <<  getMessageName()
+                                << " from " << sender << llendl;
+                valid = FALSE;
+        }
+        return valid;
 }
 BOOL LLTemplateMessageReader::readMessage(const U8* buffer, 
diff --git a/linden/indra/llmessage/lltemplatemessagereader.h b/linden/indra/llmessage/lltemplatemessagereader.h
index 15b2a91..ab06ab4 100644
--- a/linden/indra/llmessage/lltemplatemessagereader.h
+++ b/linden/indra/llmessage/lltemplatemessagereader.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -104,7 +105,7 @@ public:
        virtual void copyToBuilder(LLMessageBuilder&) const;
        BOOL validateMessage(const U8* buffer, S32 buffer_size, 
-                                                 const LLHost& sender);
+                                                 const LLHost& sender, bool trusted = false);
        BOOL readMessage(const U8* buffer, const LLHost& sender);
        bool isTrusted() const;
diff --git a/linden/indra/llmessage/llthrottle.cpp b/linden/indra/llmessage/llthrottle.cpp
index 78258f5..70279a3 100644
--- a/linden/indra/llmessage/llthrottle.cpp
+++ b/linden/indra/llmessage/llthrottle.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llthrottle.h b/linden/indra/llmessage/llthrottle.h
index 7e2d024..7d1679b 100644
--- a/linden/indra/llmessage/llthrottle.h
+++ b/linden/indra/llmessage/llthrottle.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lltransfermanager.cpp b/linden/indra/llmessage/lltransfermanager.cpp
index 2c08163..d67911e 100644
--- a/linden/indra/llmessage/lltransfermanager.cpp
+++ b/linden/indra/llmessage/lltransfermanager.cpp
@@ -18,7 +18,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lltransfermanager.h b/linden/indra/llmessage/lltransfermanager.h
index ef5f530..0bb52f1 100644
--- a/linden/indra/llmessage/lltransfermanager.h
+++ b/linden/indra/llmessage/lltransfermanager.h
@@ -18,7 +18,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lltransfersourceasset.cpp b/linden/indra/llmessage/lltransfersourceasset.cpp
index b9354ec..a4d5927 100644
--- a/linden/indra/llmessage/lltransfersourceasset.cpp
+++ b/linden/indra/llmessage/lltransfersourceasset.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lltransfersourceasset.h b/linden/indra/llmessage/lltransfersourceasset.h
index e372730..70b09b6 100644
--- a/linden/indra/llmessage/lltransfersourceasset.h
+++ b/linden/indra/llmessage/lltransfersourceasset.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lltransfersourcefile.cpp b/linden/indra/llmessage/lltransfersourcefile.cpp
index 795434a..ec0eaf1 100644
--- a/linden/indra/llmessage/lltransfersourcefile.cpp
+++ b/linden/indra/llmessage/lltransfersourcefile.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lltransfersourcefile.h b/linden/indra/llmessage/lltransfersourcefile.h
index b095b7c..004a3ee 100644
--- a/linden/indra/llmessage/lltransfersourcefile.h
+++ b/linden/indra/llmessage/lltransfersourcefile.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lltransfertargetfile.cpp b/linden/indra/llmessage/lltransfertargetfile.cpp
index 6d1aac5..445e4f1 100644
--- a/linden/indra/llmessage/lltransfertargetfile.cpp
+++ b/linden/indra/llmessage/lltransfertargetfile.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lltransfertargetfile.h b/linden/indra/llmessage/lltransfertargetfile.h
index 52c4ebb..18b9b52 100644
--- a/linden/indra/llmessage/lltransfertargetfile.h
+++ b/linden/indra/llmessage/lltransfertargetfile.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lltransfertargetvfile.cpp b/linden/indra/llmessage/lltransfertargetvfile.cpp
index f6c272e..e9bf2ba 100644
--- a/linden/indra/llmessage/lltransfertargetvfile.cpp
+++ b/linden/indra/llmessage/lltransfertargetvfile.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lltransfertargetvfile.h b/linden/indra/llmessage/lltransfertargetvfile.h
index c1011ca..8c2bc7e 100644
--- a/linden/indra/llmessage/lltransfertargetvfile.h
+++ b/linden/indra/llmessage/lltransfertargetvfile.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lltrustedmessageservice.cpp b/linden/indra/llmessage/lltrustedmessageservice.cpp
new file mode 100644
index 0000000..505ece5
--- /dev/null
+++ b/linden/indra/llmessage/lltrustedmessageservice.cpp
@@ -0,0 +1,90 @@
+/**
+ * @file lltrustedmessageservice.cpp
+ * @brief LLTrustedMessageService implementation
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, 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 "lltrustedmessageservice.h"
+#include "llhost.h"
+#include "llmessageconfig.h"
+#include "message.h"
+bool LLTrustedMessageService::validate(const std::string& name, LLSD& context)
+const
+{
+        return true;
+}
+void LLTrustedMessageService::post(LLHTTPNode::ResponsePtr response,
+                                                                   const LLSD& context,
+                                                                   const LLSD& input) const
+{
+        std::string name = context["request"]["wildcard"]["message-name"];
+        std::string senderIP = context["request"]["remote-host"];
+        std::string senderPort = context["request"]["headers"]
+                ["x-secondlife-udp-listen-port"];
+        LLSD message_data;
+        std::string sender = senderIP + ":" + senderPort;
+        message_data["sender"] = sender;
+        message_data["body"] = input;
+        
+        // untrusted senders should not have access to the trusted message
+        // service, but this can happen in development, so check and warn
+        LLMessageConfig::SenderTrust trust =
+                LLMessageConfig::getSenderTrustedness(name);
+        if ((trust == LLMessageConfig::TRUSTED ||
+                 (trust == LLMessageConfig::NOT_SET &&
+                  gMessageSystem->isTrustedMessage(name)))
+                 && !gMessageSystem->isTrustedSender(LLHost(sender)))
+        {
+                LL_WARNS("Messaging") << "trusted message POST to /trusted-message/" 
+                                << name << " from unknown or untrusted sender "
+                                << sender << llendl;
+                response->status(403, "Unknown or untrusted sender");
+        }
+        else
+        {
+                gMessageSystem->receivedMessageFromTrustedSender();
+                if (input.has("binary-template-data"))
+                {
+                        llinfos << "Dispatching template: " << input << llendl;
+                        // try and send this message using udp dispatch
+                        LLMessageSystem::dispatchTemplate(name, message_data, response);
+                }
+                else
+                {
+                        llinfos << "Dispatching without template: " << input << llendl;
+                        LLMessageSystem::dispatch(name, message_data, response);
+                }
+        }
+}
diff --git a/linden/indra/llmessage/lltrustedmessageservice.h b/linden/indra/llmessage/lltrustedmessageservice.h
new file mode 100644
index 0000000..dc37702
--- /dev/null
+++ b/linden/indra/llmessage/lltrustedmessageservice.h
@@ -0,0 +1,52 @@
+/**
+ * @file lltrustedmessageservice.h
+ * @brief LLTrustedMessageService class
+ *
+ * $LicenseInfo:firstyear=2009&license=viewergpl$
+ * 
+ * Copyright (c) 2009, 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 LLTRUSTEDMESSAGESERVICE_H
+#define LLTRUSTEDMESSAGESERVICE_H
+#include "linden_common.h"
+#include "llhttpnode.h"
+class LLSD;
+class LLTrustedMessageService
+{
+public:
+        bool validate(const std::string& name, LLSD& context) const;
+        
+        void post(LLHTTPNode::ResponsePtr response,
+                          const LLSD& context,
+                          const LLSD& input) const;
+};
+#endif // LLTRUSTEDMESSAGESERVICE_H
diff --git a/linden/indra/llmessage/llurlrequest.cpp b/linden/indra/llmessage/llurlrequest.cpp
index d2f854e..46e976f 100644
--- a/linden/indra/llmessage/llurlrequest.cpp
+++ b/linden/indra/llmessage/llurlrequest.cpp
@@ -19,7 +19,8 @@
 * 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
+ * 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,
@@ -43,7 +44,7 @@
 #include "llsd.h"
 #include "llstring.h"
 #include "apr_env.h"
+#include "llapr.h"
 static const U32 HTTP_STATUS_PIPE_ERROR = 499;
 /**
@@ -165,18 +166,16 @@ void LLURLRequest::useProxy(bool use_proxy)
    if (use_proxy && (env_proxy == NULL))
    {
        apr_status_t status;
-        apr_pool_t* pool;
+        LLAPRPool pool;
-        apr_pool_create(&pool, NULL);
+                status = apr_env_get(&env_proxy, "ALL_PROXY", pool.getAPRPool());
-        status = apr_env_get(&env_proxy, "ALL_PROXY", pool);
        if (status != APR_SUCCESS)
        {
-            status = apr_env_get(&env_proxy, "http_proxy", pool);
+                        status = apr_env_get(&env_proxy, "http_proxy", pool.getAPRPool());
        }
        if (status != APR_SUCCESS)
        {
           use_proxy = FALSE;
        }
-        apr_pool_destroy(pool);
    }
@@ -501,33 +500,25 @@ static size_t headerCallback(void* data, size_t size, size_t nmemb, void* user)
        std::string header(header_line, header_len);
        // Per HTTP spec the first header line must be the status line.
-        if (!complete->haveHTTPStatus())
+        if (header.substr(0,5) == "HTTP/")
        {
-                if (header.substr(0,5) == "HTTP/")
+                std::string::iterator end = header.end();
+                std::string::iterator pos1 = std::find(header.begin(), end, ' ');
+                if (pos1 != end) ++pos1;
+                std::string::iterator pos2 = std::find(pos1, end, ' ');
+                if (pos2 != end) ++pos2;
+                std::string::iterator pos3 = std::find(pos2, end, '\r');
+                std::string version(header.begin(), pos1);
+                std::string status(pos1, pos2);
+                std::string reason(pos2, pos3);
+                S32 status_code = atoi(status.c_str());
+                if (status_code > 0)
                {
-                        std::string::iterator end = header.end();
+                        complete->httpStatus((U32)status_code, reason);
-                        std::string::iterator pos1 = std::find(header.begin(), end, ' ');
+                        return header_len;
-                        if (pos1 != end) ++pos1;
-                        std::string::iterator pos2 = std::find(pos1, end, ' ');
-                        if (pos2 != end) ++pos2;
-                        std::string::iterator pos3 = std::find(pos2, end, '\r');
-                        std::string version(header.begin(), pos1);
-                        std::string status(pos1, pos2);
-                        std::string reason(pos2, pos3);
-                        int statusCode = atoi(status.c_str());
-                        if (statusCode >= 300 && statusCode < 400)
-                        {
-                                // This is a redirect, ignore it and all headers
-                                // until we find a normal status code.
-                        }
-                        else if (statusCode > 0)
-                        {
-                                complete->httpStatus((U32)statusCode, reason);
-                        }
                }
-                return header_len;
        }
        std::string::iterator sep = std::find(header.begin(),header.end(),':');
@@ -592,8 +583,7 @@ LLIOPipe::EStatus LLContextURLExtractor::process_impl(
 * LLURLRequestComplete
 */
 LLURLRequestComplete::LLURLRequestComplete() :
-        mRequestStatus(LLIOPipe::STATUS_ERROR),
+        mRequestStatus(LLIOPipe::STATUS_ERROR)
-        mHaveHTTPStatus(false)
 {
        LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST);
 }
@@ -610,12 +600,6 @@ void LLURLRequestComplete::header(const std::string& header, const std::string&
 }
 //virtual 
-void LLURLRequestComplete::httpStatus(U32 status, const std::string& reason)
-{
-        mHaveHTTPStatus = true;
-}
-//virtual 
 void LLURLRequestComplete::complete(const LLChannelDescriptors& channels,
                const buffer_ptr_t& buffer)
 {
diff --git a/linden/indra/llmessage/llurlrequest.h b/linden/indra/llmessage/llurlrequest.h
index c76eec8..d1facbf 100644
--- a/linden/indra/llmessage/llurlrequest.h
+++ b/linden/indra/llmessage/llurlrequest.h
@@ -19,7 +19,8 @@
 * 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
+ * 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,
@@ -286,11 +287,13 @@ class LLURLRequestComplete : public LLIOPipe
 {
 public:
        
+        // Called once for each header received, except status lines
        virtual void header(const std::string& header, const std::string& value);
-            ///< Called once for each header received, prior to httpStatus
-        virtual void httpStatus(U32 status, const std::string& reason);
+        // May be called more than once, particularly for redirects and proxy madness.
-            ///< Always called on request completion, prior to complete
+        // Ex. a 200 for a connection to https through a proxy, followed by the "real" status
+        //     a 3xx for a redirect followed by a "real" status, or more redirects.
+        virtual void httpStatus(U32 status, const std::string& reason) { }
        virtual void complete(
                const LLChannelDescriptors& channels,
@@ -327,9 +330,6 @@ public:
        LLURLRequestComplete();
        virtual ~LLURLRequestComplete();
-        // The first line of an http response must be the status line
-        // true if we have already parsed this line.
-        bool haveHTTPStatus() const { return mHaveHTTPStatus; }
 protected:
        /* @name LLIOPipe virtual implementations
         */
@@ -348,8 +348,6 @@ protected:
        // value to note if we actually got the response. This value
        // depends on correct useage from the LLURLRequest instance.
        EStatus mRequestStatus;
-        bool mHaveHTTPStatus;
 };
diff --git a/linden/indra/llmessage/lluseroperation.cpp b/linden/indra/llmessage/lluseroperation.cpp
index 4d34e48..9736efe 100644
--- a/linden/indra/llmessage/lluseroperation.cpp
+++ b/linden/indra/llmessage/lluseroperation.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/lluseroperation.h b/linden/indra/llmessage/lluseroperation.h
index 814e6bf..b3988c0 100644
--- a/linden/indra/llmessage/lluseroperation.h
+++ b/linden/indra/llmessage/lluseroperation.h
@@ -18,7 +18,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llvehicleparams.h b/linden/indra/llmessage/llvehicleparams.h
index d37a83f..a839171 100644
--- a/linden/indra/llmessage/llvehicleparams.h
+++ b/linden/indra/llmessage/llvehicleparams.h
@@ -18,7 +18,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llxfer.cpp b/linden/indra/llmessage/llxfer.cpp
index 6fdd399..8404f65 100644
--- a/linden/indra/llmessage/llxfer.cpp
+++ b/linden/indra/llmessage/llxfer.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llxfer.h b/linden/indra/llmessage/llxfer.h
index 85b3122..bd81462 100644
--- a/linden/indra/llmessage/llxfer.h
+++ b/linden/indra/llmessage/llxfer.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llxfer_file.cpp b/linden/indra/llmessage/llxfer_file.cpp
index c7bab07..80bea37 100644
--- a/linden/indra/llmessage/llxfer_file.cpp
+++ b/linden/indra/llmessage/llxfer_file.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llxfer_file.h b/linden/indra/llmessage/llxfer_file.h
index 0b3ee79..df29135 100644
--- a/linden/indra/llmessage/llxfer_file.h
+++ b/linden/indra/llmessage/llxfer_file.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llxfer_mem.cpp b/linden/indra/llmessage/llxfer_mem.cpp
index 64889a2..0d81fd5 100644
--- a/linden/indra/llmessage/llxfer_mem.cpp
+++ b/linden/indra/llmessage/llxfer_mem.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llxfer_mem.h b/linden/indra/llmessage/llxfer_mem.h
index b98e8e9..fa1b4cf 100644
--- a/linden/indra/llmessage/llxfer_mem.h
+++ b/linden/indra/llmessage/llxfer_mem.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llxfer_vfile.cpp b/linden/indra/llmessage/llxfer_vfile.cpp
index 288c5ff..625cf4a 100644
--- a/linden/indra/llmessage/llxfer_vfile.cpp
+++ b/linden/indra/llmessage/llxfer_vfile.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llxfer_vfile.h b/linden/indra/llmessage/llxfer_vfile.h
index e07326f..8f5b193 100644
--- a/linden/indra/llmessage/llxfer_vfile.h
+++ b/linden/indra/llmessage/llxfer_vfile.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llxfermanager.cpp b/linden/indra/llmessage/llxfermanager.cpp
index eea814c..08c9192 100644
--- a/linden/indra/llmessage/llxfermanager.cpp
+++ b/linden/indra/llmessage/llxfermanager.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llxfermanager.h b/linden/indra/llmessage/llxfermanager.h
index 1022bbe..0a83f84 100644
--- a/linden/indra/llmessage/llxfermanager.h
+++ b/linden/indra/llmessage/llxfermanager.h
@@ -18,7 +18,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llxorcipher.cpp b/linden/indra/llmessage/llxorcipher.cpp
index 7b1c7af..fbcd893 100644
--- a/linden/indra/llmessage/llxorcipher.cpp
+++ b/linden/indra/llmessage/llxorcipher.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/llxorcipher.h b/linden/indra/llmessage/llxorcipher.h
index 434c88d..ef2bfd6 100644
--- a/linden/indra/llmessage/llxorcipher.h
+++ b/linden/indra/llmessage/llxorcipher.h
@@ -16,7 +16,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/machine.h b/linden/indra/llmessage/machine.h
index 212334e..63a0381 100644
--- a/linden/indra/llmessage/machine.h
+++ b/linden/indra/llmessage/machine.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/mean_collision_data.h b/linden/indra/llmessage/mean_collision_data.h
index c7df839..03b96f9 100644
--- a/linden/indra/llmessage/mean_collision_data.h
+++ b/linden/indra/llmessage/mean_collision_data.h
@@ -18,7 +18,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index ccc3d79..78af35b 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -58,13 +59,16 @@
 #include "llerrorlegacy.h"
 #include "llfasttimer.h"
 #include "llhttpclient.h"
+#include "llhttpnodeadapter.h"
 #include "llhttpsender.h"
 #include "llmd5.h"
 #include "llmessagebuilder.h"
 #include "llmessageconfig.h"
+#include "lltemplatemessagedispatcher.h"
 #include "llpumpio.h"
 #include "lltemplatemessagebuilder.h"
 #include "lltemplatemessagereader.h"
+#include "lltrustedmessageservice.h"
 #include "llmessagetemplate.h"
 #include "llmessagetemplateparser.h"
 #include "llsd.h"
@@ -141,52 +145,6 @@ namespace
        };
 }
-class LLTrustedMessageService : public LLHTTPNode
-{
-        virtual bool validate(const std::string& name, LLSD& context) const
-                { return true; }
-        virtual void post(LLHTTPNode::ResponsePtr response,
-                                          const LLSD& context,
-                                          const LLSD& input) const;
-};
-//virtual
-void LLTrustedMessageService::post(LLHTTPNode::ResponsePtr response,
-                                                                   const LLSD& context,
-                                                                   const LLSD& input) const
-{
-        std::string name = context["request"]["wildcard"]["message-name"];
-        std::string senderIP = context["request"]["remote-host"];
-        std::string senderPort = context["request"]["headers"]
-                ["x-secondlife-udp-listen-port"];
-        LLSD message_data;
-        std::string sender = senderIP + ":" + senderPort;
-        message_data["sender"] = sender;
-        message_data["body"] = input;
-        
-        // untrusted senders should not have access to the trusted message
-        // service, but this can happen in development, so check and warn
-        LLMessageConfig::SenderTrust trust =
-                LLMessageConfig::getSenderTrustedness(name);
-        if ((trust == LLMessageConfig::TRUSTED ||
-                 (trust == LLMessageConfig::NOT_SET &&
-                  gMessageSystem->isTrustedMessage(name)))
-                 && !gMessageSystem->isTrustedSender(LLHost(sender)))
-        {
-                LL_WARNS("Messaging") << "trusted message POST to /trusted-message/" 
-                                << name << " from unknown or untrusted sender "
-                                << sender << llendl;
-                response->status(403, "Unknown or untrusted sender");
-        }
-        else
-        {
-                LLMessageSystem::dispatch(name, message_data, response);
-        }
-}
 class LLMessageHandlerBridge : public LLHTTPNode
 {
        virtual bool validate(const std::string& name, LLSD& context) const
@@ -222,9 +180,6 @@ void LLMessageHandlerBridge::post(LLHTTPNode::ResponsePtr response,
 LLHTTPRegistration<LLMessageHandlerBridge>
        gHTTPRegistrationMessageWildcard("/message/<message-name>");
-LLHTTPRegistration<LLTrustedMessageService>
-        gHTTPRegistrationTrustedMessageWildcard("/trusted-message/<message-name>");
 //virtual
 LLUseCircuitCodeResponder::~LLUseCircuitCodeResponder()
 {
@@ -290,7 +245,10 @@ LLMessageSystem::LLMessageSystem(const std::string& filename, U32 port,
                                                                 S32 version_major,
                                                                 S32 version_minor,
                                                                 S32 version_patch,
-                                                                 bool failure_is_fatal)
+                                                                 bool failure_is_fatal,
+                                                                 const F32 circuit_heartbeat_interval, const F32 circuit_timeout) :
+        mCircuitInfo(circuit_heartbeat_interval, circuit_timeout),
+        mLastMessageFromTrustedMessageService(false)
 {
        init();
@@ -303,6 +261,9 @@ LLMessageSystem::LLMessageSystem(const std::string& filename, U32 port,
        // default to not accepting packets from not alive circuits
        mbProtected = TRUE;
+        // default to blocking trusted connections on a public interface if one is specified
+        mBlockUntrustedInterface = true;
        mSendPacketFailureCount = 0;
        mCircuitPrintFreq = 60.f;               // seconds
@@ -437,7 +398,9 @@ void LLMessageSystem::clearReceiveState()
        mCurrentRecvPacketID = 0;
        mIncomingCompressedSize = 0;
        mLastSender.invalidate();
+        mLastReceivingIF.invalidate();
        mMessageReader->clearMessage();
+        mLastMessageFromTrustedMessageService = false;
 }
@@ -470,6 +433,17 @@ bool LLMessageSystem::isTrustedSender(const LLHost& host) const
        return cdp->getTrusted();
 }
+void LLMessageSystem::receivedMessageFromTrustedSender()
+{
+        mLastMessageFromTrustedMessageService = true;
+}
+bool LLMessageSystem::isTrustedSender() const
+{       
+        return mLastMessageFromTrustedMessageService ||
+                isTrustedSender(getSender());
+}
 static LLMessageSystem::message_template_name_map_t::const_iterator 
 findTemplate(const LLMessageSystem::message_template_name_map_t& templates, 
                         std::string name)
@@ -586,6 +560,7 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
                
                receive_size = mTrueReceiveSize;
                mLastSender = mPacketRing.getLastSender();
+                mLastReceivingIF = mPacketRing.getLastReceivingInterface();
                
                if (receive_size < (S32) LL_MINIMUM_VALID_PACKET_SIZE)
                {
@@ -709,11 +684,16 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
                        // UseCircuitCode can be a valid, off-circuit packet.
                        // But we don't want to acknowledge UseCircuitCode until the circuit is
                        // available, which is why the acknowledgement test is done above.  JC
+                        bool trusted = cdp && cdp->getTrusted();
                        valid_packet = mTemplateMessageReader->validateMessage(
                                buffer,
                                receive_size,
-                                host);
+                                host,
+                                trusted);
+                        if (!valid_packet)
+                        {
+                                clearReceiveState();
+                        }
                        // UseCircuitCode is allowed in even from an invalid circuit, so that
                        // we can toss circuits around.
@@ -741,29 +721,6 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
                                valid_packet = FALSE;
                        }
-                        if (
-                                valid_packet &&
-                                mTemplateMessageReader->isBanned(cdp && cdp->getTrusted()))
-                        {
-                                LL_WARNS("Messaging") << "LLMessageSystem::checkMessages "
-                                        << "received banned message "
-                                        << mTemplateMessageReader->getMessageName()
-                                        << " from "
-                                        << ((cdp && cdp->getTrusted()) ? "trusted " : "untrusted ")
-                                        << host << llendl;
-                                clearReceiveState();
-                                valid_packet = FALSE;
-                        }
-                        if( valid_packet && mTemplateMessageReader->isUdpBanned())
-                        {
-                                llwarns << "Received UDP black listed message "
-                                                <<  mTemplateMessageReader->getMessageName()
-                                                << " from " << host << llendl;
-                                clearReceiveState();
-                                valid_packet = FALSE;
-                        }
                        if( valid_packet )
                        {
                                logValidMsg(cdp, host, recv_reliable, recv_resent, (BOOL)(acks>0) );
@@ -776,94 +733,6 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
                        if (valid_packet)
                        {
-                                // enable this for output of message names
-                                //LL_INFOS("Messaging") << "< \"" << mTemplateMessageReader->getMessageName()
-                                                //<< "\"" << llendl;
-                                /* Code for dumping the complete contents of a message.  Keep for future use in optimizing messages.
-                                if( 1 )
-                                {
-                                        static char* object_update = LLMessageStringTable::getInstance()->getString("ObjectUpdate");
-                                        if(object_update == mTemplateMessageReader->getMessageName() )
-                                        {
-                                                LL_INFOS("Messaging") << "ObjectUpdate:" << llendl;
-                                                U32 i;
-                                                LL_INFOS("Messaging") << "    Zero Encoded: " << zero_unexpanded_size << llendl;
-                                                for( i = 0; i<zero_unexpanded_size; i++ )
-                                                {
-                                                        LL_INFOS("Messaging") << "     " << i << ": " << (U32) zero_unexpanded_buffer[i] << llendl;
-                                                }
-                                                LL_INFOS("Messaging") << "" << llendl;
-                                                LL_INFOS("Messaging") << "    Zero Unencoded: " << receive_size << llendl;
-                                                for( i = 0; i<receive_size; i++ )
-                                                {
-                                                        LL_INFOS("Messaging") << "     " << i << ": " << (U32) buffer[i] << llendl;
-                                                }
-                                                LL_INFOS("Messaging") << "" << llendl;
-                                                LL_INFOS("Messaging") << "    Blocks and variables: " << llendl;
-                                                S32 byte_count = 0;
-                                                for (LLMessageTemplate::message_block_map_t::iterator
-                                                                 iter = mCurrentRMessageTemplate->mMemberBlocks.begin(),
-                                                                 end = mCurrentRMessageTemplate->mMemberBlocks.end();
-                                                         iter != end; iter++)
-                                                {
-                                                        LLMessageBlock* block = iter->second;
-                                                        const char* block_name = block->mName;
-                                                        for (LLMsgBlkData::msg_var_data_map_t::iterator
-                                                                         iter = block->mMemberVariables.begin(),
-                                                                         end = block->mMemberVariables.end();
-                                                                 iter != end; iter++)
-                                                        {
-                                                                const char* var_name = iter->first;
-                                                                
-                                                                if( getNumberOfBlocksFast( block_name ) < 1 )
-                                                                {
-                                                                        LL_INFOS("Messaging") << var_name << " has no blocks" << llendl;
-                                                                }
-                                                                for( S32 blocknum = 0; blocknum < getNumberOfBlocksFast( block_name ); blocknum++ )
-                                                                {
-                                                                        char *bnamep = (char *)block_name + blocknum; // this works because it's just a hash.  The bnamep is never derefference
-                                                                        char *vnamep = (char *)var_name; 
-                                                                        LLMsgBlkData *msg_block_data = mCurrentRMessageData->mMemberBlocks[bnamep];
-                                                                        if (!msg_block_data)
-                                                                        {
-                                                                                std::string errmsg = llformat("Block %s #%d not in message %s", block_name, blocknum, mCurrentRMessageData->mName);
-                                                                                LL_ERRS("Messaging") << errmsg << llendl;
-                                                                        }
-                                                                        LLMsgVarData vardata = msg_block_data->mMemberVarData[vnamep];
-                                                                        if (!vardata.getName())
-                                                                        {
-                                                                                std::string errmsg = llformat("Variable %s not in message %s block %s", vnamep, mCurrentRMessageData->mName, bnamep);
-                                                                                LL_ERRS("Messaging") << errmsg << llendl;
-                                                                        }
-                                                                        const S32 vardata_size = vardata.getSize();
-                                                                        if( vardata_size )
-                                                                        {
-                                                                                for( i = 0; i < vardata_size; i++ )
-                                                                                {
-                                                                                        byte_count++;
-                                                                                        LL_INFOS("Messaging") << block_name << " " << var_name << " [" << blocknum << "][" << i << "]= " << (U32)(((U8*)vardata.getData())[i]) << llendl;
-                                                                                }
-                                                                        }
-                                                                        else
-                                                                        {
-                                                                                LL_INFOS("Messaging") << block_name << " " << var_name << " [" << blocknum << "] 0 bytes" << llendl;
-                                                                        }
-                                                                }
-                                                        }
-                                                }
-                                                LL_INFOS("Messaging") << "Byte count =" << byte_count << llendl;
-                                        }
-                                }
-                                */
                                mPacketsIn++;
                                mBytesIn += mTrueReceiveSize;
                                
@@ -891,9 +760,6 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
                                        mInvalidOnCircuitPackets++;
                                }
                        }
-                        // Code for dumping the complete contents of a message 
-                        // delete [] zero_unexpanded_buffer;
                }
        } while (!valid_packet && receive_size > 0);
@@ -996,7 +862,7 @@ void LLMessageSystem::processAcks()
        }
 }
-void LLMessageSystem::copyMessageRtoS()
+void LLMessageSystem::copyMessageReceivedToSend()
 {
        // NOTE: babbage: switch builder to match reader to avoid
        // converting message format
@@ -1013,6 +879,94 @@ void LLMessageSystem::copyMessageRtoS()
        mMessageReader->copyToBuilder(*mMessageBuilder);
 }
+LLSD LLMessageSystem::getReceivedMessageLLSD() const
+{
+        LLSDMessageBuilder builder;
+        mMessageReader->copyToBuilder(builder);
+        return builder.getMessage();
+}
+LLSD LLMessageSystem::getBuiltMessageLLSD() const 
+{
+        LLSD result;
+        if (mLLSDMessageBuilder == mMessageBuilder)
+        {
+                 result = mLLSDMessageBuilder->getMessage();
+        }
+        else
+        {
+                // TODO: implement as below?
+                llerrs << "Message not built as LLSD." << llendl; 
+        }
+        return result;
+}
+LLSD LLMessageSystem::wrapReceivedTemplateData() const
+{
+        if(mMessageReader == mTemplateMessageReader)
+        {
+                LLTemplateMessageBuilder builder(mMessageTemplates);
+                builder.newMessage(mMessageReader->getMessageName());
+                mMessageReader->copyToBuilder(builder);
+                U8 buffer[MAX_BUFFER_SIZE];
+                const U8 offset_to_data = 0;
+                U32 size = builder.buildMessage(buffer, MAX_BUFFER_SIZE,
+                                                                                offset_to_data);
+                std::vector<U8> binary_data(buffer, buffer+size);
+                LLSD wrapped_data = LLSD::emptyMap();
+                wrapped_data["binary-template-data"] = binary_data;
+                return wrapped_data;
+        }
+        else
+        {
+                return getReceivedMessageLLSD();
+        }
+}
+LLSD LLMessageSystem::wrapBuiltTemplateData() const
+{
+        LLSD result;
+        if (mLLSDMessageBuilder == mMessageBuilder)
+        {
+                result = getBuiltMessageLLSD();
+        }
+        else
+        {
+                U8 buffer[MAX_BUFFER_SIZE];
+                const U8 offset_to_data = 0;
+                U32 size = mTemplateMessageBuilder->buildMessage(
+                        buffer, MAX_BUFFER_SIZE,
+                        offset_to_data);
+                std::vector<U8> binary_data(buffer, buffer+size);
+                LLSD wrapped_data = LLSD::emptyMap();
+                wrapped_data["binary-template-data"] = binary_data;
+                result = wrapped_data;
+        }
+        return result;
+}
+LLStoredMessagePtr LLMessageSystem::getReceivedMessage() const
+{
+        const std::string& name = mMessageReader->getMessageName();
+        LLSD message = wrapReceivedTemplateData();
+        return LLStoredMessagePtr(new LLStoredMessage(name, message));
+}
+LLStoredMessagePtr LLMessageSystem::getBuiltMessage() const
+{
+        const std::string& name = mMessageBuilder->getMessageName();
+        LLSD message = wrapBuiltTemplateData();
+        return LLStoredMessagePtr(new LLStoredMessage(name, message));
+}
+S32 LLMessageSystem::sendMessage(const LLHost &host, LLStoredMessagePtr message)
+{
+        return sendMessage(host, message->mName.c_str(), message->mMessage);
+}
 void LLMessageSystem::clearMessage()
 {
        mSendReliable = FALSE;
@@ -1025,6 +979,11 @@ void LLMessageSystem::nextBlockFast(const char *blockname)
        mMessageBuilder->nextBlock(blockname);
 }
+void LLMessageSystem::nextBlock(const char *blockname)
+{
+        nextBlockFast(LLMessageStringTable::getInstance()->getString(blockname));
+}
 BOOL LLMessageSystem::isSendFull(const char* blockname)
 {
        char* stringTableName = NULL;
@@ -1104,19 +1063,19 @@ S32 LLMessageSystem::sendReliable(	const LLHost &host,
 void LLMessageSystem::forwardMessage(const LLHost &host)
 {
-        copyMessageRtoS();
+        copyMessageReceivedToSend();
        sendMessage(host);
 }
 void LLMessageSystem::forwardReliable(const LLHost &host)
 {
-        copyMessageRtoS();
+        copyMessageReceivedToSend();
        sendReliable(host);
 }
 void LLMessageSystem::forwardReliable(const U32 circuit_code)
 {
-        copyMessageRtoS();
+        copyMessageReceivedToSend();
        sendReliable(findHost(circuit_code));
 }
@@ -1127,7 +1086,7 @@ S32 LLMessageSystem::forwardReliable(	const LLHost &host,
                                                                                void (*callback)(void **,S32), 
                                                                                void ** callback_data)
 {
-        copyMessageRtoS();
+        copyMessageReceivedToSend();
        return sendReliable(host, retries, ping_based_timeout, timeout, callback, callback_data);
 }
@@ -1194,7 +1153,7 @@ LLHTTPClient::ResponderPtr LLMessageSystem::createResponder(const std::string& n
                return new LLFnPtrResponder(
                        NULL,
                        NULL,
-                        mMessageBuilder->getMessageName());
+                        name);
        }
 }
@@ -1455,13 +1414,6 @@ S32 LLMessageSystem::sendMessage(
                LL_WARNS("Messaging") << "trying to send message to invalid host"       << llendl;
                return 0;
        }
-        newMessage(name);       
-        if (mMessageBuilder != mLLSDMessageBuilder)
-        {
-                LL_WARNS("Messaging") << "trying to send llsd message when builder is not LLSD!"
-                                << llendl;
-                return 0;
-        }
        const LLHTTPSender& sender = LLHTTPSender::getSender(host);
        sender.send(host, name, message, createResponder(name));
@@ -2170,6 +2122,15 @@ void LLMessageSystem::dispatch(
        handler->post(responsep, context, message);
 }
+//static 
+void LLMessageSystem::dispatchTemplate(const std::string& msg_name,
+                                                                                const LLSD& message,
+                                                                                LLHTTPNode::ResponsePtr responsep)
+{
+        LLTemplateMessageDispatcher dispatcher(*(gMessageSystem->mTemplateMessageReader));
+        dispatcher.dispatch(msg_name, message, responsep);
+}
 static void check_for_unrecognized_messages(
                const char* type,
                const LLSD& map,
@@ -2352,6 +2313,23 @@ void process_create_trusted_circuit(LLMessageSystem *msg, void **)
                return;
        }
+        U32 untrusted_interface = msg->getUntrustedInterface().getAddress();
+        U32 last_interface = msg->getReceivingInterface().getAddress();
+        if ( ( untrusted_interface != INVALID_HOST_IP_ADDRESS ) && ( untrusted_interface == last_interface ) )
+        {
+                if( msg->getBlockUntrustedInterface() )
+                {
+                        LL_WARNS("Messaging") << "Ignoring CreateTrustedCircuit on public interface from host: "
+                                << msg->getSender() << llendl;
+                        return;
+                }
+                else
+                {
+                        LL_WARNS("Messaging") << "Processing CreateTrustedCircuit on public interface from host: "
+                                << msg->getSender() << llendl;
+                }
+        }
        char their_digest[MD5HEX_STR_SIZE];     /* Flawfinder: ignore */
        S32 size = msg->getSizeFast(_PREHASH_DataBlock, _PREHASH_Digest);
        if(size != MD5HEX_STR_BYTES)
@@ -2408,6 +2386,24 @@ void process_deny_trusted_circuit(LLMessageSystem *msg, void **)
                //      Don't respond to requests that use the same end point ID
                return;
        }
+        
+        U32 untrusted_interface = msg->getUntrustedInterface().getAddress();
+        U32 last_interface = msg->getReceivingInterface().getAddress();
+        if ( ( untrusted_interface != INVALID_HOST_IP_ADDRESS ) && ( untrusted_interface == last_interface ) )
+        {
+                if( msg->getBlockUntrustedInterface() )
+                {
+                        LL_WARNS("Messaging") << "Ignoring DenyTrustedCircuit on public interface from host: "
+                                << msg->getSender() << llendl;
+                        return;
+                }
+                else
+                {
+                        LL_WARNS("Messaging") << "Processing DenyTrustedCircuit on public interface from host: "
+                                << msg->getSender() << llendl;
+                }
+        }
        // Assume that we require trust to proceed, so resend.
        // This catches the case where a circuit that was trusted
@@ -2496,7 +2492,9 @@ bool start_messaging_system(
        bool b_dump_prehash_file,
        const std::string& secret,
        const LLUseCircuitCodeResponder* responder,
-        bool failure_is_fatal)
+        bool failure_is_fatal,
+        const F32 circuit_heartbeat_interval, 
+        const F32 circuit_timeout)
 {
        gMessageSystem = new LLMessageSystem(
                template_name,
@@ -2504,7 +2502,9 @@ bool start_messaging_system(
                version_major, 
                version_minor, 
                version_patch,
-                failure_is_fatal);
+                failure_is_fatal,
+                circuit_heartbeat_interval,
+                circuit_timeout);
        g_shared_secret.assign(secret);
        if (!gMessageSystem)
@@ -2683,7 +2683,7 @@ void LLMessageSystem::summarizeLogs(std::ostream& str)
        str << "END MESSAGE LOG SUMMARY" << std::endl;
 }
-void end_messaging_system()
+void end_messaging_system(bool print_summary)
 {
        gTransferManager.cleanup();
        LLTransferTargetVFile::updateQueue(true); // shutdown LLTransferTargetVFile
@@ -2691,9 +2691,12 @@ void end_messaging_system()
        {
                gMessageSystem->stopLogging();
-                std::ostringstream str;
+                if (print_summary)
-                gMessageSystem->summarizeLogs(str);
+                {
-                LL_INFOS("Messaging") << str.str().c_str() << llendl;
+                        std::ostringstream str;
+                        gMessageSystem->summarizeLogs(str);
+                        LL_INFOS("Messaging") << str.str().c_str() << llendl;
+                }
                delete gMessageSystem;
                gMessageSystem = NULL;
@@ -4041,3 +4044,11 @@ void LLMessageSystem::banUdpMessage(const std::string& name)
                llwarns << "Attempted to ban an unknown message: " << name << "." << llendl;
        }
 }
+const LLHost& LLMessageSystem::getSender() const
+{
+        return mLastSender;
+}
+LLHTTPRegistration<LLHTTPNodeAdapter<LLTrustedMessageService> >
+        gHTTPRegistrationTrustedMessageWildcard("/trusted-message/<message-name>");
diff --git a/linden/indra/llmessage/message.h b/linden/indra/llmessage/message.h
index c503a58..b25b27e 100644
--- a/linden/indra/llmessage/message.h
+++ b/linden/indra/llmessage/message.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -62,6 +63,9 @@
 #include "llstl.h"
 #include "llmsgvariabletype.h"
 #include "llmsgvariabletype.h"
+#include "llmessagesenderinterface.h"
+#include "llstoredmessage.h"
 const U32 MESSAGE_MAX_STRINGS_LENGTH = 64;
 const U32 MESSAGE_NUMBER_OF_HASH_BUCKETS = 8192;
@@ -205,12 +209,15 @@ public:
        virtual void complete(const LLHost& host, const LLUUID& agent) const = 0;
 };
-class LLMessageSystem
+class LLMessageSystem : public LLMessageSenderInterface
 {
 private:
        U8                                      mSendBuffer[MAX_BUFFER_SIZE];
        S32                                     mSendSize;
+        bool                            mBlockUntrustedInterface;
+        LLHost                          mUntrustedInterface;
 public:
        LLPacketRing                            mPacketRing;
        LLReliablePacketParams                  mReliablePacketParams;
@@ -285,7 +292,8 @@ public:
        // Read file and build message templates
        LLMessageSystem(const std::string& filename, U32 port, S32 version_major,
                                        S32 version_minor, S32 version_patch,
-                                        bool failure_is_fatal = true);
+                                        bool failure_is_fatal,
+                                        const F32 circuit_heartbeat_interval, const F32 circuit_timeout);
        ~LLMessageSystem();
@@ -350,6 +358,8 @@ public:
        U32             getSenderIP() const;                    // getSender() is preferred
        U32             getSenderPort() const;          // getSender() is preferred
+        const LLHost& getReceivingInterface() const;
        // This method returns the uuid associated with the sender. The
        // UUID will be null if it is not yet known or is a server
        // circuit.
@@ -366,14 +376,34 @@ public:
        void newMessageFast(const char *name);
        void newMessage(const char *name);
-        void    copyMessageRtoS();
-        void    clearMessage();
+public:
+        LLStoredMessagePtr getReceivedMessage() const; 
+        LLStoredMessagePtr getBuiltMessage() const;
+        S32 sendMessage(const LLHost &host, LLStoredMessagePtr message);
+private:
+        LLSD getReceivedMessageLLSD() const;
+        LLSD getBuiltMessageLLSD() const;
+        // NOTE: babbage: Only use to support legacy misuse of the
+        // LLMessageSystem API where values are dangerously written
+        // as one type and read as another. LLSD does not support
+        // dangerous conversions and so converting the message to an
+        // LLSD would result in the reads failing. All code which
+        // misuses the message system in this way should be made safe
+        // but while the unsafe code is run in old processes, this
+        // method should be used to forward unsafe messages.
+        LLSD wrapReceivedTemplateData() const;
+        LLSD wrapBuiltTemplateData() const;
+public:
+        void copyMessageReceivedToSend();
+        void clearMessage();
        void nextBlockFast(const char *blockname);
-        void    nextBlock(const char *blockname)
+        void nextBlock(const char *blockname);
-        {
-                nextBlockFast(LLMessageStringTable::getInstance()->getString(blockname));
-        }
 public:
        void addBinaryDataFast(const char *varname, const void *data, S32 size);
@@ -454,14 +484,14 @@ public:
                                                        void (*callback)(void **,S32), void ** callback_data);
        // flush sends a message only if data's been pushed on it.
-        S32             flushSemiReliable(      const LLHost &host, 
+        S32      flushSemiReliable(     const LLHost &host, 
                                                                void (*callback)(void **,S32), void ** callback_data);
-        S32             flushReliable(  const LLHost &host );
+        S32     flushReliable(  const LLHost &host );
-        void    forwardMessage(const LLHost &host);
+        void forwardMessage(const LLHost &host);
-        void    forwardReliable(const LLHost &host);
+        void forwardReliable(const LLHost &host);
-        void    forwardReliable(const U32 circuit_code);
+        void forwardReliable(const U32 circuit_code);
        S32 forwardReliable(
                const LLHost &host, 
                S32 retries, 
@@ -473,9 +503,10 @@ public:
        LLHTTPClient::ResponderPtr createResponder(const std::string& name);
        S32             sendMessage(const LLHost &host);
        S32             sendMessage(const U32 circuit);
+private:
        S32             sendMessage(const LLHost &host, const char* name,
                                                const LLSD& message);
+public:
        // BOOL decodeData(const U8 *buffer, const LLHost &host);
        void    getBinaryDataFast(const char *blockname, const char *varname, void *datap, S32 size, S32 blocknum = 0, S32 max_size = S32_MAX);
@@ -554,17 +585,28 @@ public:
        void    sendDenyTrustedCircuit(const LLHost &host);
        /** Return false if host is unknown or untrusted */
+        // Note:DaveH/Babbage some trusted messages can be received without a circuit
        bool isTrustedSender(const LLHost& host) const;
+        /** Return true if current message is from trusted source */
+        bool isTrustedSender() const;
        /** Return false true if name is unknown or untrusted */
        bool isTrustedMessage(const std::string& name) const;
        /** Return false true if name is unknown or trusted */
        bool isUntrustedMessage(const std::string& name) const;
+        // Mark an interface ineligible for trust
+        void setUntrustedInterface( const LLHost host ) { mUntrustedInterface = host; }
+        LLHost getUntrustedInterface() const { return mUntrustedInterface; }
+        void setBlockUntrustedInterface( bool block ) { mBlockUntrustedInterface = block; } // Throw a switch to allow, sending warnings only
+        bool getBlockUntrustedInterface() const { return mBlockUntrustedInterface; }
        // Change this message to be UDP black listed.
        void banUdpMessage(const std::string& name);
 private:
        // A list of the circuits that need to be sent DenyTrustedCircuit messages.
        typedef std::set<LLHost> host_set_t;
@@ -581,6 +623,7 @@ public:
        void    establishBidirectionalTrust(const LLHost &host, S64 frame_count = 0);
        // returns whether the given host is on a trusted circuit
+        // Note:DaveH/Babbage some trusted messages can be received without a circuit
        BOOL    getCircuitTrust(const LLHost &host);
        
        void    setCircuitAllowTimeout(const LLHost &host, BOOL allow);
@@ -650,6 +693,12 @@ public:
                                                 const LLSD& message,
                                                 LLHTTPNode::ResponsePtr responsep);
+        // this is added to support specific legacy messages and is
+        // ***not intended for general use*** Si, Gabriel, 2009
+        static void dispatchTemplate(const std::string& msg_name,
+                                                 const LLSD& message,
+                                                 LLHTTPNode::ResponsePtr responsep);
        void setMessageBans(const LLSD& trusted, const LLSD& untrusted);
        /**
@@ -677,9 +726,18 @@ public:
        // Check UDP messages and pump http_pump to receive HTTP messages.
        bool checkAllMessages(S64 frame_count, LLPumpIO* http_pump);
+        // Moved to allow access from LLTemplateMessageDispatcher
+        void clearReceiveState();
+        // This will cause all trust queries to return true until the next message
+        // is read: use with caution!
+        void receivedMessageFromTrustedSender();
        
 private:
+        bool mLastMessageFromTrustedMessageService;
+        
        // The mCircuitCodes is a map from circuit codes to session
        // ids. This allows us to verify sessions on connect.
        typedef std::map<U32, LLUUID> code_session_map_t;
@@ -690,7 +748,6 @@ private:
        LLUUID mSessionID;
        
        void    addTemplate(LLMessageTemplate *templatep);
-        void            clearReceiveState();
        BOOL            decodeTemplate( const U8* buffer, S32 buffer_size, LLMessageTemplate** msg_template );
        void            logMsgFromInvalidCircuit( const LLHost& sender, BOOL recv_reliable );
@@ -745,6 +802,7 @@ private:
        void init(); // ctor shared initialisation.
        LLHost mLastSender;
+        LLHost mLastReceivingIF;
        S32 mIncomingCompressedSize;            // original size of compressed msg (0 if uncomp.)
        TPACKETID mCurrentRecvPacketID;       // packet ID of current receive packet (for reporting)
@@ -780,10 +838,12 @@ bool start_messaging_system(
        S32 version_patch,
        bool b_dump_prehash_file,
        const std::string& secret,
-        const LLUseCircuitCodeResponder* responder = NULL,
+        const LLUseCircuitCodeResponder* responder,
-        bool failure_is_fatal = true);
+        bool failure_is_fatal,
+        const F32 circuit_heartbeat_interval, 
+        const F32 circuit_timeout);
-void end_messaging_system();
+void end_messaging_system(bool print_summary = true);
 void null_message_callback(LLMessageSystem *msg, void **data);
@@ -960,8 +1020,7 @@ inline void *ntohmemcpy(void *s, const void *ct, EMsgVariableType type, size_t n
        return(htonmemcpy(s,ct,type, n));
 }
+inline const LLHost& LLMessageSystem::getReceivingInterface() const {return mLastReceivingIF;}
-inline const LLHost& LLMessageSystem::getSender() const {return mLastSender;}
 inline U32 LLMessageSystem::getSenderIP() const 
 {
@@ -973,6 +1032,7 @@ inline U32 LLMessageSystem::getSenderPort() const
        return mLastSender.getPort();
 }
 //-----------------------------------------------------------------------------
 // Transmission aliases
 //-----------------------------------------------------------------------------
diff --git a/linden/indra/llmessage/message_prehash.cpp b/linden/indra/llmessage/message_prehash.cpp
index a286d0f..da16e6e 100644
--- a/linden/indra/llmessage/message_prehash.cpp
+++ b/linden/indra/llmessage/message_prehash.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -313,6 +314,7 @@ char* _PREHASH_TextColor = LLMessageStringTable::getInstance()->getString("TextC
 char* _PREHASH_SlaveID = LLMessageStringTable::getInstance()->getString("SlaveID");
 char* _PREHASH_Charter = LLMessageStringTable::getInstance()->getString("Charter");
 char* _PREHASH_AlertData = LLMessageStringTable::getInstance()->getString("AlertData");
+char* _PREHASH_AlertInfo = LLMessageStringTable::getInstance()->getString("AlertInfo");
 char* _PREHASH_TargetBlock = LLMessageStringTable::getInstance()->getString("TargetBlock");
 char* _PREHASH_CheckParcelAuctions = LLMessageStringTable::getInstance()->getString("CheckParcelAuctions");
 char* _PREHASH_ParcelAuctions = LLMessageStringTable::getInstance()->getString("ParcelAuctions");
@@ -1374,4 +1376,5 @@ char* _PREHASH_AgeVerificationBlock = LLMessageStringTable::getInstance()->getSt
 char* _PREHASH_UCoord = LLMessageStringTable::getInstance()->getString("UCoord");
 char* _PREHASH_VCoord = LLMessageStringTable::getInstance()->getString("VCoord");
 char* _PREHASH_FaceIndex = LLMessageStringTable::getInstance()->getString("FaceIndex");
+char* _PREHASH_StatusData = LLMessageStringTable::getInstance()->getString("StatusData");
+char* _PREHASH_ProductSKU = LLMessageStringTable::getInstance()->getString("ProductSKU");
diff --git a/linden/indra/llmessage/message_prehash.h b/linden/indra/llmessage/message_prehash.h
index d7014df..1445d6a 100644
--- a/linden/indra/llmessage/message_prehash.h
+++ b/linden/indra/llmessage/message_prehash.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -313,6 +314,7 @@ extern char * _PREHASH_TextColor;
 extern char * _PREHASH_SlaveID;
 extern char * _PREHASH_Charter;
 extern char * _PREHASH_AlertData;
+extern char * _PREHASH_AlertInfo;
 extern char * _PREHASH_TargetBlock;
 extern char * _PREHASH_CheckParcelAuctions;
 extern char * _PREHASH_ParcelAuctions;
@@ -1374,5 +1376,6 @@ extern char * _PREHASH_AgeVerificationBlock;
 extern char * _PREHASH_UCoord;
 extern char * _PREHASH_VCoord;
 extern char * _PREHASH_FaceIndex;
+extern char * _PREHASH_StatusData;
+extern char * _PREHASH_ProductSKU;
 #endif
diff --git a/linden/indra/llmessage/message_string_table.cpp b/linden/indra/llmessage/message_string_table.cpp
index 39ba399..cd60103 100644
--- a/linden/indra/llmessage/message_string_table.cpp
+++ b/linden/indra/llmessage/message_string_table.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/net.cpp b/linden/indra/llmessage/net.cpp
index 0f0cddf..f63faa5 100644
--- a/linden/indra/llmessage/net.cpp
+++ b/linden/indra/llmessage/net.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -50,7 +51,6 @@
 #endif
 // linden library includes
-#include "network.h"
 #include "llerror.h"
 #include "llhost.h"
 #include "lltimer.h"
@@ -80,6 +80,7 @@ typedef int socklen_t;
 #endif
+static U32 gsnReceivingIFAddr = INVALID_HOST_IP_ADDRESS; // Address to which datagram was sent
 const char* LOOPBACK_ADDRESS_STRING = "127.0.0.1";
@@ -109,6 +110,16 @@ U32 get_sender_port()
        return ntohs(stSrcAddr.sin_port);
 }
+LLHost get_receiving_interface()
+{
+        return LLHost(gsnReceivingIFAddr, INVALID_PORT);
+}
+U32 get_receiving_interface_ip(void)
+{
+        return gsnReceivingIFAddr;
+}
 const char* u32_to_ip_string(U32 ip)
 {
        static char buffer[MAXADDRSTR];  /* Flawfinder: ignore */ 
@@ -383,11 +394,30 @@ S32 start_net(S32& socket_out, int& nPort)
                return 1;
        }
-        // Don't bind() if we want the operating system to assign our ports for 
-        // us.
        if (NET_USE_OS_ASSIGNED_PORT == nPort)
        {
-                // Do nothing; the operating system will do it for us.
+                // Although bind is not required it will tell us which port we were
+                // assigned to.
+                stLclAddr.sin_family      = AF_INET;
+                stLclAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+                stLclAddr.sin_port        = htons(0);
+                llinfos << "attempting to connect on OS assigned port" << llendl;
+                nRet = bind(hSocket, (struct sockaddr*) &stLclAddr, sizeof(stLclAddr));
+                if (nRet < 0)
+                {
+                        llwarns << "Failed to bind on an OS assigned port error: "
+                                        << nRet << llendl;
+                }
+                else
+                {
+                        sockaddr_in socket_info;
+                        socklen_t len = sizeof(sockaddr_in);
+                        int err = getsockname(hSocket, (sockaddr*)&socket_info, &len);
+                        llinfos << "Get socket returned: " << err << " length " << len << llendl;
+                        nPort = ntohs(socket_info.sin_port);
+                        llinfos << "Assigned port: " << nPort << llendl;
+                        
+                }
        }
        else
        {
@@ -454,6 +484,21 @@ S32 start_net(S32& socket_out, int& nPort)
        llinfos << "startNet - receive buffer size : " << rec_size << llendl;
        llinfos << "startNet - send buffer size    : " << snd_size << llendl;
+#if LL_LINUX
+        // Turn on recipient address tracking
+        {
+                int use_pktinfo = 1;
+                if( setsockopt( hSocket, SOL_IP, IP_PKTINFO, &use_pktinfo, sizeof(use_pktinfo) ) == -1 )
+                {
+                        llwarns << "No IP_PKTINFO available" << llendl;
+                }
+                else
+                {
+                        llinfos << "IP_PKKTINFO enabled" << llendl;
+                }
+        }
+#endif
        //  Setup a destination address
        char achMCAddr[MAXADDRSTR] = "127.0.0.1";       /* Flawfinder: ignore */ 
        stDstAddr.sin_family =      AF_INET;
@@ -472,6 +517,52 @@ void end_net(S32& socket_out)
        }
 }
+#if LL_LINUX
+static int recvfrom_destip( int socket, void *buf, int len, struct sockaddr *from, socklen_t *fromlen, U32 *dstip )
+{
+        int size;
+        struct iovec iov[1];
+        char cmsg[CMSG_SPACE(sizeof(struct in_pktinfo))];
+        struct cmsghdr *cmsgptr;
+        struct msghdr msg = {0};
+        iov[0].iov_base = buf;
+        iov[0].iov_len = len;
+        memset( &msg, 0, sizeof msg );
+        msg.msg_name = from;
+        msg.msg_namelen = *fromlen;
+        msg.msg_iov = iov;
+        msg.msg_iovlen = 1;
+        msg.msg_control = &cmsg;
+        msg.msg_controllen = sizeof(cmsg);
+        size = recvmsg( socket, &msg, 0 );
+        if( size == -1 )
+        {
+                return -1;
+        }
+        for( cmsgptr = CMSG_FIRSTHDR(&msg); cmsgptr != NULL; cmsgptr = CMSG_NXTHDR( &msg, cmsgptr ) )
+        {
+                if( cmsgptr->cmsg_level == SOL_IP && cmsgptr->cmsg_type == IP_PKTINFO )
+                {
+                        in_pktinfo *pktinfo = (in_pktinfo *)CMSG_DATA(cmsgptr);
+                        if( pktinfo )
+                        {
+                                // Two choices. routed and specified. ipi_addr is routed, ipi_spec_dst is
+                                // routed. We should stay with specified until we go to multiple
+                                // interfaces
+                                *dstip = pktinfo->ipi_spec_dst.s_addr;
+                        }
+                }
+        }
+        return size;
+}
+#endif
 int receive_packet(int hSocket, char * receiveBuffer)
 {
        //  Receives data asynchronously from the socket set by initNet().
@@ -481,7 +572,14 @@ int receive_packet(int hSocket, char * receiveBuffer)
        int nRet;
        socklen_t addr_size = sizeof(struct sockaddr_in);
-        nRet = recvfrom(hSocket, receiveBuffer, NET_BUFFER_SIZE, 0, (struct sockaddr*)&stSrcAddr, &addr_size);
+        gsnReceivingIFAddr = INVALID_HOST_IP_ADDRESS;
+#if LL_LINUX
+        nRet = recvfrom_destip(hSocket, receiveBuffer, NET_BUFFER_SIZE, (struct sockaddr*)&stSrcAddr, &addr_size, &gsnReceivingIFAddr);
+#else   
+        int recv_flags = 0;
+        nRet = recvfrom(hSocket, receiveBuffer, NET_BUFFER_SIZE, recv_flags, (struct sockaddr*)&stSrcAddr, &addr_size);
+#endif
        if (nRet == -1)
        {
@@ -489,6 +587,9 @@ int receive_packet(int hSocket, char * receiveBuffer)
                return 0;
        }
+        // Uncomment for testing if/when implementing for Mac or Windows:
+        // llinfos << "Received datagram to in addr " << u32_to_ip_string(get_receiving_interface_ip()) << llendl;
        return nRet;
 }
diff --git a/linden/indra/llmessage/net.h b/linden/indra/llmessage/net.h
index ec2af59..45b07a0 100644
--- a/linden/indra/llmessage/net.h
+++ b/linden/indra/llmessage/net.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
@@ -54,6 +55,8 @@ BOOL	send_packet(int hSocket, const char *sendBuffer, int size, U32 recipient, i
 LLHost  get_sender();
 U32             get_sender_port();
 U32             get_sender_ip(void);
+LLHost  get_receiving_interface();
+U32             get_receiving_interface_ip(void);
 const char*     u32_to_ip_string(U32 ip);                                       // Returns pointer to internal string buffer, "(bad IP addr)" on failure, cannot nest calls 
 char*           u32_to_ip_string(U32 ip, char *ip_string);      // NULL on failure, ip_string on success, you must allocate at least MAXADDRSTR chars
diff --git a/linden/indra/llmessage/partsyspacket.cpp b/linden/indra/llmessage/partsyspacket.cpp
index 9cef9c9..cfb3572 100644
--- a/linden/indra/llmessage/partsyspacket.cpp
+++ b/linden/indra/llmessage/partsyspacket.cpp
@@ -18,7 +18,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/partsyspacket.h b/linden/indra/llmessage/partsyspacket.h
index 46564a1..b4edc8c 100644
--- a/linden/indra/llmessage/partsyspacket.h
+++ b/linden/indra/llmessage/partsyspacket.h
@@ -18,7 +18,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/patch_code.cpp b/linden/indra/llmessage/patch_code.cpp
index baa8aca..90fb236 100644
--- a/linden/indra/llmessage/patch_code.cpp
+++ b/linden/indra/llmessage/patch_code.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/patch_code.h b/linden/indra/llmessage/patch_code.h
index c6fd90e..82fa6bb 100644
--- a/linden/indra/llmessage/patch_code.h
+++ b/linden/indra/llmessage/patch_code.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/patch_dct.cpp b/linden/indra/llmessage/patch_dct.cpp
index 8c1c0cb..be5e90c 100644
--- a/linden/indra/llmessage/patch_dct.cpp
+++ b/linden/indra/llmessage/patch_dct.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/patch_dct.h b/linden/indra/llmessage/patch_dct.h
index 204ed0d..663e146 100644
--- a/linden/indra/llmessage/patch_dct.h
+++ b/linden/indra/llmessage/patch_dct.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/patch_idct.cpp b/linden/indra/llmessage/patch_idct.cpp
index 39a6f52..b9a0931 100644
--- a/linden/indra/llmessage/patch_idct.cpp
+++ b/linden/indra/llmessage/patch_idct.cpp
@@ -17,7 +17,8 @@
 * 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
+ * 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,
diff --git a/linden/indra/llmessage/sound_ids.h b/linden/indra/llmessage/sound_ids.h
index 884bf14..e7a9190 100644
--- a/linden/indra/llmessage/sound_ids.h
+++ b/linden/indra/llmessage/sound_ids.h
@@ -17,7 +17,8 @@
 * 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
+ * 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,
author	Jacek Antonelli	2009-04-30 13:04:20 -0500
committer	Jacek Antonelli	2009-04-30 13:07:16 -0500
commit	ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch)
tree	8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/llmessage
parent	Second Life viewer sources 1.22.11 (diff)
download	meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz