Second Life viewer sources 1.18.3.2-RC

27 files changed, 104 insertions, 83 deletions

diff --git a/linden/indra/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp
index 8696438..b1d7fef 100644
--- a/linden/indra/llmessage/llassetstorage.cpp
+++ b/linden/indra/llmessage/llassetstorage.cpp
@@ -365,11 +365,11 @@ void LLAssetStorage::_cleanupRequests(BOOL all, S32 error)
                 LLAssetRequest* tmp = *curiter;
                 if (tmp->mUpCallback)
                 {
-                        tmp->mUpCallback(tmp->getUUID(), tmp->mUserData, error);
+                        tmp->mUpCallback(tmp->getUUID(), tmp->mUserData, error, LL_EXSTAT_NONE);
                 }
                 if (tmp->mDownCallback)
                 {
-                        tmp->mDownCallback(mVFS, tmp->getUUID(), tmp->getType(), tmp->mUserData, error);
+                        tmp->mDownCallback(mVFS, tmp->getUUID(), tmp->getType(), tmp->mUserData, error, LL_EXSTAT_NONE);
                 }
                 if (tmp->mInfoCallback)
                 {
@@ -390,7 +390,7 @@ BOOL LLAssetStorage::hasLocalAsset(const LLUUID &uuid, const LLAssetType::EType
 ///////////////////////////////////////////////////////////////////////////
 
 // IW - uuid is passed by value to avoid side effects, please don't re-add &    
-void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, void (*callback)(LLVFS *vfs, const LLUUID&, LLAssetType::EType, void *,S32), void *user_data, BOOL is_priority)
+void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, void (*callback)(LLVFS *vfs, const LLUUID&, LLAssetType::EType, void *, S32, LLExtStat), void *user_data, BOOL is_priority)
 {
         lldebugs << "LLAssetStorage::getAssetData() - " << uuid << "," << LLAssetType::lookup(type) << llendl;
 
@@ -404,7 +404,7 @@ void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, vo
                 // Special case early out for NULL uuid
                 if (callback)
                 {
-                        callback(mVFS, uuid, type, user_data, LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE);
+                        callback(mVFS, uuid, type, user_data, LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE, LL_EXSTAT_NULL_UUID);
                 }
                 return;
         }
@@ -459,7 +459,7 @@ void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, vo
                 // unless there's a weird error
                 if (callback)
                 {
-                        callback(mVFS, uuid, type, user_data, LL_ERR_NOERR);
+                        callback(mVFS, uuid, type, user_data, LL_ERR_NOERR, LL_EXSTAT_VFS_CACHED);
                 }
         }
 }
@@ -502,7 +502,7 @@ void LLAssetStorage::_queueDataRequest(const LLUUID& uuid, LLAssetType::EType at
                 llwarns << "Attempt to move asset data request upstream w/o valid upstream provider" << llendl;
                 if (callback)
                 {
-                        callback(mVFS, uuid, atype, user_data, LL_ERR_CIRCUIT_GONE);
+                        callback(mVFS, uuid, atype, user_data, LL_ERR_CIRCUIT_GONE, LL_EXSTAT_NO_UPSTREAM);
                 }
         }
 }
@@ -512,7 +512,7 @@ void LLAssetStorage::downloadCompleteCallback(
         S32 result,
         const LLUUID& file_id,
         LLAssetType::EType file_type,
-        void* user_data)
+        void* user_data, LLExtStat ext_status)
 {
         lldebugs << "LLAssetStorage::downloadCompleteCallback() for " << file_id
                  << "," << LLAssetType::lookup(file_type) << llendl;
@@ -566,7 +566,7 @@ void LLAssetStorage::downloadCompleteCallback(
                 LLAssetRequest* tmp = *curiter;
                 if (tmp->mDownCallback)
                 {
-                        tmp->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getType(), tmp->mUserData, result);
+                        tmp->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getType(), tmp->mUserData, result, ext_status);
                 }
                 delete tmp;
         }
@@ -586,7 +586,7 @@ void LLAssetStorage::getEstateAsset(const LLHost &object_sim, const LLUUID &agen
                 // Special case early out for NULL uuid
                 if (callback)
                 {
-                        callback(mVFS, asset_id, atype, user_data, LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE);
+                        callback(mVFS, asset_id, atype, user_data, LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE, LL_EXSTAT_NULL_UUID);
                 }
                 return;
         }
@@ -642,7 +642,7 @@ void LLAssetStorage::getEstateAsset(const LLHost &object_sim, const LLUUID &agen
                         llwarns << "Attempt to move asset data request upstream w/o valid upstream provider" << llendl;
                         if (callback)
                         {
-                                callback(mVFS, asset_id, atype, user_data, LL_ERR_CIRCUIT_GONE);
+                                callback(mVFS, asset_id, atype, user_data, LL_ERR_CIRCUIT_GONE, LL_EXSTAT_NO_UPSTREAM);
                         }
                 }
         }
@@ -653,7 +653,7 @@ void LLAssetStorage::getEstateAsset(const LLHost &object_sim, const LLUUID &agen
                 // unless there's a weird error
                 if (callback)
                 {
-                        callback(mVFS, asset_id, atype, user_data, LL_ERR_NOERR);
+                        callback(mVFS, asset_id, atype, user_data, LL_ERR_NOERR, LL_EXSTAT_VFS_CACHED);
                 }
         }
 }
@@ -662,7 +662,8 @@ void LLAssetStorage::downloadEstateAssetCompleteCallback(
         S32 result,
         const LLUUID& file_id,
         LLAssetType::EType file_type,
-        void* user_data)
+        void* user_data,
+        LLExtStat ext_status)
 {
         LLEstateAssetRequest *req = (LLEstateAssetRequest*)user_data;
         if(!req)
@@ -693,7 +694,7 @@ void LLAssetStorage::downloadEstateAssetCompleteCallback(
                 }
         }
 
-        req->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getAType(), req->mUserData, result);
+        req->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getAType(), req->mUserData, result, ext_status);
 }
 
 void LLAssetStorage::getInvItemAsset(const LLHost &object_sim, const LLUUID &agent_id, const LLUUID &session_id,
@@ -777,7 +778,7 @@ void LLAssetStorage::getInvItemAsset(const LLHost &object_sim, const LLUUID &age
                         llwarns << "Attempt to move asset data request upstream w/o valid upstream provider" << llendl;
                         if (callback)
                         {
-                                callback(mVFS, asset_id, atype, user_data, LL_ERR_CIRCUIT_GONE);
+                                callback(mVFS, asset_id, atype, user_data, LL_ERR_CIRCUIT_GONE, LL_EXSTAT_NO_UPSTREAM);
                         }
                 }
         }
@@ -788,7 +789,7 @@ void LLAssetStorage::getInvItemAsset(const LLHost &object_sim, const LLUUID &age
                 // unless there's a weird error
                 if (callback)
                 {
-                        callback(mVFS, asset_id, atype, user_data, LL_ERR_NOERR);
+                        callback(mVFS, asset_id, atype, user_data, LL_ERR_NOERR, LL_EXSTAT_VFS_CACHED);
                 }
         }
 }
@@ -798,7 +799,8 @@ void LLAssetStorage::downloadInvItemCompleteCallback(
         S32 result,
         const LLUUID& file_id,
         LLAssetType::EType file_type,
-        void* user_data)
+        void* user_data,
+        LLExtStat ext_status)
 {
         LLInvItemRequest *req = (LLInvItemRequest*)user_data;
         if(!req)
@@ -828,7 +830,7 @@ void LLAssetStorage::downloadInvItemCompleteCallback(
                 }
         }
 
-        req->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getType(), req->mUserData, result);
+        req->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getType(), req->mUserData, result, ext_status);
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -836,7 +838,7 @@ void LLAssetStorage::downloadInvItemCompleteCallback(
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // static
-void LLAssetStorage::uploadCompleteCallback(const LLUUID& uuid, void *user_data, S32 result) // StoreAssetData callback (fixed)
+void LLAssetStorage::uploadCompleteCallback(const LLUUID& uuid, void *user_data, S32 result, LLExtStat ext_status) // StoreAssetData callback (fixed)
 {
         if (!gAssetStorage)
         {
@@ -876,10 +878,10 @@ void LLAssetStorage::processUploadComplete(LLMessageSystem *msg, void **user_dat
         msg->getBOOLFast(_PREHASH_AssetBlock, _PREHASH_Success, success);
 
         asset_type = (LLAssetType::EType)asset_type_s8;
-        this_ptr->_callUploadCallbacks(uuid, asset_type, success);
+        this_ptr->_callUploadCallbacks(uuid, asset_type, success, LL_EXSTAT_NONE);
 }
 
-void LLAssetStorage::_callUploadCallbacks(const LLUUID &uuid, LLAssetType::EType asset_type, BOOL success)
+void LLAssetStorage::_callUploadCallbacks(const LLUUID &uuid, LLAssetType::EType asset_type, BOOL success, LLExtStat ext_status )
 {
         // SJB: We process the callbacks in reverse order, I do not know if this is important,
         //      but I didn't want to mess with it.
@@ -913,7 +915,7 @@ void LLAssetStorage::_callUploadCallbacks(const LLUUID &uuid, LLAssetType::EType
                 LLAssetRequest* req = *curiter;
                 if (req->mUpCallback)
                 {
-                        req->mUpCallback(uuid, req->mUserData, (success ?  LL_ERR_NOERR :  LL_ERR_ASSET_REQUEST_FAILED ));
+                        req->mUpCallback(uuid, req->mUserData, (success ?  LL_ERR_NOERR :  LL_ERR_ASSET_REQUEST_FAILED ), ext_status );
                 }
                 delete req;
         }
@@ -1136,11 +1138,11 @@ bool LLAssetStorage::deletePendingRequest(LLAssetStorage::request_list_t* reques
                 // Run callbacks.
                 if (req->mUpCallback)
                 {
-                        req->mUpCallback(req->getUUID(), req->mUserData, error);
+                        req->mUpCallback(req->getUUID(), req->mUserData, error, LL_EXSTAT_REQUEST_DROPPED);
                 }
                 if (req->mDownCallback)
                 {
-                        req->mDownCallback(mVFS, req->getUUID(), req->getType(), req->mUserData, error);
+                        req->mDownCallback(mVFS, req->getUUID(), req->getType(), req->mUserData, error, LL_EXSTAT_REQUEST_DROPPED);
                 }
                 if (req->mInfoCallback)
                 {
@@ -1193,7 +1195,7 @@ const char* LLAssetStorage::getErrorString(S32 status)
 
 
 
-void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, void (*callback)(const char*, const LLUUID&, void *, S32), void *user_data, BOOL is_priority)
+void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, void (*callback)(const char*, const LLUUID&, void *, S32, LLExtStat), void *user_data, BOOL is_priority)
 {
         // check for duplicates here, since we're about to fool the normal duplicate checker
         for (request_list_t::iterator iter = mPendingDownloads.begin();
@@ -1223,7 +1225,7 @@ void LLAssetStorage::getAssetData(const LLUUID uuid, LLAssetType::EType type, vo
 }
 
 // static
-void LLAssetStorage::legacyGetDataCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 status)
+void LLAssetStorage::legacyGetDataCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 status, LLExtStat ext_status)
 {
         LLLegacyAssetRequest *legacy = (LLLegacyAssetRequest *)user_data;
         char filename[LL_MAX_PATH] = "";        /* Flawfinder: ignore */ 
@@ -1259,7 +1261,7 @@ void LLAssetStorage::legacyGetDataCallback(LLVFS *vfs, const LLUUID &uuid, LLAss
                 }
         }
 
-        legacy->mDownCallback(filename, uuid, legacy->mUserData, status);
+        legacy->mDownCallback(filename, uuid, legacy->mUserData, status, ext_status);
         delete legacy;
 }
 
@@ -1329,12 +1331,12 @@ void LLAssetStorage::storeAssetData(
 }
 
 // static
-void LLAssetStorage::legacyStoreDataCallback(const LLUUID &uuid, void *user_data, S32 status)
+void LLAssetStorage::legacyStoreDataCallback(const LLUUID &uuid, void *user_data, S32 status, LLExtStat ext_status)
 {
         LLLegacyAssetRequest *legacy = (LLLegacyAssetRequest *)user_data;
         if (legacy && legacy->mUpCallback)
         {
-                legacy->mUpCallback(uuid, legacy->mUserData, status);
+                legacy->mUpCallback(uuid, legacy->mUserData, status, ext_status);
         }
         delete legacy;
 }
diff --git a/linden/indra/llmessage/llassetstorage.h b/linden/indra/llmessage/llassetstorage.h
index ab12b7a..630268d 100644
--- a/linden/indra/llmessage/llassetstorage.h
+++ b/linden/indra/llmessage/llassetstorage.h
@@ -40,6 +40,7 @@
 #include "lltransfermanager.h" // For LLTSCode enum
 #include "llassettype.h"
 #include "llstring.h"
+#include "llextendedstatus.h"
 
 // Forward declarations
 class LLMessageSystem;
@@ -102,8 +103,8 @@ protected:
         LLAssetType::EType mType;
 
 public:
-        void    (*mDownCallback)(LLVFS*, const LLUUID&, LLAssetType::EType, void *, S32);
-        void    (*mUpCallback)(const LLUUID&, void *, S32);
+        void    (*mDownCallback)(LLVFS*, const LLUUID&, LLAssetType::EType, void *, S32, LLExtStat);
+        void    (*mUpCallback)(const LLUUID&, void *, S32, LLExtStat);
         void    (*mInfoCallback)(LLAssetInfo *, void *, S32);
 
         void    *mUserData;
@@ -150,7 +151,7 @@ protected:
         LLAssetType::EType mType;
 
 public:
-        void    (*mDownCallback)(LLVFS*, const LLUUID&, LLAssetType::EType, void *, S32);
+        void    (*mDownCallback)(LLVFS*, const LLUUID&, LLAssetType::EType, void *, S32, LLExtStat);
 
         void    *mUserData;
         LLHost  mHost;
@@ -180,7 +181,7 @@ protected:
         EstateAssetType mEstateAssetType;
 
 public:
-        void    (*mDownCallback)(LLVFS*, const LLUUID&, LLAssetType::EType, void *, S32);
+        void    (*mDownCallback)(LLVFS*, const LLUUID&, LLAssetType::EType, void *, S32, LLExtStat);
 
         void    *mUserData;
         LLHost  mHost;
@@ -196,14 +197,14 @@ public:
 
 
 typedef void (*LLGetAssetCallback)(LLVFS *vfs, const LLUUID &asset_id,
-                                                                                 LLAssetType::EType asset_type, void *user_data, S32 status);
+                                                                                 LLAssetType::EType asset_type, void *user_data, S32 status, LLExtStat ext_status);
 
 class LLAssetStorage
 {
 public:
         // VFS member is public because static child methods need it :(
         LLVFS *mVFS;
-        typedef void (*LLStoreAssetCallback)(const LLUUID &asset_id, void *user_data, S32 status);
+        typedef void (*LLStoreAssetCallback)(const LLUUID &asset_id, void *user_data, S32 status, LLExtStat ext_status);
 
         enum ERequestType
         {
@@ -335,27 +336,27 @@ public:
                 S32 result,
                 const LLUUID& file_id,
                 LLAssetType::EType file_type,
-                void* user_data);
+                void* user_data, LLExtStat ext_status);
         static void downloadEstateAssetCompleteCallback(
                 S32 result,
                 const LLUUID& file_id,
                 LLAssetType::EType file_type,
-                void* user_data);
+                void* user_data, LLExtStat ext_status);
         static void downloadInvItemCompleteCallback(
                 S32 result,
                 const LLUUID& file_id,
                 LLAssetType::EType file_type,
-                void* user_data);
+                void* user_data, LLExtStat ext_status);
 
         // upload process callbacks
-        static void uploadCompleteCallback(const LLUUID&, void *user_data, S32 result);
+        static void uploadCompleteCallback(const LLUUID&, void *user_data, S32 result, LLExtStat ext_status);
         static void processUploadComplete(LLMessageSystem *msg, void **this_handle);
 
         // debugging
         static const char* getErrorString( S32 status );
 
         // deprecated file-based methods
-        void getAssetData(const LLUUID uuid, LLAssetType::EType type, void (*callback)(const char*, const LLUUID&, void *, S32), void *user_data, BOOL is_priority = FALSE);
+        void getAssetData(const LLUUID uuid, LLAssetType::EType type, void (*callback)(const char*, const LLUUID&, void *, S32, LLExtStat), void *user_data, BOOL is_priority = FALSE);
 
         /*
          * AssetID version.
@@ -385,8 +386,8 @@ public:
                 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);
+        static void legacyGetDataCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType, void *user_data, S32 status, LLExtStat ext_status);
+        static void legacyStoreDataCallback(const LLUUID &uuid, void *user_data, S32 status, LLExtStat ext_status);
 
         // Temp assets are stored on sim nodes, they have agent ID and location data associated with them.
         // This is a no-op for non-http asset systems
@@ -404,10 +405,10 @@ public:
 
 protected:
         void _cleanupRequests(BOOL all, S32 error);
-        void _callUploadCallbacks(const LLUUID &uuid, const LLAssetType::EType asset_type, BOOL success);
+        void _callUploadCallbacks(const LLUUID &uuid, const LLAssetType::EType asset_type, BOOL success, LLExtStat ext_status);
 
         virtual void _queueDataRequest(const LLUUID& uuid, LLAssetType::EType type,
-                                                                   void (*callback)(LLVFS *vfs, const LLUUID&, LLAssetType::EType, void *, S32),
+                                                                   void (*callback)(LLVFS *vfs, const LLUUID&, LLAssetType::EType, void *, S32, LLExtStat),
                                                                    void *user_data, BOOL duplicate,
                                                                    BOOL is_priority);
 
@@ -425,7 +426,7 @@ private:
 class LLLegacyAssetRequest
 {
 public:
-        void    (*mDownCallback)(const char *, const LLUUID&, void *, S32);
+        void    (*mDownCallback)(const char *, const LLUUID&, void *, S32, LLExtStat);
         LLAssetStorage::LLStoreAssetCallback mUpCallback;
 
         void    *mUserData;
diff --git a/linden/indra/llmessage/llcircuit.cpp b/linden/indra/llmessage/llcircuit.cpp
index 239c1df..3c947d9 100644
--- a/linden/indra/llmessage/llcircuit.cpp
+++ b/linden/indra/llmessage/llcircuit.cpp
@@ -1158,7 +1158,7 @@ std::ostream& operator<<(std::ostream& s, LLCircuitData& circuit)
         s << S32(circuit.mBytesInLastPeriod * 8.f / circuit.mLastPeriodLength / 1024.f);
         s << "/";
         s << S32(circuit.mBytesOutLastPeriod * 8.f / circuit.mLastPeriodLength / 1024.f);
-        s << " Peak Kbps: ";
+        s << " Peak kbps: ";
         s << S32(circuit.mPeakBPSIn / 1024.f);
         s << "/";
         s << S32(circuit.mPeakBPSOut / 1024.f);
diff --git a/linden/indra/llmessage/llhttpassetstorage.cpp b/linden/indra/llmessage/llhttpassetstorage.cpp
index b6c20b9..924d903 100644
--- a/linden/indra/llmessage/llhttpassetstorage.cpp
+++ b/linden/indra/llmessage/llhttpassetstorage.cpp
@@ -464,7 +464,7 @@ void LLHTTPAssetStorage::storeAssetData(
                 llwarns << "AssetStorage: attempt to upload non-existent vfile " << uuid << ":" << LLAssetType::lookup(type) << llendl;
                 if (callback)
                 {
-                        callback(uuid, user_data,  LL_ERR_ASSET_REQUEST_NONEXISTENT_FILE );
+                        callback(uuid, user_data,  LL_ERR_ASSET_REQUEST_NONEXISTENT_FILE, LL_EXSTAT_NONEXISTENT_FILE);
                 }
         }
 }
@@ -529,7 +529,7 @@ void LLHTTPAssetStorage::storeAssetData(
         {
                 if (callback)
                 {
-                        callback(LLUUID::null, user_data, LL_ERR_CANNOT_OPEN_FILE);
+                        callback(LLUUID::null, user_data, LL_ERR_CANNOT_OPEN_FILE, LL_EXSTAT_BLOCKED_FILE);
                 }
         }
         // Coverity CID-269 says there's a leak of 'legacy' here, but
@@ -631,7 +631,7 @@ bool LLHTTPAssetStorage::deletePendingRequest(LLAssetStorage::ERequestType rt,
                                         {
                                                 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);
+                                                        pending_req->mUpCallback(pending_req->getUUID(), pending_req->mUserData, -1, LL_EXSTAT_REQUEST_DROPPED);
                                                 }
 
                                         }
@@ -657,7 +657,7 @@ bool LLHTTPAssetStorage::deletePendingRequest(LLAssetStorage::ERequestType rt,
 
 // internal requester, used by getAssetData in superclass
 void LLHTTPAssetStorage::_queueDataRequest(const LLUUID& uuid, LLAssetType::EType type,
-                                                                                  void (*callback)(LLVFS *vfs, const LLUUID&, LLAssetType::EType, void *, S32),
+                                                                                  void (*callback)(LLVFS *vfs, const LLUUID&, LLAssetType::EType, void *, S32, LLExtStat),
                                                                                   void *user_data, BOOL duplicate,
                                                                                    BOOL is_priority)
 {
@@ -922,7 +922,7 @@ void LLHTTPAssetStorage::checkForTimeouts()
                                 {
                                         // shared upload finished callback
                                         // in the base class, this is called from processUploadComplete
-                                        _callUploadCallbacks(req->getUUID(), req->getType(), (xfer_result == 0));
+                                        _callUploadCallbacks(req->getUUID(), req->getType(), (xfer_result == 0), LL_EXSTAT_CURL_RESULT | curl_result);
                                         // Pending upload flag will get cleared when the request is deleted
                                 }
                         }
@@ -964,7 +964,8 @@ void LLHTTPAssetStorage::checkForTimeouts()
                                         xfer_result,
                                         req->getUUID(),
                                         req->getType(),
-                                        (void *)req);
+                                        (void *)req,
+                                        LL_EXSTAT_CURL_RESULT | curl_result);
                                 // Pending download flag will get cleared when the request is deleted
                         }
                         else
@@ -1389,3 +1390,4 @@ void LLHTTPAssetStorage::clearTempAssetData()
         mTempAssets.clear();
 }
 
+
diff --git a/linden/indra/llmessage/llhttpassetstorage.h b/linden/indra/llmessage/llhttpassetstorage.h
index 962bece..7fee143 100644
--- a/linden/indra/llmessage/llhttpassetstorage.h
+++ b/linden/indra/llmessage/llhttpassetstorage.h
@@ -128,7 +128,7 @@ public:
 
 protected:
         void _queueDataRequest(const LLUUID& uuid, LLAssetType::EType type,
-                                                   void (*callback)(LLVFS *vfs, const LLUUID&, LLAssetType::EType, void *, S32),
+                                                   void (*callback)(LLVFS *vfs, const LLUUID&, LLAssetType::EType, void *, S32, LLExtStat),
                                                    void *user_data, BOOL duplicate, BOOL is_priority);
 
 private:
diff --git a/linden/indra/llmessage/llmessageconfig.cpp b/linden/indra/llmessage/llmessageconfig.cpp
index 6ecb1ad..a619e80 100644
--- a/linden/indra/llmessage/llmessageconfig.cpp
+++ b/linden/indra/llmessage/llmessageconfig.cpp
@@ -163,7 +163,7 @@ void LLMessageConfigFile::loadMessageBans(const LLSD& data)
 
 bool LLMessageConfigFile::isCapBanned(const std::string& cap_name) const
 {
-        llinfos << "mCapBans is " << LLSDXMLStreamer(mCapBans) << llendl;
+        lldebugs << "mCapBans is " << LLSDNotationStreamer(mCapBans) << llendl;
     return mCapBans[cap_name];
 }
 
diff --git a/linden/indra/llmessage/llsdmessagebuilder.cpp b/linden/indra/llmessage/llsdmessagebuilder.cpp
index d3dcd5b..f8fb30e 100755
--- a/linden/indra/llmessage/llsdmessagebuilder.cpp
+++ b/linden/indra/llmessage/llsdmessagebuilder.cpp
@@ -276,7 +276,7 @@ void LLSDMessageBuilder::copyFromMessageData(const LLMsgData& data)
 void LLSDMessageBuilder::copyFromLLSD(const LLSD& msg)
 {
         mCurrentMessage = msg;
-        lldebugs << LLSDXMLStreamer(mCurrentMessage) << llendl;
+        lldebugs << LLSDNotationStreamer(mCurrentMessage) << llendl;
 }
 
 const LLSD& LLSDMessageBuilder::getMessage() const
diff --git a/linden/indra/llmessage/llteleportflags.h b/linden/indra/llmessage/llteleportflags.h
index 60916bd..a40b081 100644
--- a/linden/indra/llmessage/llteleportflags.h
+++ b/linden/indra/llmessage/llteleportflags.h
@@ -45,6 +45,7 @@ const U32 TELEPORT_FLAGS_DISABLE_CANCEL		= 1 << 11;	// Used for llTeleportAgentH
 const U32 TELEPORT_FLAGS_VIA_REGION_ID          = 1 << 12;
 const U32 TELEPORT_FLAGS_IS_FLYING                      = 1 << 13;
 const U32 TELEPORT_FLAGS_SHOW_RESET_HOME        = 1 << 14;
+const U32 TELEPORT_FLAGS_FORCE_REDIRECT         = 1 << 15; // used to force a redirect to some random location - used when kicking someone from land.
 
 const U32 TELEPORT_FLAGS_MASK_VIA =   TELEPORT_FLAGS_VIA_LURE 
                                                                         | TELEPORT_FLAGS_VIA_LANDMARK
diff --git a/linden/indra/llmessage/lltemplatemessagereader.cpp b/linden/indra/llmessage/lltemplatemessagereader.cpp
index 329d2a8..4cde483 100644
--- a/linden/indra/llmessage/lltemplatemessagereader.cpp
+++ b/linden/indra/llmessage/lltemplatemessagereader.cpp
@@ -502,12 +502,15 @@ BOOL LLTemplateMessageReader::decodeTemplate(
         return(TRUE);
 }
 
-void LLTemplateMessageReader::logRanOffEndOfPacket( const LLHost& host )
+void LLTemplateMessageReader::logRanOffEndOfPacket( const LLHost& host, const S32 where, const S32 wanted )
 {
         // we've run off the end of the packet!
         llwarns << "Ran off end of packet " << mCurrentRMessageTemplate->mName
 //                      << " with id " << mCurrentRecvPacketID 
                         << " from " << host
+                        << " trying to read " << wanted
+                        << " bytes at position " << where
+                        << " going past packet end at " << mReceiveSize
                         << llendl;
         if(gMessageSystem->mVerboseLog)
         {
@@ -562,7 +565,7 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
                         // repeat number is a single byte
                         if (decode_pos >= mReceiveSize)
                         {
-                                logRanOffEndOfPacket(sender);
+                                logRanOffEndOfPacket(sender, decode_pos, 1);
 
                                 // default to 0 repeats
                                 repeat_number = 0;
@@ -621,7 +624,7 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
 
                                         if ((decode_pos + data_size) > mReceiveSize)
                                         {
-                                                logRanOffEndOfPacket(sender);
+                                                logRanOffEndOfPacket(sender, decode_pos, data_size);
 
                                                 // default to 0 length variable blocks
                                                 tsize = 0;
@@ -657,7 +660,7 @@ BOOL LLTemplateMessageReader::decodeData(const U8* buffer, const LLHost& sender
                                         // so, copy data pointer and set data size to fixed size
                                         if ((decode_pos + mvci.getSize()) > mReceiveSize)
                                         {
-                                                logRanOffEndOfPacket(sender);
+                                                logRanOffEndOfPacket(sender, decode_pos, mvci.getSize());
 
                                                 // default to 0s.
                                                 U32 size = mvci.getSize();
diff --git a/linden/indra/llmessage/lltemplatemessagereader.h b/linden/indra/llmessage/lltemplatemessagereader.h
index 86d4ab6..687b75b 100644
--- a/linden/indra/llmessage/lltemplatemessagereader.h
+++ b/linden/indra/llmessage/lltemplatemessagereader.h
@@ -113,7 +113,7 @@ private:
         BOOL decodeTemplate(const U8* buffer, S32 buffer_size,  // inputs
                                                 LLMessageTemplate** msg_template ); // outputs
 
-        void logRanOffEndOfPacket( const LLHost& host );
+        void logRanOffEndOfPacket( const LLHost& host, const S32 where, const S32 wanted );
 
         BOOL decodeData(const U8* buffer, const LLHost& sender );
 
diff --git a/linden/indra/llmessage/lltransfersourceasset.cpp b/linden/indra/llmessage/lltransfersourceasset.cpp
index 31094c1..cfc7561 100644
--- a/linden/indra/llmessage/lltransfersourceasset.cpp
+++ b/linden/indra/llmessage/lltransfersourceasset.cpp
@@ -174,7 +174,7 @@ BOOL LLTransferSourceAsset::unpackParams(LLDataPacker &dp)
 
 
 void LLTransferSourceAsset::responderCallback(LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type,
-                                                                                          void *user_data, S32 result)
+                                                                                          void *user_data, S32 result, LLExtStat ext_status )
 {
         LLUUID *tidp = ((LLUUID*) user_data);
         LLUUID transfer_id = *(tidp);
diff --git a/linden/indra/llmessage/lltransfersourceasset.h b/linden/indra/llmessage/lltransfersourceasset.h
index 7b1aa63..b953f78 100644
--- a/linden/indra/llmessage/lltransfersourceasset.h
+++ b/linden/indra/llmessage/lltransfersourceasset.h
@@ -59,7 +59,7 @@ public:
         virtual ~LLTransferSourceAsset();
 
         static void responderCallback(LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type,
-                                                                  void *user_data, S32 result);
+                                                                  void *user_data, S32 result, LLExtStat ext_status );
 protected:
         /*virtual*/ void initTransfer();
         /*virtual*/ F32 updatePriority();
diff --git a/linden/indra/llmessage/lltransfertargetvfile.cpp b/linden/indra/llmessage/lltransfertargetvfile.cpp
index 79919b8..6f2252d 100644
--- a/linden/indra/llmessage/lltransfertargetvfile.cpp
+++ b/linden/indra/llmessage/lltransfertargetvfile.cpp
@@ -215,6 +215,7 @@ void LLTransferTargetVFile::completionCallback(const LLTSCode status)
                 mParams.mCompleteCallback(err_code,
                                                                   mParams.getAssetID(),
                                                                   mParams.getAssetType(),
-                                                                  mParams.mUserDatap);
+                                                                  mParams.mUserDatap,
+                                                                  LL_EXSTAT_NONE);
         }
 }
diff --git a/linden/indra/llmessage/lltransfertargetvfile.h b/linden/indra/llmessage/lltransfertargetvfile.h
index 6ba8745..98fcbc9 100644
--- a/linden/indra/llmessage/lltransfertargetvfile.h
+++ b/linden/indra/llmessage/lltransfertargetvfile.h
@@ -41,7 +41,7 @@ typedef void (*LLTTVFCompleteCallback)(
         S32 status,
         const LLUUID& file_id,
         LLAssetType::EType file_type,
-        void* user_data);
+        void* user_data, LLExtStat ext_status );
 
 class LLTransferTargetParamsVFile : public LLTransferTargetParams
 {
diff --git a/linden/indra/llmessage/llxfer.cpp b/linden/indra/llmessage/llxfer.cpp
index e12996d..4647980 100644
--- a/linden/indra/llmessage/llxfer.cpp
+++ b/linden/indra/llmessage/llxfer.cpp
@@ -301,7 +301,7 @@ S32 LLXfer::processEOF()
 
         if (mCallback)
         {
-                mCallback(mCallbackDataHandle,mCallbackResult);
+                mCallback(mCallbackDataHandle,mCallbackResult,LL_EXSTAT_NONE);
         }
 
         return(retval);
@@ -375,3 +375,4 @@ std::ostream& operator<< (std::ostream& os, LLXfer &hh)
 
 
 
+
diff --git a/linden/indra/llmessage/llxfer.h b/linden/indra/llmessage/llxfer.h
index 51d7731..de93dba 100644
--- a/linden/indra/llmessage/llxfer.h
+++ b/linden/indra/llmessage/llxfer.h
@@ -67,7 +67,7 @@ class LLXfer
 
         BOOL mWaitingForACK;
 
-        void (*mCallback)(void **,S32); 
+        void (*mCallback)(void **,S32,LLExtStat);       
         void **mCallbackDataHandle;
         S32 mCallbackResult;
 
@@ -116,3 +116,4 @@ class LLXfer
 
 
 
+
diff --git a/linden/indra/llmessage/llxfer_file.cpp b/linden/indra/llmessage/llxfer_file.cpp
index b36dd5a..7478316 100644
--- a/linden/indra/llmessage/llxfer_file.cpp
+++ b/linden/indra/llmessage/llxfer_file.cpp
@@ -123,7 +123,7 @@ S32 LLXfer_File::initializeRequest(U64 xfer_id,
                                    ELLPath remote_path,
                                    const LLHost& remote_host,
                                    BOOL delete_remote_on_completion,
-                                   void (*callback)(void**,S32),
+                                   void (*callback)(void**,S32,LLExtStat),
                                    void** user_data)
 {
         S32 retval = 0;  // presume success
diff --git a/linden/indra/llmessage/llxfer_file.h b/linden/indra/llmessage/llxfer_file.h
index 6a9ee51..4d34acb 100644
--- a/linden/indra/llmessage/llxfer_file.h
+++ b/linden/indra/llmessage/llxfer_file.h
@@ -60,7 +60,7 @@ class LLXfer_File : public LLXfer
                                                                   ELLPath remote_path,
                                                                   const LLHost& remote_host,
                                                                   BOOL delete_remote_on_completion,
-                                                                  void (*callback)(void**,S32),
+                                                                  void (*callback)(void**,S32,LLExtStat),
                                                                   void** user_data);
         virtual S32 startDownload();
 
@@ -86,3 +86,4 @@ class LLXfer_File : public LLXfer
 
 
 
+
diff --git a/linden/indra/llmessage/llxfer_mem.cpp b/linden/indra/llmessage/llxfer_mem.cpp
index 0f055c8..223ce08 100644
--- a/linden/indra/llmessage/llxfer_mem.cpp
+++ b/linden/indra/llmessage/llxfer_mem.cpp
@@ -136,7 +136,7 @@ S32 LLXfer_Mem::processEOF()
 
         if (mCallback)
         {
-                mCallback((void *)mBuffer,mBufferLength,mCallbackDataHandle,mCallbackResult);
+                mCallback((void *)mBuffer,mBufferLength,mCallbackDataHandle,mCallbackResult,LL_EXSTAT_NONE);
         }
 
         return(retval);
@@ -149,7 +149,7 @@ S32 LLXfer_Mem::initializeRequest(U64 xfer_id,
                                                                   ELLPath remote_path,
                                                                   const LLHost& remote_host,
                                                                   BOOL delete_remote_on_completion,
-                                                                  void (*callback)(void*,S32,void**,S32),
+                                                                  void (*callback)(void*,S32,void**,S32,LLExtStat),
                                                                   void** user_data)
 {
         S32 retval = 0;  // presume success
@@ -218,3 +218,4 @@ U32 LLXfer_Mem::getXferTypeTag()
 
 
 
+
diff --git a/linden/indra/llmessage/llxfer_mem.h b/linden/indra/llmessage/llxfer_mem.h
index b80807a..8523c7d 100644
--- a/linden/indra/llmessage/llxfer_mem.h
+++ b/linden/indra/llmessage/llxfer_mem.h
@@ -40,7 +40,7 @@ class LLXfer_Mem : public LLXfer
 {
  private:
  protected:
-        void (*mCallback)(void *, S32, void **,S32);    
+        void (*mCallback)(void *, S32, void **, S32, LLExtStat);        
         char mRemoteFilename[LL_MAX_PATH];              /* Flawfinder : ignore */
         ELLPath mRemotePath;
         BOOL mDeleteRemoteOnCompletion;
@@ -65,7 +65,7 @@ class LLXfer_Mem : public LLXfer
                                                                   ELLPath remote_path,
                                                                   const LLHost& remote_host,
                                                                   BOOL delete_remote_on_completion,
-                                                                  void (*callback)(void*,S32,void**,S32),
+                                                                  void (*callback)(void*,S32,void**,S32,LLExtStat),
                                                                   void** user_data);
         virtual S32 startDownload();
 
@@ -79,3 +79,4 @@ class LLXfer_Mem : public LLXfer
 
 
 
+
diff --git a/linden/indra/llmessage/llxfer_vfile.cpp b/linden/indra/llmessage/llxfer_vfile.cpp
index 0d0d5fe..54b9683 100644
--- a/linden/indra/llmessage/llxfer_vfile.cpp
+++ b/linden/indra/llmessage/llxfer_vfile.cpp
@@ -98,7 +98,7 @@ S32 LLXfer_VFile::initializeRequest(U64 xfer_id,
                                                                         const LLUUID& remote_id,
                                                                         LLAssetType::EType type,
                                                                         const LLHost& remote_host,
-                                                                        void (*callback)(void**,S32),
+                                                                        void (*callback)(void**,S32,LLExtStat),
                                                                         void** user_data)
 {
         S32 retval = 0;  // presume success
diff --git a/linden/indra/llmessage/llxfer_vfile.h b/linden/indra/llmessage/llxfer_vfile.h
index e71a0e8..1362749 100644
--- a/linden/indra/llmessage/llxfer_vfile.h
+++ b/linden/indra/llmessage/llxfer_vfile.h
@@ -65,7 +65,7 @@ class LLXfer_VFile : public LLXfer
                         const LLUUID &remote_id,
                         const LLAssetType::EType type,
                         const LLHost &remote_host,
-                        void (*callback)(void **,S32),
+                        void (*callback)(void **,S32,LLExtStat),
                         void **user_data);
         virtual S32 startDownload();
 
@@ -92,3 +92,4 @@ class LLXfer_VFile : public LLXfer
 
 
 
+
diff --git a/linden/indra/llmessage/llxfermanager.cpp b/linden/indra/llmessage/llxfermanager.cpp
index 7758a32..b9a2c3e 100644
--- a/linden/indra/llmessage/llxfermanager.cpp
+++ b/linden/indra/llmessage/llxfermanager.cpp
@@ -396,7 +396,7 @@ void LLXferManager::requestFile(const char* local_filename,
                                                                 ELLPath remote_path,
                                                                 const LLHost& remote_host,
                                                                 BOOL delete_remote_on_completion,
-                                                                void (*callback)(void**,S32),
+                                                                void (*callback)(void**,S32,LLExtStat),
                                                                 void** user_data,
                                                                 BOOL is_priority,
                                                                 BOOL use_big_packets)
@@ -453,7 +453,7 @@ void LLXferManager::requestFile(const char* remote_filename,
                                                                 ELLPath remote_path,
                                                                 const LLHost& remote_host,
                                                                 BOOL delete_remote_on_completion,
-                                                                void (*callback)(void*,S32,void**,S32),
+                                                                void (*callback)(void*,S32,void**,S32,LLExtStat),
                                                                 void** user_data,
                                                                 BOOL is_priority)
 {
@@ -481,7 +481,7 @@ void LLXferManager::requestVFile(const LLUUID& local_id,
                                                                  const LLUUID& remote_id,
                                                                  LLAssetType::EType type, LLVFS* vfs,
                                                                  const LLHost& remote_host,
-                                                                 void (*callback)(void**, S32),
+                                                                 void (*callback)(void**,S32,LLExtStat),
                                                                  void** user_data,
                                                                  BOOL is_priority)
 {
@@ -1151,3 +1151,4 @@ void process_abort_xfer(LLMessageSystem *mesgsys, void **user_data)
 
 
 
+
diff --git a/linden/indra/llmessage/llxfermanager.h b/linden/indra/llmessage/llxfermanager.h
index 7b529ad..62969d9 100644
--- a/linden/indra/llmessage/llxfermanager.h
+++ b/linden/indra/llmessage/llxfermanager.h
@@ -145,7 +145,7 @@ class LLXferManager
                                                          ELLPath remote_path,
                                                          const LLHost& remote_host,
                                                          BOOL delete_remote_on_completion,
-                                                         void (*callback)(void**,S32), void** user_data,
+                                                         void (*callback)(void**,S32,LLExtStat), void** user_data,
                                                          BOOL is_priority = FALSE,
                                                          BOOL use_big_packets = FALSE);
 
@@ -154,7 +154,7 @@ class LLXferManager
                                                          ELLPath remote_path,
                                                          const LLHost &remote_host,
                                                          BOOL delete_remote_on_completion,
-                                                         void (*callback)(void*, S32, void**, S32),
+                                                         void (*callback)(void*, S32, void**, S32, LLExtStat),
                                                          void** user_data,
                                                          BOOL is_priority = FALSE);
 
@@ -163,7 +163,7 @@ class LLXferManager
         virtual void requestVFile(const LLUUID &local_id, const LLUUID& remote_id,
                                                           LLAssetType::EType type, LLVFS* vfs,
                                                           const LLHost& remote_host,
-                                                          void (*callback)(void**, S32), void** user_data,
+                                                          void (*callback)(void**,S32,LLExtStat), void** user_data,
                                                           BOOL is_priority = FALSE);
 
 /*
@@ -205,3 +205,4 @@ void process_abort_xfer (LLMessageSystem *mesgsys, void **user_data);
 #endif
 
 
+
diff --git a/linden/indra/llmessage/message.cpp b/linden/indra/llmessage/message.cpp
index a9d5dd3..70b8166 100644
--- a/linden/indra/llmessage/message.cpp
+++ b/linden/indra/llmessage/message.cpp
@@ -2134,7 +2134,7 @@ void LLMessageSystem::dispatch(
         }
         // enable this for output of message names
         //llinfos << "< \"" << msg_name << "\"" << llendl;
-        //lldebugs << "data: " << LLSDXMLStreamer(message) << llendl;      
+        //lldebugs << "data: " << LLSDNotationStreamer(message) << llendl;         
 
         handler->post(responsep, context, message);
 }
diff --git a/linden/indra/llmessage/message_prehash.cpp b/linden/indra/llmessage/message_prehash.cpp
index fbe5c33..ce532e1 100644
--- a/linden/indra/llmessage/message_prehash.cpp
+++ b/linden/indra/llmessage/message_prehash.cpp
@@ -305,6 +305,7 @@ char * _PREHASH_LogFailedMoneyTransaction;
 char * _PREHASH_ViewerStartAuction;
 char * _PREHASH_StartAuction;
 char * _PREHASH_DuplicateFlags;
+char * _PREHASH_RegionInfo2;
 char * _PREHASH_TextColor;
 char * _PREHASH_SlaveID;
 char * _PREHASH_Charter;
@@ -670,9 +671,9 @@ char * _PREHASH_PreyAgent;
 char * _PREHASH_SimStats;
 char * _PREHASH_LogoutReply;
 char * _PREHASH_FeatureDisabled;
+char * _PREHASH_PhysicalAvatarEventList;
 char * _PREHASH_ObjectLocalID;
 char * _PREHASH_Dropped;
-char * _PREHASH_PhysicalAvatarEventList;
 char * _PREHASH_WebProfilesDisabled;
 char * _PREHASH_Destination;
 char * _PREHASH_MasterID;
@@ -1637,6 +1638,7 @@ void init_prehash_data()
         _PREHASH_ViewerStartAuction = gMessageStringTable.getString("ViewerStartAuction");
         _PREHASH_StartAuction = gMessageStringTable.getString("StartAuction");
         _PREHASH_DuplicateFlags = gMessageStringTable.getString("DuplicateFlags");
+        _PREHASH_RegionInfo2 = gMessageStringTable.getString("RegionInfo2");
         _PREHASH_TextColor = gMessageStringTable.getString("TextColor");
         _PREHASH_SlaveID = gMessageStringTable.getString("SlaveID");
         _PREHASH_Charter = gMessageStringTable.getString("Charter");
@@ -2002,9 +2004,9 @@ void init_prehash_data()
         _PREHASH_SimStats = gMessageStringTable.getString("SimStats");
         _PREHASH_LogoutReply = gMessageStringTable.getString("LogoutReply");
         _PREHASH_FeatureDisabled = gMessageStringTable.getString("FeatureDisabled");
+        _PREHASH_PhysicalAvatarEventList = gMessageStringTable.getString("PhysicalAvatarEventList");
         _PREHASH_ObjectLocalID = gMessageStringTable.getString("ObjectLocalID");
         _PREHASH_Dropped = gMessageStringTable.getString("Dropped");
-        _PREHASH_PhysicalAvatarEventList = gMessageStringTable.getString("PhysicalAvatarEventList");
         _PREHASH_WebProfilesDisabled = gMessageStringTable.getString("WebProfilesDisabled");
         _PREHASH_Destination = gMessageStringTable.getString("Destination");
         _PREHASH_MasterID = gMessageStringTable.getString("MasterID");
diff --git a/linden/indra/llmessage/message_prehash.h b/linden/indra/llmessage/message_prehash.h
index b75edca..672cd14 100644
--- a/linden/indra/llmessage/message_prehash.h
+++ b/linden/indra/llmessage/message_prehash.h
@@ -305,6 +305,7 @@ extern char * _PREHASH_LogFailedMoneyTransaction;
 extern char * _PREHASH_ViewerStartAuction;
 extern char * _PREHASH_StartAuction;
 extern char * _PREHASH_DuplicateFlags;
+extern char * _PREHASH_RegionInfo2;
 extern char * _PREHASH_TextColor;
 extern char * _PREHASH_SlaveID;
 extern char * _PREHASH_Charter;
@@ -670,9 +671,9 @@ extern char * _PREHASH_PreyAgent;
 extern char * _PREHASH_SimStats;
 extern char * _PREHASH_LogoutReply;
 extern char * _PREHASH_FeatureDisabled;
+extern char * _PREHASH_PhysicalAvatarEventList;
 extern char * _PREHASH_ObjectLocalID;
 extern char * _PREHASH_Dropped;
-extern char * _PREHASH_PhysicalAvatarEventList;
 extern char * _PREHASH_WebProfilesDisabled;
 extern char * _PREHASH_Destination;
 extern char * _PREHASH_MasterID;