Second Life viewer sources 1.17.1.0

16 files changed, 246 insertions, 162 deletions

diff --git a/linden/indra/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp
index c8610a7..8696438 100644
--- a/linden/indra/llmessage/llassetstorage.cpp
+++ b/linden/indra/llmessage/llassetstorage.cpp
@@ -162,6 +162,8 @@ LLAssetRequest::LLAssetRequest(const LLUUID &uuid, const LLAssetType::EType type
         mHost(),
         mIsTemp( FALSE ),
         mIsLocal(FALSE),
+        mIsUserWaiting(FALSE),
+        mTimeout(LL_ASSET_STORAGE_TIMEOUT),
         mIsPriority(FALSE),
         mDataSentInFirstPacket(FALSE),
         mDataIsInVFS( FALSE )
@@ -1270,7 +1272,9 @@ void LLAssetStorage::storeAssetData(
         void* user_data,
         bool temp_file,
         bool is_priority,
-        bool store_local)
+        bool store_local,
+        bool user_waiting,
+        F64 timeout)
 {
         llwarns << "storeAssetData: wrong version called" << llendl;
 }
@@ -1285,7 +1289,9 @@ void LLAssetStorage::storeAssetData(
         bool temp_file ,
         bool is_priority,
         bool store_local,
-        const LLUUID& requesting_agent_id)
+        const LLUUID& requesting_agent_id,
+        bool user_waiting,
+        F64 timeout)
 {
         llwarns << "storeAssetData: wrong version called" << llendl;
 }
@@ -1299,7 +1305,9 @@ void LLAssetStorage::storeAssetData(
         LLStoreAssetCallback callback,
         void* user_data,
         bool temp_file,
-        bool is_priority)
+        bool is_priority,
+        bool user_waiting,
+        F64 timeout)
 {
         llwarns << "storeAssetData: wrong version called" << llendl;
 }
@@ -1313,7 +1321,9 @@ void LLAssetStorage::storeAssetData(
         LLStoreAssetCallback callback,
         void* user_data,
         bool temp_file,
-        bool is_priority)
+        bool is_priority,
+        bool user_waiting,
+        F64 timeout)
 {
         llwarns << "storeAssetData: wrong version called" << llendl;
 }
diff --git a/linden/indra/llmessage/llassetstorage.h b/linden/indra/llmessage/llassetstorage.h
index f80a77d..ab12b7a 100644
--- a/linden/indra/llmessage/llassetstorage.h
+++ b/linden/indra/llmessage/llassetstorage.h
@@ -95,6 +95,7 @@ public:
 
         void setUUID(const LLUUID& id) { mUUID = id; }
         void setType(LLAssetType::EType type) { mType = type; }
+        void setTimeout (F64 timeout) { mTimeout = timeout; }
 
 protected:
         LLUUID  mUUID;
@@ -109,7 +110,9 @@ public:
         LLHost  mHost;
         BOOL    mIsTemp;
         BOOL    mIsLocal;
+        BOOL    mIsUserWaiting;         // We don't want to try forever if a user is waiting for a result.
         F64             mTime;                          // Message system time
+        F64             mTimeout;                       // Amount of time before timing out.
         BOOL    mIsPriority;
         BOOL    mDataSentInFirstPacket;
         BOOL    mDataIsInVFS;
@@ -252,7 +255,9 @@ public:
                 void* user_data,
                 bool temp_file = false,
                 bool is_priority = false,
-                bool store_local = false);
+                bool store_local = false,
+                bool user_waiting= false,
+                F64 timeout=LL_ASSET_STORAGE_TIMEOUT);
 
         /*
          * AssetID version
@@ -266,7 +271,9 @@ public:
                 bool temp_file = false,
                 bool is_priority = false,
                 bool store_local = false,
-                const LLUUID& requesting_agent_id = LLUUID::null);
+                const LLUUID& requesting_agent_id = LLUUID::null,
+                bool user_waiting= false,
+                F64 timeout=LL_ASSET_STORAGE_TIMEOUT);
 
         virtual void checkForTimeouts();
 
@@ -360,7 +367,9 @@ public:
                 LLStoreAssetCallback callback,
                 void* user_data,
                 bool temp_file = false,
-                bool is_priority = false);
+                bool is_priority = false,
+                bool user_waiting = false,
+                F64 timeout  = LL_ASSET_STORAGE_TIMEOUT);
 
         /*
          * TransactionID version
@@ -372,7 +381,9 @@ public:
                 LLStoreAssetCallback callback,
                 void *user_data,
                 bool temp_file = false,
-                bool is_priority = false);
+                bool is_priority = false,
+                bool user_waiting = false,
+                F64 timeout  = LL_ASSET_STORAGE_TIMEOUT);
 
         static void legacyGetDataCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType, void *user_data, S32 status);
         static void legacyStoreDataCallback(const LLUUID &uuid, void *user_data, S32 status);
diff --git a/linden/indra/llmessage/llblowfishcipher.cpp b/linden/indra/llmessage/llblowfishcipher.cpp
index 1772078..62464de 100644
--- a/linden/indra/llmessage/llblowfishcipher.cpp
+++ b/linden/indra/llmessage/llblowfishcipher.cpp
@@ -1,5 +1,5 @@
 /** 
- * @file llblowcipher.cpp
+ * @file llblowfishcipher.cpp
  * @brief Wrapper around OpenSSL Blowfish encryption algorithm.
  *
  * We do not have OpenSSL headers or libraries on Windows, so this
@@ -85,33 +85,33 @@ U32 LLBlowfishCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
                 << " iv_len " << iv_length
                 << llendl;
 
-        int output_len = 0;

-        int temp_len = 0;

-        if (!EVP_EncryptUpdate(&context,

-                        dst,

-                        &output_len,

-                        src,

-                        src_len))

-        {

-                llwarns << "LLBlowfishCipher::encrypt EVP_EncryptUpdate failure" << llendl;

-                goto ERROR;

-        }

-

-        // There may be some final data left to encrypt if the input is

-        // not an exact multiple of the block size.

-        if (!EVP_EncryptFinal_ex(&context, (unsigned char*)(dst + output_len), &temp_len))

-        {

-                llwarns << "LLBlowfishCipher::encrypt EVP_EncryptFinal failure" << llendl;

-                goto ERROR;

-        }

-        output_len += temp_len;

-

-        EVP_CIPHER_CTX_cleanup(&context);

-        return output_len;

-

-ERROR:

-        EVP_CIPHER_CTX_cleanup(&context);

-        return 0;

+        int output_len = 0;
+        int temp_len = 0;
+        if (!EVP_EncryptUpdate(&context,
+                        dst,
+                        &output_len,
+                        src,
+                        src_len))
+        {
+                llwarns << "LLBlowfishCipher::encrypt EVP_EncryptUpdate failure" << llendl;
+                goto ERROR;
+        }
+
+        // There may be some final data left to encrypt if the input is
+        // not an exact multiple of the block size.
+        if (!EVP_EncryptFinal_ex(&context, (unsigned char*)(dst + output_len), &temp_len))
+        {
+                llwarns << "LLBlowfishCipher::encrypt EVP_EncryptFinal failure" << llendl;
+                goto ERROR;
+        }
+        output_len += temp_len;
+
+        EVP_CIPHER_CTX_cleanup(&context);
+        return output_len;
+
+ERROR:
+        EVP_CIPHER_CTX_cleanup(&context);
+        return 0;
 }
 
 // virtual
diff --git a/linden/indra/llmessage/llcachename.cpp b/linden/indra/llmessage/llcachename.cpp
index 2a21b5a..d960429 100644
--- a/linden/indra/llmessage/llcachename.cpp
+++ b/linden/indra/llmessage/llcachename.cpp
@@ -66,132 +66,130 @@ LLCacheName* gCacheName = NULL;
 /// class LLCacheNameEntry
 /// ---------------------------------------------------------------------------
 
-namespace {
-        class LLCacheNameEntry
-        {
-        public:
-                LLCacheNameEntry();
+class LLCacheNameEntry
+{
+public:
+        LLCacheNameEntry();
 
-        public:
-                bool mIsGroup;
-                U32 mCreateTime;        // unix time_t
-                char mFirstName[DB_FIRST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
-                char mLastName[DB_LAST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
-                char mGroupName[DB_GROUP_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
-        };
+public:
+        bool mIsGroup;
+        U32 mCreateTime;        // unix time_t
+        char mFirstName[DB_FIRST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
+        char mLastName[DB_LAST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
+        char mGroupName[DB_GROUP_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
+};
 
-        LLCacheNameEntry::LLCacheNameEntry()
-        {
-                mFirstName[0] = '\0';
-                mLastName[0]  = '\0';
-                mGroupName[0] = '\0';
-        }
+LLCacheNameEntry::LLCacheNameEntry()
+{
+        mFirstName[0] = '\0';
+        mLastName[0]  = '\0';
+        mGroupName[0] = '\0';
+}
 
 
-        class PendingReply
-        {
-        public:
-                LLUUID                          mID;
-                LLCacheNameCallback mCallback;
-                LLHost                          mHost;
-                void*                           mData;
-                PendingReply(const LLUUID& id, LLCacheNameCallback callback, void* data = NULL)
-                        : mID(id), mCallback(callback), mData(data)
-                { }
+class PendingReply
+{
+public:
+        LLUUID                          mID;
+        LLCacheNameCallback mCallback;
+        LLHost                          mHost;
+        void*                           mData;
+        PendingReply(const LLUUID& id, LLCacheNameCallback callback, void* data = NULL)
+                : mID(id), mCallback(callback), mData(data)
+        { }
 
-                PendingReply(const LLUUID& id, const LLHost& host)
-                        : mID(id), mCallback(0), mHost(host)
-                { }
+        PendingReply(const LLUUID& id, const LLHost& host)
+                : mID(id), mCallback(0), mHost(host)
+        { }
 
-                void done()                     { mID.setNull(); }
-                bool isDone() const     { return mID.isNull() != FALSE; }
-        };
+        void done()                     { mID.setNull(); }
+        bool isDone() const     { return mID.isNull() != FALSE; }
+};
 
-        class ReplySender
-        {
-        public:
-                ReplySender(LLMessageSystem* msg);
-                ~ReplySender();
+class ReplySender
+{
+public:
+        ReplySender(LLMessageSystem* msg);
+        ~ReplySender();
 
-                void send(const LLUUID& id,
-                        const LLCacheNameEntry& entry, const LLHost& host);
+        void send(const LLUUID& id,
+                const LLCacheNameEntry& entry, const LLHost& host);
 
-        private:
-                void flush();
+private:
+        void flush();
 
-                LLMessageSystem*        mMsg;
-                bool                            mPending;
-                bool                            mCurrIsGroup;
-                LLHost                          mCurrHost;
-        };
+        LLMessageSystem*        mMsg;
+        bool                            mPending;
+        bool                            mCurrIsGroup;
+        LLHost                          mCurrHost;
+};
 
-        ReplySender::ReplySender(LLMessageSystem* msg)
-                : mMsg(msg), mPending(false)
-        { }
+ReplySender::ReplySender(LLMessageSystem* msg)
+        : mMsg(msg), mPending(false)
+{ }
 
-        ReplySender::~ReplySender()
-        {
-                flush();
-        }
+ReplySender::~ReplySender()
+{
+        flush();
+}
 
-        void ReplySender::send(const LLUUID& id,
-                const LLCacheNameEntry& entry, const LLHost& host)
+void ReplySender::send(const LLUUID& id,
+        const LLCacheNameEntry& entry, const LLHost& host)
+{
+        if (mPending)
         {
-                if (mPending)
+                if (mCurrIsGroup != entry.mIsGroup
+                ||  mCurrHost != host)
                 {
-                        if (mCurrIsGroup != entry.mIsGroup
-                        ||  mCurrHost != host)
-                        {
-                                flush();
-                        }
+                        flush();
                 }
+        }
 
-                if (!mPending)
-                {
-                        mPending = true;
-                        mCurrIsGroup = entry.mIsGroup;
-                        mCurrHost = host;
-
-                        if(mCurrIsGroup)
-                                mMsg->newMessageFast(_PREHASH_UUIDGroupNameReply);
-                        else
-                                mMsg->newMessageFast(_PREHASH_UUIDNameReply);
-                }
+        if (!mPending)
+        {
+                mPending = true;
+                mCurrIsGroup = entry.mIsGroup;
+                mCurrHost = host;
 
-                mMsg->nextBlockFast(_PREHASH_UUIDNameBlock);
-                mMsg->addUUIDFast(_PREHASH_ID, id);
                 if(mCurrIsGroup)
-                {
-                        mMsg->addStringFast(_PREHASH_GroupName, entry.mGroupName);
-                }
+                        mMsg->newMessageFast(_PREHASH_UUIDGroupNameReply);
                 else
-                {
-                        mMsg->addStringFast(_PREHASH_FirstName, entry.mFirstName);
-                        mMsg->addStringFast(_PREHASH_LastName, entry.mLastName);
-                }
+                        mMsg->newMessageFast(_PREHASH_UUIDNameReply);
+        }
 
-                if(mMsg->isSendFullFast(_PREHASH_UUIDNameBlock))
-                {
-                        flush();
-                }
+        mMsg->nextBlockFast(_PREHASH_UUIDNameBlock);
+        mMsg->addUUIDFast(_PREHASH_ID, id);
+        if(mCurrIsGroup)
+        {
+                mMsg->addStringFast(_PREHASH_GroupName, entry.mGroupName);
+        }
+        else
+        {
+                mMsg->addStringFast(_PREHASH_FirstName, entry.mFirstName);
+                mMsg->addStringFast(_PREHASH_LastName, entry.mLastName);
         }
 
-        void ReplySender::flush()
+        if(mMsg->isSendFullFast(_PREHASH_UUIDNameBlock))
         {
-                if (mPending)
-                {
-                        mMsg->sendReliable(mCurrHost);
-                        mPending = false;
-                }
+                flush();
         }
+}
 
+void ReplySender::flush()
+{
+        if (mPending)
+        {
+                mMsg->sendReliable(mCurrHost);
+                mPending = false;
+        }
+}
 
-        typedef std::set<LLUUID>                                        AskQueue;
-        typedef std::vector<PendingReply>                       ReplyQueue;
-        typedef std::map<LLUUID,U32>                            PendingQueue;
-        typedef std::map<LLUUID, LLCacheNameEntry*> Cache;
-        typedef std::vector<LLCacheNameCallback>        Observers;
-};
+
+typedef std::set<LLUUID>                                        AskQueue;
+typedef std::vector<PendingReply>                       ReplyQueue;
+typedef std::map<LLUUID,U32>                            PendingQueue;
+typedef std::map<LLUUID, LLCacheNameEntry*> Cache;
+typedef std::vector<LLCacheNameCallback>        Observers;
 
 class LLCacheName::Impl
 {
diff --git a/linden/indra/llmessage/llcurl.cpp b/linden/indra/llmessage/llcurl.cpp
index 5eaaab0..362204a 100644
--- a/linden/indra/llmessage/llcurl.cpp
+++ b/linden/indra/llmessage/llcurl.cpp
@@ -28,6 +28,8 @@
  * COMPLETENESS OR PERFORMANCE.
  */
 
+#include "linden_common.h"
+
 #include "llcurl.h"
 
 #include <iomanip>
diff --git a/linden/indra/llmessage/llhttpassetstorage.cpp b/linden/indra/llmessage/llhttpassetstorage.cpp
index 5a0cdad..d83349b 100644
--- a/linden/indra/llmessage/llhttpassetstorage.cpp
+++ b/linden/indra/llmessage/llhttpassetstorage.cpp
@@ -428,14 +428,18 @@ void LLHTTPAssetStorage::storeAssetData(
         bool temp_file,
         bool is_priority,
         bool store_local,
-        const LLUUID& requesting_agent_id)
+        const LLUUID& requesting_agent_id,
+        bool user_waiting,
+        F64 timeout)
 {
         if (mVFS->getExists(uuid, type))
         {
                 LLAssetRequest *req = new LLAssetRequest(uuid, type);
-                req->mUpCallback = callback;
-                req->mUserData = user_data;
+                req->mUpCallback    = callback;
+                req->mUserData      = user_data;
                 req->mRequestingAgentID = requesting_agent_id;
+                req->mIsUserWaiting = user_waiting;
+                req->mTimeout       = timeout;
 
                 // this will get picked up and transmitted in checkForTimeouts
                 if(store_local)
@@ -469,7 +473,9 @@ void LLHTTPAssetStorage::storeAssetData(
         LLStoreAssetCallback callback,
         void* user_data,
         bool temp_file,
-        bool is_priority)
+        bool is_priority,
+        bool user_waiting,
+        F64 timeout)
 {
         llinfos << "LLAssetStorage::storeAssetData (legacy)" << asset_id << ":" << LLAssetType::lookup(asset_type) << llendl;
 
@@ -509,7 +515,11 @@ void LLHTTPAssetStorage::storeAssetData(
                         legacyStoreDataCallback,
                         (void**)legacy,
                         temp_file,
-                        is_priority);
+                        is_priority,
+                        false,
+                        LLUUID::null,
+                        user_waiting,
+                        timeout);
         }
         else
         {
@@ -608,7 +618,19 @@ bool LLHTTPAssetStorage::deletePendingRequest(LLAssetStorage::ERequestType rt,
                                         // This request was found in the pending list.  Move it to the end!
                                         LLAssetRequest* pending_req = *result;
                                         pending->remove(pending_req);
-                                        pending->push_back(pending_req);
+
+                                        if (!pending_req->mIsUserWaiting)                               //A user is waiting on this request.  Toss it.
+                                        {
+                                                pending->push_back(pending_req);
+                                        }
+                                        else
+                                        {
+                                                if (pending_req->mUpCallback)   //Clean up here rather than _callUploadCallbacks because this request is already cleared the req.
+                                                {
+                                                        pending_req->mUpCallback(pending_req->getUUID(), pending_req->mUserData, -1);
+                                                }
+
+                                        }
 
                                         llinfos << "Asset " << getRequestName(rt) << " request for "
                                                         << asset_id << "." << LLAssetType::lookup(asset_type)
@@ -744,6 +766,14 @@ void LLHTTPAssetStorage::checkForTimeouts()
 
                 LLHTTPAssetRequest *new_req = new LLHTTPAssetRequest(this, req->getUUID(), 
                                                                         req->getType(), RT_UPLOAD, tmp_url, mCurlMultiHandle);
+
+                if (req->mIsUserWaiting) //If a user is waiting on a realtime response, we want to perserve information across upload attempts.
+                {
+                        new_req->mTime          = req->mTime;
+                        new_req->mTimeout       = req->mTimeout;
+                        new_req->mIsUserWaiting = req->mIsUserWaiting;
+                }
+
                 if (do_compress)
                 {
                         new_req->prepareCompressedUpload();
@@ -839,11 +869,12 @@ void LLHTTPAssetStorage::checkForTimeouts()
                 if (curl_msg && curl_msg->msg == CURLMSG_DONE)
                 {
                         long curl_result = 0;
-                        S32 xfer_result = 0;
+                        S32 xfer_result = LL_ERR_NOERR;
 
                         LLHTTPAssetRequest *req = NULL;
                         curl_easy_getinfo(curl_msg->easy_handle, CURLINFO_PRIVATE, &req);
                                                                 
+                        // TODO: Throw curl_result at all callbacks.
                         curl_easy_getinfo(curl_msg->easy_handle, CURLINFO_HTTP_CODE, &curl_result);
                         if (RT_UPLOAD == req->mRequestType || RT_LOCALUPLOAD == req->mRequestType)
                         {
@@ -865,6 +896,12 @@ void LLHTTPAssetStorage::checkForTimeouts()
                                 {
                                         llwarns << "Re-requesting upload for " << req->getUUID() << ".  Received upload error to " << req->mURLBuffer <<
                                                 " with result " << curl_easy_strerror(curl_msg->data.result) << ", http result " << curl_result << llendl;
+
+                                        ////HACK (probably) I am sick of this getting requeued and driving me mad.
+                                        //if (req->mIsUserWaiting)
+                                        //{
+                                        //      deletePendingRequest(RT_UPLOAD, req->getType(), req->getUUID());
+                                        //}
                                 }
                                 else
                                 {
@@ -949,14 +986,23 @@ void LLHTTPAssetStorage::checkForTimeouts()
 
 void LLHTTPAssetStorage::bumpTimedOutUploads()
 {
+        bool user_waiting=FALSE;
+
+        F64 mt_secs = LLMessageSystem::getMessageTimeSeconds();
+
+        if (mPendingUploads.size())
+        {
+                request_list_t::iterator it = mPendingUploads.begin();
+                LLAssetRequest* req = *it;
+                user_waiting=req->mIsUserWaiting;
+        }
+
         // No point bumping currently running uploads if there are no others in line.
-        if (!(mPendingUploads.size() > mRunningUploads.size())) 
+        if (!(mPendingUploads.size() > mRunningUploads.size()) && !user_waiting) 
         {
                 return;
         }
 
-        F64 mt_secs = LLMessageSystem::getMessageTimeSeconds();
-
         // deletePendingRequest will modify the mRunningUploads list so we don't want to iterate over it.
         request_list_t temp_running = mRunningUploads;
 
@@ -967,7 +1013,7 @@ void LLHTTPAssetStorage::bumpTimedOutUploads()
                 //request_list_t::iterator curiter = iter++;
                 LLAssetRequest* req = *it;
 
-                if ( LL_ASSET_STORAGE_TIMEOUT < (mt_secs - req->mTime) )
+                if ( req->mTimeout < (mt_secs - req->mTime) )
                 {
                         llwarns << "Asset upload request timed out for "
                                         << req->getUUID() << "."
diff --git a/linden/indra/llmessage/llhttpassetstorage.h b/linden/indra/llmessage/llhttpassetstorage.h
index 2977301..962bece 100644
--- a/linden/indra/llmessage/llhttpassetstorage.h
+++ b/linden/indra/llmessage/llhttpassetstorage.h
@@ -66,7 +66,9 @@ public:
                 bool temp_file = false,
                 bool is_priority = false,
                 bool store_local = false,
-                const LLUUID& requesting_agent_id = LLUUID::null);
+                const LLUUID& requesting_agent_id = LLUUID::null,
+                bool user_waiting=FALSE,
+                F64 timeout=LL_ASSET_STORAGE_TIMEOUT);
 
         virtual void storeAssetData(
                 const char* filename,
@@ -75,7 +77,9 @@ public:
                 LLStoreAssetCallback callback,
                 void* user_data,
                 bool temp_file,
-                bool is_priority);
+                bool is_priority,
+                bool user_waiting=FALSE,
+                F64 timeout=LL_ASSET_STORAGE_TIMEOUT);
 
         virtual LLSD getPendingDetails(ERequestType rt,
                                         LLAssetType::EType asset_type,
diff --git a/linden/indra/llmessage/llhttpnode.cpp b/linden/indra/llmessage/llhttpnode.cpp
index 97064a1..25413b4 100644
--- a/linden/indra/llmessage/llhttpnode.cpp
+++ b/linden/indra/llmessage/llhttpnode.cpp
@@ -29,7 +29,7 @@
 #include "linden_common.h"
 #include "llhttpnode.h"
 
-#include "boost/tokenizer.hpp"
+#include <boost/tokenizer.hpp>
 
 #include "llstl.h"
 
diff --git a/linden/indra/llmessage/lliohttpserver.cpp b/linden/indra/llmessage/lliohttpserver.cpp
index d7fc54e..5c96102 100644
--- a/linden/indra/llmessage/lliohttpserver.cpp
+++ b/linden/indra/llmessage/lliohttpserver.cpp
@@ -49,7 +49,7 @@
 
 #include <sstream>
 
-#include "boost/tokenizer.hpp"
+#include <boost/tokenizer.hpp>
 
 static const char HTTP_VERSION_STR[] = "HTTP/1.0";
 static const std::string CONTEXT_REQUEST("request");
diff --git a/linden/indra/llmessage/lliosocket.cpp b/linden/indra/llmessage/lliosocket.cpp
index 0ceb436..8bc347c 100644
--- a/linden/indra/llmessage/lliosocket.cpp
+++ b/linden/indra/llmessage/lliosocket.cpp
@@ -441,6 +441,8 @@ LLIOPipe::EStatus LLIOSocketWriter::process_impl(
 #if LL_WINDOWS
                         if (status == 730035)
                                 break;
+#else
+                        (void) status;
 #endif 
                         mLastWritten = segment.data() + len - 1;
 
diff --git a/linden/indra/llmessage/llmessagethrottle.cpp b/linden/indra/llmessage/llmessagethrottle.cpp
index 07c22a5..bbaa9d8 100644
--- a/linden/indra/llmessage/llmessagethrottle.cpp
+++ b/linden/indra/llmessage/llmessagethrottle.cpp
@@ -26,6 +26,8 @@
  * COMPLETENESS OR PERFORMANCE.
  */
 
+#include "linden_common.h"
+
 #include "llhash.h"
 
 #include "llmessagethrottle.h"
diff --git a/linden/indra/llmessage/llservicebuilder.cpp b/linden/indra/llmessage/llservicebuilder.cpp
index 86b7d9d..91040c0 100644
--- a/linden/indra/llmessage/llservicebuilder.cpp
+++ b/linden/indra/llmessage/llservicebuilder.cpp
@@ -26,6 +26,7 @@
  * COMPLETENESS OR PERFORMANCE.
 */
 
+#include "linden_common.h"
 #include "llapp.h"
 #include "llfile.h"
 #include "llservicebuilder.h"
diff --git a/linden/indra/llmessage/lltemplatemessagereader.cpp b/linden/indra/llmessage/lltemplatemessagereader.cpp
index 892efb8..bb3f4f4 100644
--- a/linden/indra/llmessage/lltemplatemessagereader.cpp
+++ b/linden/indra/llmessage/lltemplatemessagereader.cpp
@@ -594,7 +594,7 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
                                                 tsize = tsizeh;
                                                 break;
                                         case 4:
-                                                htonmemcpy(&tsizeb, &buffer[decode_pos], MVT_U32, 4);
+                                                htonmemcpy(&tsize, &buffer[decode_pos], MVT_U32, 4);
                                                 break;
                                         default:
                                                 llerrs << "Attempting to read variable field with unknown size of " << data_size << llendl;
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index ab41cca..d1c2875 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -1341,7 +1341,7 @@ LLMessageSystem::~LLMessageSystem()
         
         if (!mbError)
         {
-                end_net();
+                end_net(mSocket);
         }
         
         delete mTemplateMessageReader;
@@ -1355,6 +1355,9 @@ LLMessageSystem::~LLMessageSystem()
         delete mLLSDMessageReader;
         mLLSDMessageReader = NULL;
 
+        delete mLLSDMessageBuilder;
+        mLLSDMessageBuilder = NULL;
+
         delete mPollInfop;
         mPollInfop = NULL;
 
@@ -4164,11 +4167,13 @@ void LLMessageSystem::dumpPacketToLog()
         char line_buffer[256];          /* Flawfinder: ignore */
         S32 i;
         S32 cur_line_pos = 0;
-
         S32 cur_line = 0;
+
         for (i = 0; i < mTrueReceiveSize; i++)
         {
-                snprintf(line_buffer + cur_line_pos*3, sizeof(line_buffer),"%02x ", mTrueReceiveBuffer[i]);     /* Flawfinder: ignore */
+                S32 offset = cur_line_pos * 3;
+                snprintf(line_buffer + offset, sizeof(line_buffer) - offset,
+                                 "%02x ", mTrueReceiveBuffer[i]);       /* Flawfinder: ignore */
                 cur_line_pos++;
                 if (cur_line_pos >= 16)
                 {
@@ -4345,11 +4350,6 @@ std::string get_shared_secret()
 
 typedef std::map<const char*, LLMessageBuilder*> BuilderMap;
 
-static void setBuilder(BuilderMap& map, const char* name, LLMessageBuilder* builder)
-{
-        map[gMessageStringTable.getString(name)] = builder;
-}
-
 void LLMessageSystem::newMessageFast(const char *name)
 {
         if(LLMessageConfig::isMessageBuiltTemplate(name))
diff --git a/linden/indra/llmessage/net.cpp b/linden/indra/llmessage/net.cpp
index c61f4a2..1395093 100644
--- a/linden/indra/llmessage/net.cpp
+++ b/linden/indra/llmessage/net.cpp
@@ -289,8 +289,12 @@ S32 start_net(S32& socket_out, int& nPort)
         return 0;
 }
 
-void end_net()
+void end_net(S32& socket_out)
 {
+        if (socket_out < 0)
+        {
+                closesocket(socket_out);
+        }
         WSACleanup();
 }
 
@@ -457,8 +461,12 @@ S32 start_net(S32& socket_out, int& nPort)
         return 0;
 }
 
-void end_net()
+void end_net(S32& socket_out)
 {
+        if (socket_out < 0)
+        {
+                close(socket_out);
+        }
 }
 
 int receive_packet(int hSocket, char * receiveBuffer)
diff --git a/linden/indra/llmessage/net.h b/linden/indra/llmessage/net.h
index b2f931f..cfc1f88 100644
--- a/linden/indra/llmessage/net.h
+++ b/linden/indra/llmessage/net.h
@@ -40,7 +40,7 @@ class LLHost;
 // Returns 0 on success, non-zero on error.
 // Sets socket handler/descriptor, changes nPort if port requested is unavailable.
 S32             start_net(S32& socket_out, int& nPort);                                                         
-void    end_net();
+void    end_net(S32& socket_out);
 
 // returns size of packet or -1 in case of error
 S32             receive_packet(int hSocket, char * receiveBuffer);