Second Life viewer sources 1.15.1.3

24 files changed, 338 insertions, 139 deletions

diff --git a/linden/indra/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp
index 4f4fc0c..c8610a7 100644
--- a/linden/indra/llmessage/llassetstorage.cpp
+++ b/linden/indra/llmessage/llassetstorage.cpp
@@ -57,10 +57,6 @@ LLAssetStorage *gAssetStorage = NULL;
 
 const LLUUID CATEGORIZE_LOST_AND_FOUND_ID("00000000-0000-0000-0000-000000000010");
 
-const F32 LL_ASSET_STORAGE_TIMEOUT = 300.0f;  // anything that takes longer than this will abort
-
-
-
 ///----------------------------------------------------------------------------
 /// LLAssetInfo
 ///----------------------------------------------------------------------------
@@ -837,43 +833,6 @@ void LLAssetStorage::downloadInvItemCompleteCallback(
 // Store routines
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-// virtual
-void LLAssetStorage::cancelStoreAsset(
-        const LLUUID& uuid,
-        LLAssetType::EType atype)
-{
-        bool do_callback = true;
-        LLAssetRequest* req = NULL;
-
-        if(mPendingUploads.size() > 0)
-        {
-                req = mPendingUploads.front();
-                if((req->getUUID() == uuid) && (req->getType() == atype))
-                {
-                        // This is probably because the request is in progress - do
-                        // not attempt to cancel.
-                        do_callback = false;
-                }
-        }
-
-        if (mPendingLocalUploads.size() > 0)
-                {
-                req = mPendingLocalUploads.front();
-                if((req->getUUID() == uuid) && (req->getType() == atype))
-                {
-                        // This is probably because the request is in progress - do
-                        // not attempt to cancel.
-                        do_callback = false;
-                }               
-        }
-
-        if (do_callback)
-        {
-                        // clear it out of the upload queue if it is there.
-                        _callUploadCallbacks(uuid, atype, FALSE);
-        }
-}
-
 // static
 void LLAssetStorage::uploadCompleteCallback(const LLUUID& uuid, void *user_data, S32 result) // StoreAssetData callback (fixed)
 {
diff --git a/linden/indra/llmessage/llassetstorage.h b/linden/indra/llmessage/llassetstorage.h
index 3c7a709..f80a77d 100644
--- a/linden/indra/llmessage/llassetstorage.h
+++ b/linden/indra/llmessage/llassetstorage.h
@@ -48,6 +48,10 @@ class LLAssetStorage;
 class LLVFS;
 class LLSD;
 
+// anything that takes longer than this to download will abort.
+// HTTP Uploads also timeout if they take longer than this.
+const F32 LL_ASSET_STORAGE_TIMEOUT = 5 * 60.0f;  
+
 class LLAssetInfo
 {
 protected:
@@ -264,13 +268,6 @@ public:
                 bool store_local = false,
                 const LLUUID& requesting_agent_id = LLUUID::null);
 
-        // This call will attempt to clear a store asset. This will only
-        // attempt to cancel an upload that has not yet begun. The
-        // callback will be called with an error code.
-        virtual void cancelStoreAsset(
-                const LLUUID& uuid,
-                LLAssetType::EType oatype); 
-
         virtual void checkForTimeouts();
 
         void getEstateAsset(const LLHost &object_sim, const LLUUID &agent_id, const LLUUID &session_id,
diff --git a/linden/indra/llmessage/llcachename.cpp b/linden/indra/llmessage/llcachename.cpp
index 5df62b3..1cc7e09 100644
--- a/linden/indra/llmessage/llcachename.cpp
+++ b/linden/indra/llmessage/llcachename.cpp
@@ -52,6 +52,10 @@ const char* CN_NONE = "(none)";
 const char* CN_HIPPOS = "(hippos)";
 const F32 HIPPO_PROBABILITY = 0.01f;
 
+// We track name requests in flight for up to this long.
+// We won't re-request a name during this time
+const U32 PENDING_TIMEOUT_SECS = 5 * 60;
+
 // File version number
 const S32 CN_FILE_VERSION = 2;
 
@@ -182,8 +186,9 @@ namespace {
         }
 
 
-        typedef std::vector<LLUUID>                                     AskQueue;
+        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;
 };
@@ -200,6 +205,9 @@ public:
         AskQueue                        mAskNameQueue;
         AskQueue                        mAskGroupQueue;
                 // UUIDs to ask our upstream host about
+        
+        PendingQueue            mPendingQueue;
+                // UUIDs that have been requested but are not in cache yet.
 
         ReplyQueue                      mReplyQueue;
                 // requests awaiting replies from us
@@ -214,6 +222,7 @@ public:
         void processPendingAsks();
         void processPendingReplies();
         void sendRequest(const char* msg_name, const AskQueue& queue);
+        bool isRequestPending(const LLUUID& id);
 
         // Message system callbacks.
         void processUUIDRequest(LLMessageSystem* msg, bool isGroup);
@@ -456,7 +465,10 @@ BOOL LLCacheName::getName(const LLUUID& id, char* first, char* last)
                                                 : CN_WAITING);
                 strcpy(last, "");       /*Flawfinder: ignore*/
 
-                impl.mAskNameQueue.push_back(id);
+                if (!impl.isRequestPending(id))
+                {
+                        impl.mAskNameQueue.insert(id);
+                }       
                 return FALSE;
         }
 
@@ -496,8 +508,10 @@ BOOL LLCacheName::getGroupName(const LLUUID& id, char* group)
                 // The function signature needs to change to pass in the length
                 // of first and last.
                 strcpy(group, CN_WAITING);      /*Flawfinder: ignore*/
-
-                impl.mAskGroupQueue.push_back(id);
+                if (!impl.isRequestPending(id))
+                {
+                        impl.mAskGroupQueue.insert(id);
+                }
                 return FALSE;
         }
 }
@@ -525,13 +539,16 @@ void LLCacheName::get(const LLUUID& id, BOOL is_group, LLCacheNameCallback callb
         }
         else
         {
-                if (!is_group)
-                {
-                        impl.mAskNameQueue.push_back(id);
-                }
-                else
+                if (!impl.isRequestPending(id))
                 {
-                        impl.mAskGroupQueue.push_back(id);
+                        if (!is_group)
+                        {
+                                impl.mAskNameQueue.insert(id);
+                        }
+                        else
+                        {
+                                impl.mAskGroupQueue.insert(id);
+                        }
                 }
                 impl.mReplyQueue.push_back(PendingReply(id, callback, user_data));
         }
@@ -570,6 +587,19 @@ void LLCacheName::deleteEntriesOlderThan(S32 secs)
                         impl.mCache.erase(curiter);
                 }
         }
+
+        // These are pending requests that we never heard back from.
+        U32 pending_expire_time = now - PENDING_TIMEOUT_SECS;
+        for(PendingQueue::iterator p_iter = impl.mPendingQueue.begin();
+                p_iter != impl.mPendingQueue.end(); )
+        {
+                PendingQueue::iterator p_curitor = p_iter++;
+ 
+                if (p_curitor->second < pending_expire_time)
+                {
+                        impl.mPendingQueue.erase(p_curitor);
+                }
+        }
 }
 
 
@@ -599,6 +629,18 @@ void LLCacheName::dump()
         }
 }
 
+void LLCacheName::dumpStats()
+{
+        llinfos << "Queue sizes: "
+                        << " Cache=" << impl.mCache.size()
+                        << " AskName=" << impl.mAskNameQueue.size()
+                        << " AskGroup=" << impl.mAskGroupQueue.size()
+                        << " Pending=" << impl.mPendingQueue.size()
+                        << " Reply=" << impl.mReplyQueue.size()
+                        << " Observers=" << impl.mObservers.size()
+                        << llendl;
+}
+
 void LLCacheName::Impl::processPendingAsks()
 {
         sendRequest(_PREHASH_UUIDNameRequest, mAskNameQueue);
@@ -702,7 +744,23 @@ void LLCacheName::Impl::notifyObservers(const LLUUID& id,
         }
 }
 
+bool LLCacheName::Impl::isRequestPending(const LLUUID& id)
+{
+        U32 now = (U32)time(NULL);
+        U32 expire_time = now - PENDING_TIMEOUT_SECS;
 
+        PendingQueue::iterator iter = mPendingQueue.find(id);
+
+        if (iter == mPendingQueue.end()
+                || (iter->second < expire_time) )
+        {
+                mPendingQueue[id] = now;
+                return false;
+        }
+
+        return true;
+}
+        
 void LLCacheName::Impl::processUUIDRequest(LLMessageSystem* msg, bool isGroup)
 {
         // You should only get this message if the cache is at the simulator
@@ -740,13 +798,16 @@ void LLCacheName::Impl::processUUIDRequest(LLMessageSystem* msg, bool isGroup)
                 }
                 else
                 {
-                        if (isGroup)
+                        if (!isRequestPending(id))
                         {
-                                mAskGroupQueue.push_back(id);
-                        }
-                        else
-                        {
-                                mAskNameQueue.push_back(id);
+                                if (isGroup)
+                                {
+                                        mAskGroupQueue.insert(id);
+                                }
+                                else
+                                {
+                                        mAskNameQueue.insert(id);
+                                }
                         }
                         
                         mReplyQueue.push_back(PendingReply(id, fromHost));
@@ -770,6 +831,8 @@ void LLCacheName::Impl::processUUIDReply(LLMessageSystem* msg, bool isGroup)
                         mCache[id] = entry;
                 }
 
+                mPendingQueue.erase(id);
+
                 entry->mIsGroup = isGroup;
                 entry->mCreateTime = (U32)time(NULL);
                 if (!isGroup)
diff --git a/linden/indra/llmessage/llcachename.h b/linden/indra/llmessage/llcachename.h
index 9009b1f..7d606e6 100644
--- a/linden/indra/llmessage/llcachename.h
+++ b/linden/indra/llmessage/llcachename.h
@@ -98,7 +98,8 @@ public:
         void deleteEntriesOlderThan(S32 secs);
 
         // Debugging
-        void dump();
+        void dump();            // Dumps the contents of the cache
+        void dumpStats();       // Dumps the sizes of the cache and associated queues.
 
 private:
         class Impl;
diff --git a/linden/indra/llmessage/llcircuit.cpp b/linden/indra/llmessage/llcircuit.cpp
index 5e93e0a..239c1df 100644
--- a/linden/indra/llmessage/llcircuit.cpp
+++ b/linden/indra/llmessage/llcircuit.cpp
@@ -1167,13 +1167,13 @@ std::ostream& operator<<(std::ostream& s, LLCircuitData& circuit)
         return s;
 }
 
-const char* LLCircuitData::getInfoString() const
+const LLString LLCircuitData::getInfoString() const
 {
         std::ostringstream info;
         info << "Circuit: " << mHost << std::endl
                  << (mbAlive ? "Alive" : "Not Alive") << std::endl
                  << "Age: " << mExistenceTimer.getElapsedTimeF32() << std::endl;
-        return info.str().c_str();
+        return LLString(info.str());
 }
 
 void LLCircuitData::dumpResendCountAndReset()
@@ -1197,7 +1197,7 @@ std::ostream& operator<<(std::ostream& s, LLCircuit &circuit)
         return s;
 }
 
-const char* LLCircuit::getInfoString() const
+const LLString LLCircuit::getInfoString() const
 {
         std::ostringstream info;
         info << "Circuit Info:" << std::endl;
@@ -1207,7 +1207,7 @@ const char* LLCircuit::getInfoString() const
         {
                 info << (*it).second->getInfoString() << std::endl;
         }
-        return info.str().c_str();
+        return LLString(info.str());
 }
 
 void LLCircuit::getCircuitRange(
diff --git a/linden/indra/llmessage/llcircuit.h b/linden/indra/llmessage/llcircuit.h
index e3a5779..1eea203 100644
--- a/linden/indra/llmessage/llcircuit.h
+++ b/linden/indra/llmessage/llcircuit.h
@@ -151,7 +151,7 @@ public:
         //
         void                                    checkPeriodTime();              // Reset per-period counters if necessary.
         friend std::ostream&    operator<<(std::ostream& s, LLCircuitData &circuit);
-        const char* getInfoString() const;
+        const LLString getInfoString() const;
 
         friend class LLCircuit;
         friend class LLMessageSystem;
@@ -297,7 +297,7 @@ public:
         void sendAcks();
 
         friend std::ostream& operator<<(std::ostream& s, LLCircuit &circuit);
-        const char* getInfoString() const;
+        const LLString getInfoString() const;
 
         void                    dumpResends();
 
diff --git a/linden/indra/llmessage/lldatapacker.cpp b/linden/indra/llmessage/lldatapacker.cpp
index 2448c40..3cdaa25 100644
--- a/linden/indra/llmessage/lldatapacker.cpp
+++ b/linden/indra/llmessage/lldatapacker.cpp
@@ -972,11 +972,11 @@ BOOL LLDataPackerAsciiBuffer::packF32(const F32 value, const char *name)
         int numCopied = 0;
         if (mWriteEnabled)
         {
-                numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%g\n", value);       /* Flawfinder: ignore */
+                numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%f\n", value);               /* Flawfinder: ignore */
         }
         else
         {
-                numCopied = snprintf(DUMMY_BUFFER, sizeof(DUMMY_BUFFER), "%g\n", value);        /* Flawfinder: ignore */
+                numCopied = snprintf(DUMMY_BUFFER, sizeof(DUMMY_BUFFER), "%f\n", value);                /* Flawfinder: ignore */        
         }
         // snprintf returns number of bytes that would have been written
         // had the output not being truncated. In that case, it will
@@ -1004,7 +1004,7 @@ BOOL LLDataPackerAsciiBuffer::unpackF32(F32 &value, const char *name)
                 return FALSE;
         }
 
-        sscanf(valuestr,"%g", &value);
+        sscanf(valuestr,"%f", &value);
         return success;
 }
 
@@ -1016,11 +1016,11 @@ BOOL LLDataPackerAsciiBuffer::packColor4(const LLColor4 &value, const char *name
         int numCopied = 0;
         if (mWriteEnabled)
         {
-            numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%g %g %g %g\n", value.mV[0], value.mV[1], value.mV[2], value.mV[3]);     /* Flawfinder: ignore */
+                numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%f %f %f %f\n", value.mV[0], value.mV[1], value.mV[2], value.mV[3]); /* Flawfinder: ignore */
         }
         else
         {
-                numCopied = snprintf(DUMMY_BUFFER,sizeof(DUMMY_BUFFER),"%g %g %g %g\n", value.mV[0], value.mV[1], value.mV[2], value.mV[3]);    /* Flawfinder: ignore */
+                numCopied = snprintf(DUMMY_BUFFER,sizeof(DUMMY_BUFFER),"%f %f %f %f\n", value.mV[0], value.mV[1], value.mV[2], value.mV[3]);    /* Flawfinder: ignore */
         }
         // snprintf returns number of bytes that would have been written
         // had the output not being truncated. In that case, it will
@@ -1048,7 +1048,7 @@ BOOL LLDataPackerAsciiBuffer::unpackColor4(LLColor4 &value, const char *name)
                 return FALSE;
         }
 
-        sscanf(valuestr,"%g %g %g %g", &value.mV[0], &value.mV[1], &value.mV[2], &value.mV[3]);
+        sscanf(valuestr,"%f %f %f %f", &value.mV[0], &value.mV[1], &value.mV[2], &value.mV[3]);
         return success;
 }
 
@@ -1109,11 +1109,11 @@ BOOL LLDataPackerAsciiBuffer::packVector2(const LLVector2 &value, const char *na
         int numCopied = 0;
         if (mWriteEnabled)
         {
-                numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%g %g\n", value.mV[0], value.mV[1]); /* Flawfinder: ignore */
+                numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%f %f\n", value.mV[0], value.mV[1]); /* Flawfinder: ignore */
         }
         else
         {
-                numCopied = snprintf(DUMMY_BUFFER,sizeof(DUMMY_BUFFER),"%g %g\n", value.mV[0], value.mV[1]);    /* Flawfinder: ignore */
+                numCopied = snprintf(DUMMY_BUFFER,sizeof(DUMMY_BUFFER),"%f %f\n", value.mV[0], value.mV[1]);            /* Flawfinder: ignore */
         }
         // snprintf returns number of bytes that would have been written
         // had the output not being truncated. In that case, it will
@@ -1141,7 +1141,7 @@ BOOL LLDataPackerAsciiBuffer::unpackVector2(LLVector2 &value, const char *name)
                 return FALSE;
         }
 
-        sscanf(valuestr,"%g %g", &value.mV[0], &value.mV[1]);
+        sscanf(valuestr,"%f %f", &value.mV[0], &value.mV[1]);
         return success;
 }
 
@@ -1153,11 +1153,11 @@ BOOL LLDataPackerAsciiBuffer::packVector3(const LLVector3 &value, const char *na
         int numCopied = 0;
         if (mWriteEnabled)
         {
-                numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%g %g %g\n", value.mV[0], value.mV[1], value.mV[2]); /* Flawfinder: ignore */
+                numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%f %f %f\n", value.mV[0], value.mV[1], value.mV[2]); /* Flawfinder: ignore */
         }
         else
         {
-                numCopied = snprintf(DUMMY_BUFFER,sizeof(DUMMY_BUFFER),"%g %g %g\n", value.mV[0], value.mV[1], value.mV[2]);    /* Flawfinder: ignore */
+                numCopied = snprintf(DUMMY_BUFFER,sizeof(DUMMY_BUFFER),"%f %f %f\n", value.mV[0], value.mV[1], value.mV[2]);    /* Flawfinder: ignore */
         }
         // snprintf returns number of bytes that would have been written
         // had the output not being truncated. In that case, it will
@@ -1185,7 +1185,7 @@ BOOL LLDataPackerAsciiBuffer::unpackVector3(LLVector3 &value, const char *name)
                 return FALSE;
         }
 
-        sscanf(valuestr,"%g %g %g", &value.mV[0], &value.mV[1], &value.mV[2]);
+        sscanf(valuestr,"%f %f %f", &value.mV[0], &value.mV[1], &value.mV[2]);
         return success;
 }
 
@@ -1196,11 +1196,11 @@ BOOL LLDataPackerAsciiBuffer::packVector4(const LLVector4 &value, const char *na
         int numCopied = 0;
         if (mWriteEnabled)
         {
-                numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%g %g %g %g\n", value.mV[0], value.mV[1], value.mV[2], value.mV[3]); /* Flawfinder: ignore */
+                numCopied = snprintf(mCurBufferp,getBufferSize()-getCurrentSize(),"%f %f %f %f\n", value.mV[0], value.mV[1], value.mV[2], value.mV[3]); /* Flawfinder: ignore */
         }
         else
         {
-                numCopied = snprintf(DUMMY_BUFFER,sizeof(DUMMY_BUFFER),"%g %g %g %g\n", value.mV[0], value.mV[1], value.mV[2], value.mV[3]);    /* Flawfinder: ignore */
+                numCopied = snprintf(DUMMY_BUFFER,sizeof(DUMMY_BUFFER),"%f %f %f %f\n", value.mV[0], value.mV[1], value.mV[2], value.mV[3]);    /* Flawfinder: ignore */
         }
         // snprintf returns number of bytes that would have been written
         // had the output not being truncated. In that case, it will
@@ -1228,7 +1228,7 @@ BOOL LLDataPackerAsciiBuffer::unpackVector4(LLVector4 &value, const char *name)
                 return FALSE;
         }
 
-        sscanf(valuestr,"%g %g %g %g", &value.mV[0], &value.mV[1], &value.mV[2], &value.mV[3]);
+        sscanf(valuestr,"%f %f %f %f", &value.mV[0], &value.mV[1], &value.mV[2], &value.mV[3]);
         return success;
 }
 
@@ -1359,6 +1359,19 @@ BOOL LLDataPackerAsciiBuffer::getValueStr(const char *name, char *out_value, S32
         return success;
 }
 
+// helper function used by LLDataPackerAsciiFile
+// to convert F32 into a string. This is to avoid
+// << operator writing F32 value into a stream 
+// since it does not seem to preserve the float value
+std::string convertF32ToString(F32 val)
+{
+        std::string str;
+        char  buf[20];
+        snprintf(buf, 20, "%f", val);
+        str = buf;
+        return str;
+}
+
 //---------------------------------------------------------------------------
 // LLDataPackerAsciiFile implementation
 //---------------------------------------------------------------------------
@@ -1633,11 +1646,11 @@ BOOL LLDataPackerAsciiFile::packF32(const F32 value, const char *name)
         writeIndentedName(name);
         if (mFP)
         {
-                fprintf(mFP,"%g\n", value);     
+                fprintf(mFP,"%f\n", value);     
         }
         else if (mOutputStream)
         {
-                *mOutputStream <<"" << value << "\n";
+                *mOutputStream <<"" << convertF32ToString(value) << "\n";
         }
         return success;
 }
@@ -1652,7 +1665,7 @@ BOOL LLDataPackerAsciiFile::unpackF32(F32 &value, const char *name)
                 return FALSE;
         }
 
-        sscanf(valuestr,"%g", &value);
+        sscanf(valuestr,"%f", &value);
         return success;
 }
 
@@ -1663,11 +1676,11 @@ BOOL LLDataPackerAsciiFile::packColor4(const LLColor4 &value, const char *name)
         writeIndentedName(name);
         if (mFP)
         {
-                fprintf(mFP,"%g %g %g %g\n", value.mV[0], value.mV[1], value.mV[2], value.mV[3]);       
+                fprintf(mFP,"%f %f %f %f\n", value.mV[0], value.mV[1], value.mV[2], value.mV[3]);       
         }
         else if (mOutputStream)
         {
-                *mOutputStream << value.mV[0] << " " << value.mV[1] << " " << value.mV[2] << " " << value.mV[3] << "\n";
+                *mOutputStream << convertF32ToString(value.mV[0]) << " " << convertF32ToString(value.mV[1]) << " " << convertF32ToString(value.mV[2]) << " " << convertF32ToString(value.mV[3]) << "\n";
         }
         return success;
 }
@@ -1682,7 +1695,7 @@ BOOL LLDataPackerAsciiFile::unpackColor4(LLColor4 &value, const char *name)
                 return FALSE;
         }
 
-        sscanf(valuestr,"%g %g %g %g", &value.mV[0], &value.mV[1], &value.mV[2], &value.mV[3]);
+        sscanf(valuestr,"%f %f %f %f", &value.mV[0], &value.mV[1], &value.mV[2], &value.mV[3]);
         return success;
 }
 
@@ -1728,11 +1741,11 @@ BOOL LLDataPackerAsciiFile::packVector2(const LLVector2 &value, const char *name
         writeIndentedName(name);
         if (mFP)
         {
-                fprintf(mFP,"%g %g\n", value.mV[0], value.mV[1]);       
+                fprintf(mFP,"%f %f\n", value.mV[0], value.mV[1]);       
         }
         else if (mOutputStream)
         {
-                *mOutputStream << value.mV[0] << " " << value.mV[1] << "\n";
+                *mOutputStream << convertF32ToString(value.mV[0]) << " " << convertF32ToString(value.mV[1]) << "\n";
         }
         return success;
 }
@@ -1747,7 +1760,7 @@ BOOL LLDataPackerAsciiFile::unpackVector2(LLVector2 &value, const char *name)
                 return FALSE;
         }
 
-        sscanf(valuestr,"%g %g", &value.mV[0], &value.mV[1]);
+        sscanf(valuestr,"%f %f", &value.mV[0], &value.mV[1]);
         return success;
 }
 
@@ -1758,11 +1771,11 @@ BOOL LLDataPackerAsciiFile::packVector3(const LLVector3 &value, const char *name
         writeIndentedName(name);
         if (mFP)
         {
-                fprintf(mFP,"%g %g %g\n", value.mV[0], value.mV[1], value.mV[2]);       
+                fprintf(mFP,"%f %f %f\n", value.mV[0], value.mV[1], value.mV[2]);       
         }
         else if (mOutputStream)
         {
-                *mOutputStream << value.mV[0] << " " << value.mV[1] << " " << value.mV[2] << "\n";
+                *mOutputStream << convertF32ToString(value.mV[0]) << " " << convertF32ToString(value.mV[1]) << " " << convertF32ToString(value.mV[2]) << "\n";
         }
         return success;
 }
@@ -1777,7 +1790,7 @@ BOOL LLDataPackerAsciiFile::unpackVector3(LLVector3 &value, const char *name)
                 return FALSE;
         }
 
-        sscanf(valuestr,"%g %g %g", &value.mV[0], &value.mV[1], &value.mV[2]);
+        sscanf(valuestr,"%f %f %f", &value.mV[0], &value.mV[1], &value.mV[2]);
         return success;
 }
 
@@ -1787,11 +1800,11 @@ BOOL LLDataPackerAsciiFile::packVector4(const LLVector4 &value, const char *name
         writeIndentedName(name);
         if (mFP)
         {
-                fprintf(mFP,"%g %g %g %g\n", value.mV[0], value.mV[1], value.mV[2], value.mV[3]);       
+                fprintf(mFP,"%f %f %f %f\n", value.mV[0], value.mV[1], value.mV[2], value.mV[3]);       
         }
         else if (mOutputStream)
         {
-                *mOutputStream << value.mV[0] << " " << value.mV[1] << " " << value.mV[2] << " " << value.mV[3] << "\n";
+                *mOutputStream << convertF32ToString(value.mV[0]) << " " << convertF32ToString(value.mV[1]) << " " << convertF32ToString(value.mV[2]) << " " << convertF32ToString(value.mV[3]) << "\n";
         }
         return success;
 }
@@ -1806,7 +1819,7 @@ BOOL LLDataPackerAsciiFile::unpackVector4(LLVector4 &value, const char *name)
                 return FALSE;
         }
 
-        sscanf(valuestr,"%g %g %g %g", &value.mV[0], &value.mV[1], &value.mV[2], &value.mV[3]);
+        sscanf(valuestr,"%f %f %f %f", &value.mV[0], &value.mV[1], &value.mV[2], &value.mV[3]);
         return success;
 }
 
@@ -1848,7 +1861,8 @@ BOOL LLDataPackerAsciiFile::unpackUUID(LLUUID &value, const char *name)
 
 void LLDataPackerAsciiFile::writeIndentedName(const char *name)
 {
-        char indent_buf[64]; /*Flawfinder: ignore*/
+        std::string indent_buf;
+        indent_buf.reserve(mIndent+1);
 
         S32 i;
         for(i = 0; i < mIndent; i++)
@@ -1858,11 +1872,11 @@ void LLDataPackerAsciiFile::writeIndentedName(const char *name)
         indent_buf[i] = 0;
         if (mFP)
         {
-                fprintf(mFP,"%s%s\t",indent_buf, name);         
+                fprintf(mFP,"%s%s\t",indent_buf.c_str(), name);         
         }
         else if (mOutputStream)
         {
-                *mOutputStream << indent_buf << name << "\t";
+                *mOutputStream << indent_buf.c_str() << name << "\t";
         }
 }
 
diff --git a/linden/indra/llmessage/llhttpassetstorage.cpp b/linden/indra/llmessage/llhttpassetstorage.cpp
index 8e328ce..5a0cdad 100644
--- a/linden/indra/llmessage/llhttpassetstorage.cpp
+++ b/linden/indra/llmessage/llhttpassetstorage.cpp
@@ -34,6 +34,7 @@
 #include <sys/stat.h>
 
 #include "indra_constants.h"
+#include "message.h"
 #include "llvfile.h"
 #include "llvfs.h"
 
@@ -517,6 +518,8 @@ void LLHTTPAssetStorage::storeAssetData(
                         callback(LLUUID::null, user_data, LL_ERR_CANNOT_OPEN_FILE);
                 }
         }
+        // Coverity CID-269 says there's a leak of 'legacy' here, but
+        // legacyStoreDataCallback() will delete it somewhere down the line.
 }
 
 // virtual
@@ -937,9 +940,45 @@ void LLHTTPAssetStorage::checkForTimeouts()
         } while (curl_msg && queue_length > 0);
         
 
+        // Cleanup 
+        // We want to bump to the back of the line any running uploads that have timed out.
+        bumpTimedOutUploads();
+
         LLAssetStorage::checkForTimeouts();
 }
 
+void LLHTTPAssetStorage::bumpTimedOutUploads()
+{
+        // No point bumping currently running uploads if there are no others in line.
+        if (!(mPendingUploads.size() > mRunningUploads.size())) 
+        {
+                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;
+
+        request_list_t::iterator it = temp_running.begin();
+        request_list_t::iterator end = temp_running.end();
+        for ( ; it != end; ++it)
+        {
+                //request_list_t::iterator curiter = iter++;
+                LLAssetRequest* req = *it;
+
+                if ( LL_ASSET_STORAGE_TIMEOUT < (mt_secs - req->mTime) )
+                {
+                        llwarns << "Asset upload request timed out for "
+                                        << req->getUUID() << "."
+                                        << LLAssetType::lookup(req->getType()) 
+                                        << ", bumping to the back of the line!" << llendl;
+
+                        deletePendingRequest(RT_UPLOAD, req->getType(), req->getUUID());
+                }
+        }
+}
+
 // static
 size_t LLHTTPAssetStorage::curlDownCallback(void *data, size_t size, size_t nmemb, void *user_data)
 {
diff --git a/linden/indra/llmessage/llhttpassetstorage.h b/linden/indra/llmessage/llhttpassetstorage.h
index b5ab56b..2977301 100644
--- a/linden/indra/llmessage/llhttpassetstorage.h
+++ b/linden/indra/llmessage/llhttpassetstorage.h
@@ -133,6 +133,10 @@ private:
         // This will return the correct base URI for any http asset request
         std::string getBaseURL(const LLUUID& asset_id, LLAssetType::EType asset_type);
 
+        // Check for running uploads that have timed out
+        // Bump these to the back of the line to let other uploads complete.
+        void bumpTimedOutUploads();
+
 protected:
         std::string             mBaseURL;
         std::string             mLocalBaseURL;
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index 1d38a13..8cb8344 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -37,6 +37,7 @@
 #include "llsdserialize.h"
 #include "llvfile.h"
 #include "llvfs.h"
+#include "lluri.h"
 
 #include "message.h"
 #include <curl/curl.h>
@@ -283,6 +284,14 @@ void LLHTTPClient::get(const std::string& url, ResponderPtr responder, const F32
         request(url, LLURLRequest::HTTP_GET, NULL, responder, timeout);
 }
 
+void LLHTTPClient::get(const std::string& url, const LLSD& query, ResponderPtr responder, const F32 timeout)
+{
+        LLURI uri;
+        
+        uri = LLURI::buildHTTP(url, LLSD::emptyArray(), query);
+        get(uri.asString(), responder, timeout);
+}
+
 // A simple class for managing data returned from a curl http request.
 class LLHTTPBuffer
 {
diff --git a/linden/indra/llmessage/llhttpclient.h b/linden/indra/llmessage/llhttpclient.h
index 136577c..c2dfb5d 100644
--- a/linden/indra/llmessage/llhttpclient.h
+++ b/linden/indra/llmessage/llhttpclient.h
@@ -73,6 +73,7 @@ public:
         typedef boost::intrusive_ptr<Responder> ResponderPtr;
         
         static void get(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void get(const std::string& url, const LLSD& query, ResponderPtr, 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);
                 ///< non-blocking
         static void post(const std::string& url, const LLSD& body, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
diff --git a/linden/indra/llmessage/lliohttpserver.cpp b/linden/indra/llmessage/lliohttpserver.cpp
index 9ea7272..d7fc54e 100644
--- a/linden/indra/llmessage/lliohttpserver.cpp
+++ b/linden/indra/llmessage/lliohttpserver.cpp
@@ -29,9 +29,8 @@
  */
 
 #include "linden_common.h"
-#include "lliohttpserver.h"
 
-#include "boost/tokenizer.hpp"
+#include "lliohttpserver.h"
 
 #include "llapr.h"
 #include "llbuffer.h"
@@ -46,9 +45,12 @@
 #include "llsd.h"
 #include "llsdserialize_xml.h"
 #include "llstl.h"
+#include "lltimer.h"
 
 #include <sstream>
 
+#include "boost/tokenizer.hpp"
+
 static const char HTTP_VERSION_STR[] = "HTTP/1.0";
 static const std::string CONTEXT_REQUEST("request");
 static const std::string HTTP_VERB_GET("GET");
@@ -56,6 +58,8 @@ static const std::string HTTP_VERB_PUT("PUT");
 static const std::string HTTP_VERB_POST("POST");
 static const std::string HTTP_VERB_DELETE("DELETE");
 
+static LLIOHTTPServer::timing_callback_t sTimingCallback = NULL;
+static void* sTimingCallbackData = NULL;
 
 class LLHTTPPipe : public LLIOPipe
 {
@@ -151,6 +155,12 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
                 // TODO: Babbage: Parameterize parser?
                 LLBufferStream istr(channels, buffer.get());
 
+                static LLTimer timer;
+                if (sTimingCallback)
+                {
+                        timer.reset();
+                }
+
                 std::string verb = context[CONTEXT_REQUEST]["verb"];
                 if(verb == HTTP_VERB_GET)
                 {
@@ -179,6 +189,18 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
                     mResponse->methodNotAllowed();
                 }
 
+                if (sTimingCallback)
+                {
+                        LLHTTPNode::Description desc;
+                        mNode.describe(desc);
+                        LLSD info = desc.getInfo();
+                        std::string timing_name = info["description"];
+                        timing_name += " ";
+                        timing_name += verb;
+                        F32 delta = timer.getElapsedTimeF32();
+                        sTimingCallback(timing_name.c_str(), delta, sTimingCallbackData);
+                }
+
                 // Log Internal Server Errors
                 if(mStatusCode == 500)
                 {
@@ -819,9 +841,9 @@ LLIOPipe::EStatus LLHTTPResponder::process_impl(
 }
 
 
-
-void LLCreateHTTPPipe(LLPumpIO::chain_t& chain,
-                const LLHTTPNode& root, const LLSD& ctx)
+// static 
+void LLIOHTTPServer::createPipe(LLPumpIO::chain_t& chain, 
+        const LLHTTPNode& root, const LLSD& ctx)
 {
         chain.push_back(LLIOPipe::ptr_t(new LLHTTPResponder(root, ctx)));
 }
@@ -832,7 +854,7 @@ class LLHTTPResponseFactory : public LLChainIOFactory
 public:
         bool build(LLPumpIO::chain_t& chain, LLSD ctx) const
         {
-                LLCreateHTTPPipe(chain, mTree, ctx);
+                LLIOHTTPServer::createPipe(chain, mTree, ctx);
                 return true;
         }
 
@@ -843,7 +865,8 @@ private:
 };
 
 
-LLHTTPNode& LLCreateHTTPServer(
+// static
+LLHTTPNode& LLIOHTTPServer::create(
         apr_pool_t* pool, LLPumpIO& pump, U16 port)
 {
         LLSocket::ptr_t socket = LLSocket::create(
@@ -867,3 +890,10 @@ LLHTTPNode& LLCreateHTTPServer(
         return factory->getRootNode();
 }
 
+// static
+void LLIOHTTPServer::setTimingCallback(timing_callback_t callback,
+                                                                           void* data)
+{
+        sTimingCallback = callback;
+        sTimingCallbackData = data;
+}
diff --git a/linden/indra/llmessage/lliohttpserver.h b/linden/indra/llmessage/lliohttpserver.h
index 64dce63..8a6c8d4 100644
--- a/linden/indra/llmessage/lliohttpserver.h
+++ b/linden/indra/llmessage/lliohttpserver.h
@@ -36,7 +36,12 @@
 
 class LLPumpIO;
 
-LLHTTPNode& LLCreateHTTPServer(apr_pool_t* pool, LLPumpIO& pump, U16 port);
+class LLIOHTTPServer
+{
+public:
+        typedef void (*timing_callback_t)(const char* hashed_name, F32 time, void* data);
+
+        static LLHTTPNode& create(apr_pool_t* pool, LLPumpIO& pump, U16 port);
         /**< Creates an HTTP wire server on the pump for the given TCP port.
          *
          *   Returns the root node of the new server.  Add LLHTTPNode instances
@@ -51,14 +56,23 @@ LLHTTPNode& LLCreateHTTPServer(apr_pool_t* pool, LLPumpIO& pump, U16 port);
          *   for example), use the helper templates below.
          */
  
-void LLCreateHTTPPipe(LLPumpIO::chain_t& chain,
-                const LLHTTPNode& root, const LLSD& ctx);
+        static void createPipe(LLPumpIO::chain_t& chain, 
+            const LLHTTPNode& root, const LLSD& ctx);
         /**< Create a pipe on the chain that handles HTTP requests.
          *   The requests are served by the node tree given at root.
          *
          *   This is primarily useful for unit testing.
          */
 
+        static void setTimingCallback(timing_callback_t callback, void* data);
+        /**< Register a callback function that will be called every time
+        *    a GET, PUT, POST, or DELETE is handled.
+        *
+        * This is used to time the LLHTTPNode handler code, which often hits
+        * the database or does other, slow operations. JC
+        */
+};
+
 /* @name Helper Templates
  *
  * These templates make it easy to create nodes that use thier own protocol
diff --git a/linden/indra/llmessage/lliosocket.cpp b/linden/indra/llmessage/lliosocket.cpp
index af22180..0ceb436 100644
--- a/linden/indra/llmessage/lliosocket.cpp
+++ b/linden/indra/llmessage/lliosocket.cpp
@@ -423,23 +423,35 @@ LLIOPipe::EStatus LLIOSocketWriter::process_impl(
         bool done = false;
         while(it != end)
         {
+
                 PUMP_DEBUG;
                 if((*it).isOnChannel(channels.in()))
                 {
                         PUMP_DEBUG;
                         // *FIX: check return code - sockets will fail (broken, etc.)
                         len = (apr_size_t)segment.size();
-                        apr_socket_send(
+                        apr_status_t status = apr_socket_send(
                                 mDestination->getSocket(),
                                 (const char*)segment.data(),
                                 &len);
+                        // We sometimes get a 'non-blocking socket operation could not be 
+                        // completed immediately' error from apr_socket_send.  In this
+                        // case we break and the data will be sent the next time the chain
+                        // is pumped.
+#if LL_WINDOWS
+                        if (status == 730035)
+                                break;
+#endif 
                         mLastWritten = segment.data() + len - 1;
+
                         PUMP_DEBUG;
                         if((S32)len < segment.size())
                         {
                                 break;
                         }
+                        
                 }
+
                 ++it;
                 if(it != end)
                 {
@@ -449,6 +461,7 @@ LLIOPipe::EStatus LLIOSocketWriter::process_impl(
                 {
                         done = true;
                 }
+
         }
         PUMP_DEBUG;
         if(done && eos)
diff --git a/linden/indra/llmessage/llmail.cpp b/linden/indra/llmessage/llmail.cpp
index 793cb19..633a2a3 100644
--- a/linden/indra/llmessage/llmail.cpp
+++ b/linden/indra/llmessage/llmail.cpp
@@ -64,7 +64,7 @@ static apr_sockaddr_t* gSockAddr;
 static apr_socket_t* gMailSocket;
 
 // According to RFC2822
-static const boost::regex valid_subject_chars("[\\x1-\\x9\\xb\\xc\\xe-\\x7f]+");
+static const boost::regex valid_subject_chars("[\\x1-\\x9\\xb\\xc\\xe-\\x7f]*");
 bool connect_smtp();
 void disconnect_smtp();
  
diff --git a/linden/indra/llmessage/llmessage.vcproj b/linden/indra/llmessage/llmessage.vcproj
index ac16f52..d3e0d89 100644
--- a/linden/indra/llmessage/llmessage.vcproj
+++ b/linden/indra/llmessage/llmessage.vcproj
@@ -440,6 +440,9 @@
                                 RelativePath=".\llhttpsender.h">
                         </File>
                         <File
+                                RelativePath=".\llhttpnode.h">
+                        </File>
+                        <File
                                 RelativePath=".\llinstantmessage.h">
                         </File>
                         <File
diff --git a/linden/indra/llmessage/llpacketbuffer.cpp b/linden/indra/llmessage/llpacketbuffer.cpp
index 69144f5..525569d 100644
--- a/linden/indra/llmessage/llpacketbuffer.cpp
+++ b/linden/indra/llmessage/llpacketbuffer.cpp
@@ -42,11 +42,13 @@ LLPacketBuffer::LLPacketBuffer(const LLHost &host, const char *datap, const S32
         {
                 llerrs << "Sending packet > " << NET_BUFFER_SIZE << " of size " << size << llendl;
         }
-
-        if (datap != NULL)
+        else // we previously relied on llerrs being fatal to not get here...
         {
-                memcpy(mData, datap, size);     /*Flawfinder: ignore*/
-                mSize = size;
+                if (datap != NULL)
+                {
+                        memcpy(mData, datap, size);
+                        mSize = size;
+                }
         }
         
 }
diff --git a/linden/indra/llmessage/llregionflags.h b/linden/indra/llmessage/llregionflags.h
index 6a23544..fb9bf5b 100644
--- a/linden/indra/llmessage/llregionflags.h
+++ b/linden/indra/llmessage/llregionflags.h
@@ -63,7 +63,7 @@ const U32 REGION_FLAGS_SKIP_COLLISIONS			= (1 << 12); // Pin all non agent rigid
 const U32 REGION_FLAGS_SKIP_SCRIPTS                             = (1 << 13);
 const U32 REGION_FLAGS_SKIP_PHYSICS                             = (1 << 14); // Skip all physics
 const U32 REGION_FLAGS_EXTERNALLY_VISIBLE               = (1 << 15);
-const U32 REGION_FLAGS_MAINLAND_VISIBLE                 = (1 << 16);
+//const U32 REGION_FLAGS_MAINLAND_VISIBLE                       = (1 << 16);
 const U32 REGION_FLAGS_PUBLIC_ALLOWED                   = (1 << 17);
 const U32 REGION_FLAGS_BLOCK_DWELL                              = (1 << 18);
 
@@ -99,7 +99,6 @@ const U32 REGION_FLAGS_PRELUDE_UNSET = REGION_FLAGS_ALLOW_LANDMARK
                                                                            | REGION_FLAGS_ALLOW_SET_HOME;
 
 const U32 REGION_FLAGS_ESTATE_MASK = REGION_FLAGS_EXTERNALLY_VISIBLE
-                                                                         | REGION_FLAGS_MAINLAND_VISIBLE
                                                                          | REGION_FLAGS_PUBLIC_ALLOWED  
                                                                          | REGION_FLAGS_SUN_FIXED
                                                                          | REGION_FLAGS_DENY_ANONYMOUS
diff --git a/linden/indra/llmessage/lltransfermanager.cpp b/linden/indra/llmessage/lltransfermanager.cpp
index 12e1728..f42ce45 100644
--- a/linden/indra/llmessage/lltransfermanager.cpp
+++ b/linden/indra/llmessage/lltransfermanager.cpp
@@ -958,6 +958,7 @@ void LLTransferTargetChannel::requestTransfer(
         if (!ttp)
         {
                 llwarns << "LLTransferManager::requestTransfer aborting due to target creation failure!" << llendl;
+                return;
         }
 
         ttp->applyParams(target_params);
diff --git a/linden/indra/llmessage/llurlrequest.cpp b/linden/indra/llmessage/llurlrequest.cpp
index b3dfb52..1c7648b 100644
--- a/linden/indra/llmessage/llurlrequest.cpp
+++ b/linden/indra/llmessage/llurlrequest.cpp
@@ -544,7 +544,10 @@ size_t headerCallback(void* data, size_t size, size_t nmemb, void* user)
                 int statusCode = atoi(status.c_str());
                 if (statusCode > 0)
                 {
-                        complete->httpStatus((U32)statusCode, reason);
+                        if (complete)
+                        {
+                                complete->httpStatus((U32)statusCode, reason);
+                        }
                 }
         }
 
diff --git a/linden/indra/llmessage/llxfer_file.cpp b/linden/indra/llmessage/llxfer_file.cpp
index 297d163..33db248 100644
--- a/linden/indra/llmessage/llxfer_file.cpp
+++ b/linden/indra/llmessage/llxfer_file.cpp
@@ -82,7 +82,8 @@ void LLXfer_File::init (const LLString& local_filename, BOOL delete_local_on_com
 
         if (!local_filename.empty())
         {
-                strncpy(mLocalFilename, local_filename.c_str(), LL_MAX_PATH);           /* Flawfinder : ignore */
+                strncpy(mLocalFilename, local_filename.c_str(), LL_MAX_PATH-1);
+                mLocalFilename[LL_MAX_PATH-1] = '\0'; // stupid strncpy.
 
                 // You can only automatically delete .tmp file as a safeguard against nasty messages.
                 mDeleteLocalOnCompletion = (delete_local_on_completion && (strstr(mLocalFilename,".tmp") == &mLocalFilename[strlen(mLocalFilename)-4]));                /* Flawfinder : ignore */
@@ -117,19 +118,21 @@ void LLXfer_File::free ()
 ///////////////////////////////////////////////////////////
 
 S32 LLXfer_File::initializeRequest(U64 xfer_id,
-                                                                   const LLString& local_filename,
-                                                                   const LLString& remote_filename,
-                                                                   ELLPath remote_path,
-                                                                   const LLHost& remote_host,
-                                                                   BOOL delete_remote_on_completion,
-                                                                   void (*callback)(void**,S32),
-                                                                   void** user_data)
+                                   const LLString& local_filename,
+                                   const LLString& remote_filename,
+                                   ELLPath remote_path,
+                                   const LLHost& remote_host,
+                                   BOOL delete_remote_on_completion,
+                                   void (*callback)(void**,S32),
+                                   void** user_data)
 {
         S32 retval = 0;  // presume success
         
         mID = xfer_id;
-        strncpy(mLocalFilename, local_filename.c_str(), LL_MAX_PATH);           /* Flawfinder : ignore */
-        strncpy(mRemoteFilename,remote_filename.c_str(), LL_MAX_PATH);          /* Flawfinder : ignore */
+        strncpy(mLocalFilename, local_filename.c_str(), LL_MAX_PATH-1);
+        mLocalFilename[LL_MAX_PATH-1] = '\0'; // stupid strncpy.
+        strncpy(mRemoteFilename,remote_filename.c_str(), LL_MAX_PATH-1);
+        mRemoteFilename[LL_MAX_PATH-1] = '\0'; // stupid strncpy.
         mRemotePath = remote_path;
         mRemoteHost = remote_host;
         mDeleteRemoteOnCompletion = delete_remote_on_completion;
diff --git a/linden/indra/llmessage/llxfer_mem.cpp b/linden/indra/llmessage/llxfer_mem.cpp
index e9b4224..0f055c8 100644
--- a/linden/indra/llmessage/llxfer_mem.cpp
+++ b/linden/indra/llmessage/llxfer_mem.cpp
@@ -162,7 +162,8 @@ S32 LLXfer_Mem::initializeRequest(U64 xfer_id,
         mCallbackDataHandle = user_data;
         mCallbackResult = LL_ERR_NOERR;
 
-        strncpy(mRemoteFilename, remote_filename.c_str(), LL_MAX_PATH);         /* Flawfinder : ignore */
+        strncpy(mRemoteFilename, remote_filename.c_str(), LL_MAX_PATH-1);
+        mRemoteFilename[LL_MAX_PATH-1] = '\0'; // stupid strncpy.
         mRemotePath = remote_path;
         mDeleteRemoteOnCompletion = delete_remote_on_completion;
 
diff --git a/linden/indra/llmessage/llxfermanager.cpp b/linden/indra/llmessage/llxfermanager.cpp
index 914488e..7758a32 100644
--- a/linden/indra/llmessage/llxfermanager.cpp
+++ b/linden/indra/llmessage/llxfermanager.cpp
@@ -223,8 +223,8 @@ LLXfer *LLXferManager::findXfer (U64 id, LLXfer *list_head)
 
 void LLXferManager::removeXfer (LLXfer *delp, LLXfer **list_head)
 {
-    LLXfer *xferp;
-        
+        // This function assumes that delp will only occur in the list
+        // zero or one times.
         if (delp)
         {
                 if (*list_head == delp)
@@ -234,14 +234,14 @@ void LLXferManager::removeXfer (LLXfer *delp, LLXfer **list_head)
                 }
                 else
                 {
-                        xferp = *list_head;
+                        LLXfer *xferp = *list_head;
                         while (xferp->mNext)
                         {
                                 if (xferp->mNext == delp)
                                 {
                                         xferp->mNext = delp->mNext;
                                         delete (delp);
-                                        continue;
+                                        break;
                                 }
                                 xferp = xferp->mNext;
                         }
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index ef22b63..29f232c 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -535,6 +535,8 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
         if(!filename)
         {
                 llerrs << "No template filename specified" << llendl;
+                mbError = TRUE;
+                return;
         }
 
         char token[MAX_MESSAGE_INTERNAL_NAME_SIZE]; /* Flawfinder: ignore */ 
@@ -655,6 +657,13 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
                                         // add data!
                                         // we've gotten a complete variable! hooray!
                                         // add it!
+                                        if (NULL == templatep)
+                                        {
+                                                llerrs << "Trying to addTemplate a NULL templatep during load." << llendl;
+                                                mbError = TRUE;
+                                                fclose(messagefilep);
+                                                return;
+                                        }
                                         addTemplate(templatep);
 
                                         //llinfos << "Read template: "templatep->mNametemp_str
@@ -672,7 +681,13 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
                                         // add data!
                                         // we've gotten a complete variable! hooray!
                                         // add it to template
-
+                                        if (NULL == templatep)
+                                        {
+                                                llerrs << "Trying to addBlock to NULL templatep during load." << llendl;
+                                                mbError = TRUE;
+                                                fclose(messagefilep);
+                                                return;
+                                        }
                                         templatep->addBlock(blockp);
 
                                         // start working on it!
@@ -876,10 +891,24 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
 
                                 if (strcmp(token, "Trusted") == 0)
                                 {
+                                        if (NULL == templatep)
+                                        {
+                                                llerrs << "Trying to setTrust for NULL templatep during load." << llendl;
+                                                mbError = TRUE;
+                                                fclose(messagefilep);
+                                                return;
+                                        }
                                         templatep->setTrust(MT_TRUST);
                                 }
                                 else if (strcmp(token, "NotTrusted") == 0)
                                 {
+                                        if (NULL == templatep)
+                                        {
+                                                llerrs << "Trying to setTrust for NULL templatep during load." << llendl;
+                                                mbError = TRUE;
+                                                fclose(messagefilep);
+                                                return;
+                                        }
                                         templatep->setTrust(MT_NOTRUST);
                                 }
                                 else
@@ -912,10 +941,24 @@ void LLMessageSystem::loadTemplateFile(const char* filename)
 
                                 if(0 == strcmp(token, "Unencoded"))
                                 {
+                                        if (NULL == templatep)
+                                        {
+                                                llerrs << "Trying to setEncoding for NULL templatep during load." << llendl;
+                                                mbError = TRUE;
+                                                fclose(messagefilep);
+                                                return;
+                                        }
                                         templatep->setEncoding(ME_UNENCODED);
                                 }
                                 else if(0 == strcmp(token, "Zerocoded"))
                                 {
+                                        if (NULL == templatep)
+                                        {
+                                                llerrs << "Trying to setEncoding for NULL templatep during load." << llendl;
+                                                mbError = TRUE;
+                                                fclose(messagefilep);
+                                                return;
+                                        }
                                         templatep->setEncoding(ME_ZEROCODED);
                                 }
                                 else