Merge branch 'release/2025.04' into rye/forevermac

171 files changed, 9281 insertions, 7692 deletions

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 60ad7e8fe5..50b0cf02bc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,8 +42,8 @@ jobs:
     needs: setup
     strategy:
       matrix:
-        runner: [windows-large, macos-15-xlarge]
-        configuration: ${{ fromJSON(needs.setup.outputs.configurations) }}
+        runner: ${{ fromJson((github.ref_type == 'tag' && startsWith(github.ref, 'refs/tags/Second_Life')) && '["windows-large","macos-15-xlarge"]' || '["windows-latest","macos-15"]') }}
+        configuration: ${{ fromJson(needs.setup.outputs.configurations) }}
     runs-on: ${{ matrix.runner }}
     outputs:
       viewer_channel: ${{ steps.build.outputs.viewer_channel }}
diff --git a/indra/llappearance/llwearable.cpp b/indra/llappearance/llwearable.cpp
index f30c147b91..4acb0ef3d4 100644
--- a/indra/llappearance/llwearable.cpp
+++ b/indra/llappearance/llwearable.cpp
@@ -645,9 +645,10 @@ void LLWearable::addVisualParam(LLVisualParam *param)
 
 void LLWearable::setVisualParamWeight(S32 param_index, F32 value)
 {
-    if( is_in_map(mVisualParamIndexMap, param_index ) )
+    visual_param_index_map_t::iterator found = mVisualParamIndexMap.find(param_index);
+    if(found != mVisualParamIndexMap.end())
     {
-        LLVisualParam *wearable_param = mVisualParamIndexMap[param_index];
+        LLVisualParam *wearable_param = found->second;
         wearable_param->setWeight(value);
     }
     else
@@ -658,10 +659,10 @@ void LLWearable::setVisualParamWeight(S32 param_index, F32 value)
 
 F32 LLWearable::getVisualParamWeight(S32 param_index) const
 {
-    if( is_in_map(mVisualParamIndexMap, param_index ) )
+    visual_param_index_map_t::const_iterator found = mVisualParamIndexMap.find(param_index);
+    if(found != mVisualParamIndexMap.end())
     {
-        const LLVisualParam *wearable_param = mVisualParamIndexMap.find(param_index)->second;
-        return wearable_param->getWeight();
+        return found->second->getWeight();
     }
     else
     {
@@ -726,7 +727,7 @@ void LLWearable::writeToAvatar(LLAvatarAppearance* avatarp)
     if (!avatarp) return;
 
     // Pull params
-    for( LLVisualParam* param = avatarp->getFirstVisualParam(); param; param = avatarp->getNextVisualParam() )
+    for( const LLVisualParam* param = avatarp->getFirstVisualParam(); param; param = avatarp->getNextVisualParam() )
     {
         // cross-wearable parameters are not authoritative, as they are driven by a different wearable. So don't copy the values to the
         // avatar object if cross wearable. Cross wearable params get their values from the avatar, they shouldn't write the other way.
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h
index d2de88ff0a..c6bdab007f 100644
--- a/indra/llcommon/indra_constants.h
+++ b/indra/llcommon/indra_constants.h
@@ -355,5 +355,7 @@ const U8 CLICK_ACTION_DISABLED = 8;
 const U8 CLICK_ACTION_IGNORE = 9;
 // DO NOT CHANGE THE SEQUENCE OF THIS LIST!!
 
+constexpr U32 BEACON_SHOW_MAP  = 0x0001;
+constexpr U32 BEACON_FOCUS_MAP = 0x0002;
 
 #endif
diff --git a/indra/llcommon/llsdutil.h b/indra/llcommon/llsdutil.h
index 38bbe19ddd..c31030c5ea 100644
--- a/indra/llcommon/llsdutil.h
+++ b/indra/llcommon/llsdutil.h
@@ -553,6 +553,61 @@ LLSD shallow(LLSD value, LLSD filter=LLSD()) { return llsd_shallow(value, filter
 
 } // namespace llsd
 
+/*****************************************************************************
+ *   toArray(), toMap()
+ *****************************************************************************/
+namespace llsd
+{
+
+// For some T convertible to LLSD, given std::vector<T> myVec,
+// toArray(myVec) returns an LLSD array whose entries correspond to the
+// items in myVec.
+// For some U convertible to LLSD, given function U xform(const T&),
+// toArray(myVec, xform) returns an LLSD array whose every entry is
+// xform(item) of the corresponding item in myVec.
+// toArray() actually works with any container<C> usable with range
+// 'for', not just std::vector.
+// (Once we get C++20 we can use std::identity instead of this default lambda.)
+template<typename C, typename FUNC>
+LLSD toArray(const C& container, FUNC&& func = [](const auto& arg) { return arg; })
+{
+    LLSD array;
+    for (const auto& item : container)
+    {
+        array.append(std::forward<FUNC>(func)(item));
+    }
+    return array;
+}
+
+// For some T convertible to LLSD, given std::map<std::string, T> myMap,
+// toMap(myMap) returns an LLSD map whose entries correspond to the
+// (key, value) pairs in myMap.
+// For some U convertible to LLSD, given function
+// std::pair<std::string, U> xform(const std::pair<std::string, T>&),
+// toMap(myMap, xform) returns an LLSD map whose every entry is
+// xform(pair) of the corresponding (key, value) pair in myMap.
+// toMap() actually works with any container usable with range 'for', not
+// just std::map. It need not even be an associative container, as long as
+// you pass an xform function that returns std::pair<std::string, U>.
+// (Once we get C++20 we can use std::identity instead of this default lambda.)
+template<typename C, typename FUNC>
+LLSD toMap(const C& container, FUNC&& func = [](const auto& arg) { return arg; })
+{
+    LLSD map;
+    for (const auto& pair : container)
+    {
+        const auto& [key, value] = std::forward<FUNC>(func)(pair);
+        map[key] = value;
+    }
+    return map;
+}
+
+} // namespace llsd
+
+/*****************************************************************************
+ *   boost::hash<LLSD>
+ *****************************************************************************/
+
 // Specialization for generating a hash value from an LLSD block.
 namespace boost
 {
diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp
index b9bd27aa17..4aae90626e 100644
--- a/indra/llcommon/lluuid.cpp
+++ b/indra/llcommon/lluuid.cpp
@@ -174,14 +174,6 @@ void LLUUID::toString(std::string& out) const
         (U8)(mData[15]));
 }
 
-// *TODO: deprecate
-void LLUUID::toString(char* out) const
-{
-    std::string buffer;
-    toString(buffer);
-    strcpy(out, buffer.c_str()); /* Flawfinder: ignore */
-}
-
 void LLUUID::toCompressedString(std::string& out) const
 {
     char bytes[UUID_BYTES + 1];
@@ -190,13 +182,6 @@ void LLUUID::toCompressedString(std::string& out) const
     out.assign(bytes, UUID_BYTES);
 }
 
-// *TODO: deprecate
-void LLUUID::toCompressedString(char* out) const
-{
-    memcpy(out, mData, UUID_BYTES);     /* Flawfinder: ignore */
-    out[UUID_BYTES] = '\0';
-}
-
 std::string LLUUID::getString() const
 {
     return asString();
diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h
index bd4edc7993..ca1cf03c4d 100644
--- a/indra/llcommon/lluuid.h
+++ b/indra/llcommon/lluuid.h
@@ -103,9 +103,7 @@ public:
     friend LL_COMMON_API std::ostream&   operator<<(std::ostream& s, const LLUUID &uuid);
     friend LL_COMMON_API std::istream&   operator>>(std::istream& s, LLUUID &uuid);
 
-    void toString(char *out) const;     // Does not allocate memory, needs 36 characters (including \0)
     void toString(std::string& out) const;
-    void toCompressedString(char *out) const;   // Does not allocate memory, needs 17 characters (including \0)
     void toCompressedString(std::string& out) const;
 
     std::string asString() const;
diff --git a/indra/llcommon/workqueue.cpp b/indra/llcommon/workqueue.cpp
index 6066e74fb5..c8ece616b2 100644
--- a/indra/llcommon/workqueue.cpp
+++ b/indra/llcommon/workqueue.cpp
@@ -17,6 +17,7 @@
 // std headers
 // external library headers
 // other Linden headers
+#include "llapp.h"
 #include "llcoros.h"
 #include LLCOROS_MUTEX_HEADER
 #include "llerror.h"
@@ -102,19 +103,95 @@ std::string LL::WorkQueueBase::makeName(const std::string& name)
     return STRINGIZE("WorkQueue" << num);
 }
 
+namespace
+{
+#if LL_WINDOWS
+
+    static const U32 STATUS_MSC_EXCEPTION = 0xE06D7363; // compiler specific
+
+    U32 exception_filter(U32 code, struct _EXCEPTION_POINTERS* exception_infop)
+    {
+        if (LLApp::instance()->reportCrashToBugsplat((void*)exception_infop))
+        {
+            // Handled
+            return EXCEPTION_CONTINUE_SEARCH;
+        }
+        else if (code == STATUS_MSC_EXCEPTION)
+        {
+            // C++ exception, go on
+            return EXCEPTION_CONTINUE_SEARCH;
+        }
+        else
+        {
+            // handle it, convert to std::exception
+            return EXCEPTION_EXECUTE_HANDLER;
+        }
+
+        return EXCEPTION_CONTINUE_SEARCH;
+    }
+
+    void cpphandle(const LL::WorkQueueBase::Work& work)
+    {
+        // SE and C++ can not coexists, thus two handlers
+        try
+        {
+            work();
+        }
+        catch (const LLContinueError&)
+        {
+            // Any uncaught exception derived from LLContinueError will be caught
+            // here and logged. This coroutine will terminate but the rest of the
+            // viewer will carry on.
+            LOG_UNHANDLED_EXCEPTION(STRINGIZE("LLContinue in work queue"));
+        }
+    }
+
+    void sehandle(const LL::WorkQueueBase::Work& work)
+    {
+        __try
+        {
+            // handle stop and continue exceptions first
+            cpphandle(work);
+        }
+        __except (exception_filter(GetExceptionCode(), GetExceptionInformation()))
+        {
+            // convert to C++ styled exception
+            char integer_string[512];
+            sprintf(integer_string, "SEH, code: %lu\n", GetExceptionCode());
+            throw std::exception(integer_string);
+        }
+    }
+#endif // LL_WINDOWS
+} // anonymous namespace
+
 void LL::WorkQueueBase::callWork(const Work& work)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_THREAD;
+
+#ifdef LL_WINDOWS
+    // can not use __try directly, toplevel requires unwinding, thus use of a wrapper
+    sehandle(work);
+#else // LL_WINDOWS
     try
     {
         work();
     }
-    catch (...)
+    catch (LLContinueError&)
     {
-        // No matter what goes wrong with any individual work item, the worker
-        // thread must go on! Log our own instance name with the exception.
         LOG_UNHANDLED_EXCEPTION(getKey());
     }
+    catch (...)
+    {
+        // Stash any other kind of uncaught exception to be rethrown by main thread.
+        LL_WARNS("LLCoros") << "Capturing and rethrowing uncaught exception in WorkQueueBase "
+            << getKey() << LL_ENDL;
+
+        LL::WorkQueue::ptr_t main_queue = LL::WorkQueue::getInstance("mainloop");
+        main_queue->post(
+            // Bind the current exception, rethrow it in main loop.
+            [exc = std::current_exception()]() { std::rethrow_exception(exc); });
+    }
+#endif // else LL_WINDOWS
 }
 
 void LL::WorkQueueBase::error(const std::string& msg)
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 44b6e7923b..76e5e3aae9 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -5586,14 +5586,22 @@ struct MikktData
     {
         U32 count = face->mNumIndices;
 
-        p.resize(count);
-        n.resize(count);
-        tc.resize(count);
-        t.resize(count);
+        try
+        {
+            p.resize(count);
+            n.resize(count);
+            tc.resize(count);
+            t.resize(count);
 
-        if (face->mWeights)
+            if (face->mWeights)
+            {
+                w.resize(count);
+            }
+        }
+        catch (std::bad_alloc&)
         {
-            w.resize(count);
+            LLError::LLUserWarningMsg::showOutOfMemory();
+            LL_ERRS("LLCoros") << "Bad memory allocation in MikktData, elements count: " << count << LL_ENDL;
         }
 
 
@@ -5665,7 +5673,16 @@ bool LLVolumeFace::cacheOptimize(bool gen_tangents)
         // and is executed on a background thread
         MikktData data(this);
         mikk::Mikktspace ctx(data);
-        ctx.genTangSpace();
+        try
+        {
+            ctx.genTangSpace();
+        }
+        catch (std::bad_alloc&)
+        {
+            LLError::LLUserWarningMsg::showOutOfMemory();
+            LL_ERRS("LLCoros") << "Bad memory allocation in MikktData::genTangSpace" << LL_ENDL;
+        }
+
 
         //re-weld
         meshopt_Stream mos[] =
@@ -5678,7 +5695,15 @@ bool LLVolumeFace::cacheOptimize(bool gen_tangents)
         };
 
         std::vector<U32> remap;
-        remap.resize(data.p.size());
+        try
+        {
+            remap.resize(data.p.size());
+        }
+        catch (std::bad_alloc&)
+        {
+            LLError::LLUserWarningMsg::showOutOfMemory();
+            LL_ERRS("LLCoros") << "Failed to allocate memory for remap: " << (S32)data.p.size() << LL_ENDL;
+        }
 
         U32 stream_count = data.w.empty() ? 4 : 5;
 
diff --git a/indra/llmessage/llassetstorage.cpp b/indra/llmessage/llassetstorage.cpp
index 2de59c1b6a..10fd56a68e 100644
--- a/indra/llmessage/llassetstorage.cpp
+++ b/indra/llmessage/llassetstorage.cpp
@@ -585,7 +585,8 @@ void LLAssetStorage::getAssetData(const LLUUID uuid,
 // static
 void LLAssetStorage::removeAndCallbackPendingDownloads(const LLUUID& file_id, LLAssetType::EType file_type,
                                                        const LLUUID& callback_id, LLAssetType::EType callback_type,
-                                                       S32 result_code, LLExtStat ext_status)
+                                                       S32 result_code, LLExtStat ext_status,
+                                                       S32 bytes_fetched)
 {
     // find and callback ALL pending requests for this UUID
     // SJB: We process the callbacks in reverse order, I do not know if this is important,
@@ -598,6 +599,10 @@ void LLAssetStorage::removeAndCallbackPendingDownloads(const LLUUID& file_id, LL
         LLAssetRequest* tmp = *curiter;
         if ((tmp->getUUID() == file_id) && (tmp->getType()== file_type))
         {
+            if (bytes_fetched > 0)
+            {
+                tmp->mBytesFetched = bytes_fetched;
+            }
             requests.push_front(tmp);
             iter = gAssetStorage->mPendingDownloads.erase(curiter);
         }
@@ -664,6 +669,7 @@ void LLAssetStorage::downloadCompleteCallback(
         callback_type = req->getType();
     }
 
+    S32 bytes_fetched = 0;
     if (LL_ERR_NOERR == result)
     {
         // we might have gotten a zero-size file
@@ -677,21 +683,11 @@ void LLAssetStorage::downloadCompleteCallback(
         }
         else
         {
-#if 1
-            for (request_list_t::iterator iter = gAssetStorage->mPendingDownloads.begin();
-                 iter != gAssetStorage->mPendingDownloads.end(); ++iter  )
-            {
-                LLAssetRequest* dlreq = *iter;
-                if ((dlreq->getUUID() == file_id) && (dlreq->getType()== file_type))
-                {
-                    dlreq->mBytesFetched = vfile.getSize();
-                }
-            }
-#endif
+            bytes_fetched = vfile.getSize();
         }
     }
 
-    removeAndCallbackPendingDownloads(file_id, file_type, callback_id, callback_type, result, ext_status);
+    removeAndCallbackPendingDownloads(file_id, file_type, callback_id, callback_type, result, ext_status, bytes_fetched);
 }
 
 void LLAssetStorage::getEstateAsset(
diff --git a/indra/llmessage/llassetstorage.h b/indra/llmessage/llassetstorage.h
index 88fa572092..6d6526757d 100644
--- a/indra/llmessage/llassetstorage.h
+++ b/indra/llmessage/llassetstorage.h
@@ -324,7 +324,8 @@ public:
 
     static void removeAndCallbackPendingDownloads(const LLUUID& file_id, LLAssetType::EType file_type,
                                                   const LLUUID& callback_id, LLAssetType::EType callback_type,
-                                                  S32 result_code, LLExtStat ext_status);
+                                                  S32 result_code, LLExtStat ext_status,
+                                                  S32 bytes_fetched);
 
     // download process callbacks
     static void downloadCompleteCallback(
diff --git a/indra/llmessage/llexperiencecache.cpp b/indra/llmessage/llexperiencecache.cpp
index b5d0c93376..83a070df32 100644
--- a/indra/llmessage/llexperiencecache.cpp
+++ b/indra/llmessage/llexperiencecache.cpp
@@ -94,6 +94,8 @@ LLExperienceCache::LLExperienceCache()
 
 LLExperienceCache::~LLExperienceCache()
 {
+    // can exit without cleanup()
+    sShutdown = true;
 }
 
 void LLExperienceCache::initSingleton()
diff --git a/indra/llmessage/llpacketring.cpp b/indra/llmessage/llpacketring.cpp
index da3c502e9d..eb6650c6c5 100644
--- a/indra/llmessage/llpacketring.cpp
+++ b/indra/llmessage/llpacketring.cpp
@@ -344,6 +344,12 @@ bool LLPacketRing::expandRing()
     return true;
 }
 
+F32 LLPacketRing::getBufferLoadRate() const
+{
+    // goes up to MAX_BUFFER_RING_SIZE
+    return (F32)mNumBufferedPackets / (F32)DEFAULT_BUFFER_RING_SIZE;
+}
+
 void LLPacketRing::dumpPacketRingStats()
 {
     mNumDroppedPacketsTotal += mNumDroppedPackets;
diff --git a/indra/llmessage/llpacketring.h b/indra/llmessage/llpacketring.h
index 237efc12e0..572dcbd271 100644
--- a/indra/llmessage/llpacketring.h
+++ b/indra/llmessage/llpacketring.h
@@ -64,6 +64,7 @@ public:
     S32 getNumBufferedBytes() const { return mNumBufferedBytes; }
     S32 getNumDroppedPackets() const { return mNumDroppedPacketsTotal + mNumDroppedPackets; }
 
+    F32 getBufferLoadRate() const; // from 0 to 4 (0 - empty, 1 - default size is full)
     void dumpPacketRingStats();
 protected:
     // returns 'true' if we should intentionally drop a packet
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index 1844d5e7cd..30945cac51 100644
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -538,7 +538,6 @@ public:
 
     //void  buildMessage();
 
-    S32     zeroCode(U8 **data, S32 *data_size);
     S32     zeroCodeExpand(U8 **data, S32 *data_size);
     S32     zeroCodeAdjustCurrentSendTotal();
 
@@ -755,6 +754,7 @@ public:
     S32     getReceiveBytes() const;
 
     S32     getUnackedListSize() const          { return mUnackedListSize; }
+    F32     getBufferLoadRate() const           { return mPacketRing.getBufferLoadRate(); }
 
     //const char* getCurrentSMessageName() const { return mCurrentSMessageName; }
     //const char* getCurrentSBlockName() const { return mCurrentSBlockName; }
@@ -842,12 +842,10 @@ private:
     LLUUID mSessionID;
 
     void    addTemplate(LLMessageTemplate *templatep);
-    bool        decodeTemplate( const U8* buffer, S32 buffer_size, LLMessageTemplate** msg_template );
 
     void        logMsgFromInvalidCircuit( const LLHost& sender, bool recv_reliable );
     void        logTrustedMsgFromUntrustedCircuit( const LLHost& sender );
     void        logValidMsg(LLCircuitData *cdp, const LLHost& sender, bool recv_reliable, bool recv_resent, bool recv_acks );
-    void        logRanOffEndOfPacket( const LLHost& sender );
 
     class LLMessageCountInfo
     {
diff --git a/indra/llprimitive/object_flags.h b/indra/llprimitive/object_flags.h
index e2cdba072a..06e216ba49 100644
--- a/indra/llprimitive/object_flags.h
+++ b/indra/llprimitive/object_flags.h
@@ -57,16 +57,16 @@ const U32   FLAGS_CAMERA_SOURCE        = (1U << 22);
 
 //const U32 FLAGS_UNUSED_001           = (1U << 23); // was FLAGS_CAST_SHADOWS
 
-//const U32 FLAGS_UNUSED_002           = (1U << 24);
-//const U32 FLAGS_UNUSED_003           = (1U << 25);
-//const U32 FLAGS_UNUSED_004           = (1U << 26);
-//const U32 FLAGS_UNUSED_005           = (1U << 27);
+const U32   FLAGS_SERVER_AUTOPILOT     = (1U << 24); // Update was for an agent AND that agent is being autopiloted from the server
+//const U32 FLAGS_UNUSED_002           = (1U << 25);
+//const U32 FLAGS_UNUSED_003           = (1U << 26);
+//const U32 FLAGS_UNUSED_004           = (1U << 27);
 
 const U32   FLAGS_OBJECT_OWNER_MODIFY  = (1U << 28);
 
 const U32   FLAGS_TEMPORARY_ON_REZ     = (1U << 29);
-//const U32 FLAGS_UNUSED_006           = (1U << 30); // was FLAGS_TEMPORARY
-//const U32 FLAGS_UNUSED_007           = (1U << 31); // was FLAGS_ZLIB_COMPRESSED
+//const U32 FLAGS_UNUSED_005           = (1U << 30); // was FLAGS_TEMPORARY
+//const U32 FLAGS_UNUSED_006           = (1U << 31); // was FLAGS_ZLIB_COMPRESSED
 
 const U32   FLAGS_LOCAL                = FLAGS_ANIM_SOURCE | FLAGS_CAMERA_SOURCE;
 const U32   FLAGS_WORLD                = FLAGS_USE_PHYSICS | FLAGS_PHANTOM | FLAGS_TEMPORARY_ON_REZ;
diff --git a/indra/llrender/llcubemaparray.cpp b/indra/llrender/llcubemaparray.cpp
index d0a97dc2c6..998b57217d 100644
--- a/indra/llrender/llcubemaparray.cpp
+++ b/indra/llrender/llcubemaparray.cpp
@@ -105,6 +105,36 @@ LLCubeMapArray::LLCubeMapArray()
 
 }
 
+LLCubeMapArray::LLCubeMapArray(LLCubeMapArray& lhs, U32 width, U32 count) : mTextureStage(0)
+{
+    mWidth = width;
+    mCount = count;
+
+    // Allocate a new cubemap array with the same criteria as the incoming cubemap array
+    allocate(mWidth, lhs.mImage->getComponents(), count, lhs.mImage->getUseMipMaps(), lhs.mHDR);
+
+    // Copy each cubemap from the incoming array to the new array
+    U32 min_count = std::min(count, lhs.mCount);
+    for (U32 i = 0; i < min_count * 6; ++i)
+    {
+        U32 src_resolution = lhs.mWidth;
+        U32 dst_resolution = mWidth;
+        {
+            GLint components = GL_RGB;
+            if (mImage->getComponents() == 4)
+                components = GL_RGBA;
+            GLint format = GL_RGB;
+
+            // Handle different resolutions by scaling the image
+            LLPointer<LLImageRaw> src_image = new LLImageRaw(lhs.mWidth, lhs.mWidth, lhs.mImage->getComponents());
+            glGetTexImage(GL_TEXTURE_CUBE_MAP_ARRAY, 0, components, GL_UNSIGNED_BYTE, src_image->getData());
+
+            LLPointer<LLImageRaw> scaled_image = src_image->scaled(mWidth, mWidth);
+            glTexSubImage3D(GL_TEXTURE_CUBE_MAP_ARRAY, 0, 0, 0, i, mWidth, mWidth, 1, components, GL_UNSIGNED_BYTE, scaled_image->getData());
+        }
+    }
+}
+
 LLCubeMapArray::~LLCubeMapArray()
 {
 }
@@ -115,6 +145,8 @@ void LLCubeMapArray::allocate(U32 resolution, U32 components, U32 count, bool us
     mWidth = resolution;
     mCount = count;
 
+    mHDR = hdr;
+
     LLImageGL::generateTextures(1, &texname);
 
     mImage = new LLImageGL(resolution, resolution, components, use_mips);
diff --git a/indra/llrender/llcubemaparray.h b/indra/llrender/llcubemaparray.h
index bfc72a321d..6b4288cb23 100644
--- a/indra/llrender/llcubemaparray.h
+++ b/indra/llrender/llcubemaparray.h
@@ -36,6 +36,7 @@ class LLCubeMapArray : public LLRefCount
 {
 public:
     LLCubeMapArray();
+    LLCubeMapArray(LLCubeMapArray& lhs, U32 width, U32 count);
 
     static GLenum sTargets[6];
 
@@ -73,4 +74,5 @@ protected:
     U32 mWidth = 0;
     U32 mCount = 0;
     S32 mTextureStage;
+    bool mHDR;
 };
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 2be2bfbf7e..d13b98e274 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -1217,28 +1217,9 @@ bool LLGLManager::initGL()
     }
 #endif
 
-#if LL_WINDOWS
-    if (mVRAM < 256)
-    {
-        // Something likely went wrong using the above extensions
-        // try WMI first and fall back to old method (from dxdiag) if all else fails
-        // Function will check all GPUs WMI knows of and will pick up the one with most
-        // memory. We need to check all GPUs because system can switch active GPU to
-        // weaker one, to preserve power when not under load.
-        U32 mem = LLDXHardware::getMBVideoMemoryViaWMI();
-        if (mem != 0)
-        {
-            mVRAM = mem;
-            LL_WARNS("RenderInit") << "VRAM Detected (WMI):" << mVRAM<< LL_ENDL;
-        }
-    }
-#endif
-
     if (mVRAM < 256 && old_vram > 0)
     {
         // fall back to old method
-        // Note: on Windows value will be from LLDXHardware.
-        // Either received via dxdiag or via WMI by id from dxdiag.
         mVRAM = old_vram;
     }
 
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 66f38c9281..b062eca132 100644
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -1250,23 +1250,40 @@ S32 LLGLSLShader::disableTexture(S32 uniform, LLTexUnit::eTextureType mode)
         llassert(false);
         return -1;
     }
+
     S32 index = mTexture[uniform];
-    if (index != -1 && gGL.getTexUnit(index)->getCurrType() != LLTexUnit::TT_NONE)
+    if (index < 0)
+    {
+        // Invalid texture index - nothing to disable
+        return index;
+    }
+
+    LLTexUnit* tex_unit = gGL.getTexUnit(index);
+    if (!tex_unit)
     {
-        if (gDebugGL && gGL.getTexUnit(index)->getCurrType() != mode)
+        // Invalid texture unit
+        LL_WARNS_ONCE("Shader") << "Invalid texture unit at index: " << index << LL_ENDL;
+        return index;
+    }
+
+    LLTexUnit::eTextureType curr_type = tex_unit->getCurrType();
+    if (curr_type != LLTexUnit::TT_NONE)
+    {
+        if (gDebugGL && curr_type != mode)
         {
             if (gDebugSession)
             {
-                gFailLog << "Texture channel " << index << " texture type corrupted." << std::endl;
+                gFailLog << "Texture channel " << index << " texture type corrupted. Expected: " << mode << ", Found: " << curr_type << std::endl;
                 ll_fail("LLGLSLShader::disableTexture failed");
             }
             else
             {
-                LL_ERRS() << "Texture channel " << index << " texture type corrupted." << LL_ENDL;
+                LL_ERRS() << "Texture channel " << index << " texture type corrupted. Expected: " << mode << ", Found: " << curr_type << LL_ENDL;
             }
         }
-        gGL.getTexUnit(index)->disable();
+        tex_unit->disable();
     }
+
     return index;
 }
 
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 1bce31edb1..d2534b3939 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -837,7 +837,7 @@ void LLButton::draw()
 
     // Highlight if needed
     if( ll::ui::SearchableControl::getHighlighted() )
-        label_color = ll::ui::SearchableControl::getHighlightColor();
+        label_color = ll::ui::SearchableControl::getHighlightFontColor();
 
     // overlay with keyboard focus border
     if (hasFocus())
diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp
index 03717da80b..b10ec51f18 100644
--- a/indra/llui/llcommandmanager.cpp
+++ b/indra/llui/llcommandmanager.cpp
@@ -170,12 +170,14 @@ bool LLCommandManager::load()
 
     if (!parser.readXUI(commands_file, commandsParams))
     {
+        LLError::LLUserWarningMsg::showMissingFiles();
         LL_ERRS() << "Unable to load xml file: " << commands_file << LL_ENDL;
         return false;
     }
 
     if (!commandsParams.validateBlock())
     {
+        LLError::LLUserWarningMsg::showMissingFiles();
         LL_ERRS() << "Invalid commands file: " << commands_file << LL_ENDL;
         return false;
     }
diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index b9441a9c91..b2c59ce775 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -99,6 +99,7 @@ void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, c
         LLFloater* pHelperFloater = LLFloaterReg::getInstance(DEFAULT_EMOJI_HELPER_FLOATER);
         mHelperHandle = pHelperFloater->getHandle();
         mHelperCommitConn = pHelperFloater->setCommitCallback(std::bind([&](const LLSD& sdValue) { onCommitEmoji(utf8str_to_wstring(sdValue.asStringRef())[0]); }, std::placeholders::_2));
+        mHelperCloseConn = pHelperFloater->setCloseCallback([this](LLUICtrl* ctrl, const LLSD& param) { onCloseHelper(ctrl, param); });
     }
     setHostCtrl(hostctrl_p);
     mEmojiCommitCb = cb;
@@ -148,6 +149,16 @@ void LLEmojiHelper::onCommitEmoji(llwchar emoji)
     }
 }
 
+void LLEmojiHelper::onCloseHelper(LLUICtrl* ctrl, const LLSD& param)
+{
+    mCloseSignal(ctrl, param);
+}
+
+boost::signals2::connection LLEmojiHelper::setCloseCallback(const commit_signal_t::slot_type& cb)
+{
+    return mCloseSignal.connect(cb);
+}
+
 void LLEmojiHelper::setHostCtrl(LLUICtrl* hostctrl_p)
 {
     const LLUICtrl* pCurHostCtrl = mHostHandle.get();
diff --git a/indra/llui/llemojihelper.h b/indra/llui/llemojihelper.h
index 2834b06061..26840eef94 100644
--- a/indra/llui/llemojihelper.h
+++ b/indra/llui/llemojihelper.h
@@ -51,16 +51,23 @@ public:
     // Eventing
     bool handleKey(const LLUICtrl* ctrl_p, KEY key, MASK mask);
     void onCommitEmoji(llwchar emoji);
+    void onCloseHelper(LLUICtrl* ctrl, const LLSD& param);
+
+    typedef boost::signals2::signal<void(LLUICtrl* ctrl, const LLSD& param)> commit_signal_t;
+    boost::signals2::connection setCloseCallback(const commit_signal_t::slot_type& cb);
 
 protected:
     LLUICtrl* getHostCtrl() const { return mHostHandle.get(); }
     void      setHostCtrl(LLUICtrl* hostctrl_p);
 
 private:
+    commit_signal_t mCloseSignal;
+
     LLHandle<LLUICtrl>  mHostHandle;
     LLHandle<LLFloater> mHelperHandle;
     boost::signals2::connection mHostCtrlFocusLostConn;
     boost::signals2::connection mHelperCommitConn;
+    boost::signals2::connection mHelperCloseConn;
     std::function<void(llwchar)> mEmojiCommitCb;
     bool mIsHideDisabled;
 };
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 9be2240f6f..eae2435117 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -377,6 +377,10 @@ public:
     void            enableResizeCtrls(bool enable, bool width = true, bool height = true);
 
     bool            isPositioning(LLFloaterEnums::EOpenPositioning p) const { return (p == mPositioning); }
+
+    void            setAutoFocus(bool focus) { mAutoFocus = focus; } // whether to automatically take focus when opened
+    bool            getAutoFocus() const { return mAutoFocus; }
+
 protected:
     void            applyControlsAndPosition(LLFloater* other);
 
@@ -401,8 +405,6 @@ protected:
     void            setExpandedRect(const LLRect& rect) { mExpandedRect = rect; } // size when not minimized
     const LLRect&   getExpandedRect() const { return mExpandedRect; }
 
-    void            setAutoFocus(bool focus) { mAutoFocus = focus; } // whether to automatically take focus when opened
-    bool            getAutoFocus() const { return mAutoFocus; }
     LLDragHandle*   getDragHandle() const { return mDragHandle; }
 
     void            destroy(); // Don't call this directly.  You probably want to call closeFloater()
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp
index 69ffa9a94f..c11b42a348 100644
--- a/indra/llui/llmenugl.cpp
+++ b/indra/llui/llmenugl.cpp
@@ -508,7 +508,7 @@ void LLMenuItemGL::draw( void )
 
     // Highlight if needed
     if( ll::ui::SearchableControl::getHighlighted() )
-        color = ll::ui::SearchableControl::getHighlightColor();
+        color = ll::ui::SearchableControl::getHighlightFontColor();
 
     // Draw the text on top.
     if (mBriefItem)
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 7405413a3d..a05feab1d9 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -614,6 +614,13 @@ void LLNotification::cancel()
 LLSD LLNotification::getResponseTemplate(EResponseTemplateType type)
 {
     LLSD response = LLSD::emptyMap();
+
+    if (!mForm)
+    {
+        LL_WARNS("Notifications") << "Null form when getting response template for notification " << getName() << LL_ENDL;
+        return response;
+    }
+
     for (S32 element_idx = 0;
         element_idx < mForm->getNumElements();
         ++element_idx)
@@ -1249,9 +1256,26 @@ LLNotifications::LLNotifications()
     LLInstanceTracker<LLNotificationChannel, std::string>::instanceCount();
 }
 
+
+LLNotifications::~LLNotifications()
+{
+    // Clear explicitly, something in ~LLNotifications() crashes so narrowing down suspects
+    pHistoryChannel = nullptr;
+    pExpirationChannel = nullptr;
+    mGlobalStrings.clear();
+    mTemplates.clear();
+    mVisibilityRules.clear();
+    mUniqueNotifications.clear();
+    mListener = nullptr;
+}
+
 void LLNotifications::clear()
 {
-   mDefaultChannels.clear();
+    mDefaultChannels.clear();
+    // At this point mTemplates still gets used by lingering notifications
+    // to do responses (ex: group notice will call forceResponse()), but
+    // since network should be down and everything save, it's questionable
+    // whether it should stay that way
 }
 
 // The expiration channel gets all notifications that are cancelled
@@ -1464,6 +1488,13 @@ bool LLNotifications::templateExists(std::string_view name)
 void LLNotifications::forceResponse(const LLNotification::Params& params, S32 option)
 {
     LLNotificationPtr temp_notify(new LLNotification(params));
+
+    if (!temp_notify->getForm())
+    {
+        LL_WARNS("Notifications") << "Cannot force response for notification with null form: " << (std::string)params.name << LL_ENDL;
+        return;
+    }
+
     LLSD response = temp_notify->getResponseTemplate();
     LLSD selected_item = temp_notify->getForm()->getElement(option);
 
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 46286457cf..138f1969d5 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -887,7 +887,7 @@ class LLNotifications :
 {
     LLSINGLETON(LLNotifications);
     LOG_CLASS(LLNotifications);
-    virtual ~LLNotifications() {}
+    virtual ~LLNotifications();
 
 public:
 
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 943aff1ca1..245339b107 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -3394,7 +3394,7 @@ bool LLScrollListCtrl::highlightMatchingItems(const std::string& filter_str)
 
     bool res = false;
 
-    setHighlightedColor(LLUIColorTable::instance().getColor("SearchableControlHighlightColor", LLColor4::red4));
+    setHighlightedColor(LLUIColorTable::instance().getColor("SearchableControlHighlightBgColor", LLColor4::red4));
 
     std::string filter_str_lc(filter_str);
     LLStringUtil::toLower(filter_str_lc);
diff --git a/indra/llui/llsearchablecontrol.h b/indra/llui/llsearchablecontrol.h
index 7f1421dd19..bae85fe9a5 100644
--- a/indra/llui/llsearchablecontrol.h
+++ b/indra/llui/llsearchablecontrol.h
@@ -43,9 +43,15 @@ namespace ll
             virtual ~SearchableControl()
             { }
 
-            const LLColor4& getHighlightColor( ) const
+            const LLColor4& getHighlightBgColor( ) const
             {
-                static LLUIColor highlight_color = LLUIColorTable::instance().getColor("SearchableControlHighlightColor", LLColor4::red4);
+                static LLUIColor highlight_color = LLUIColorTable::instance().getColor("SearchableControlHighlightBgColor", LLColor4::red4);
+                return highlight_color.get();
+            }
+
+            const LLColor4& getHighlightFontColor() const
+            {
+                static LLUIColor highlight_color = LLUIColorTable::instance().getColor("SearchableControlHighlightFontColor", LLColor4::red4);
                 return highlight_color.get();
             }
 
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index fae22fd248..41e7094163 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -1378,7 +1378,7 @@ void LLTextBase::draw()
     // Draw highlighted if needed
     if( ll::ui::SearchableControl::getHighlighted() )
     {
-        const LLColor4& bg_color = ll::ui::SearchableControl::getHighlightColor();
+        const LLColor4& bg_color = ll::ui::SearchableControl::getHighlightBgColor();
         LLRect bg_rect = mVisibleTextRect;
         if( mScroller )
             bg_rect.intersectWith( text_rect );
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 3537c764b9..fe4cce29ab 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -209,8 +209,15 @@ public:
     }
     virtual bool execute( LLTextBase* editor, S32* delta )
     {
-        mWString = editor->getWText().substr(getPosition(), mLen);
-        *delta = remove(editor, getPosition(), mLen );
+        try
+        {
+            mWString = editor->getWText().substr(getPosition(), mLen);
+            *delta = remove(editor, getPosition(), mLen);
+        }
+        catch (std::out_of_range&)
+        {
+            return false;
+        }
         return (*delta != 0);
     }
     virtual S32 undo( LLTextBase* editor )
@@ -1211,6 +1218,14 @@ void LLTextEditor::showEmojiHelper()
     LLEmojiHelper::instance().showHelper(this, cursorRect.mLeft, cursorRect.mTop, LLStringUtil::null, cb);
 }
 
+void LLTextEditor::hideEmojiHelper()
+{
+    if (mShowEmojiHelper)
+    {
+        LLEmojiHelper::instance().hideHelper(this);
+    }
+}
+
 void LLTextEditor::tryToShowEmojiHelper()
 {
     if (mReadOnly || !mShowEmojiHelper)
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index e9e7070414..b2b14b01e2 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -207,6 +207,7 @@ public:
     bool            getShowContextMenu() const { return mShowContextMenu; }
 
     void            showEmojiHelper();
+    void            hideEmojiHelper();
     void            setShowEmojiHelper(bool show);
     bool            getShowEmojiHelper() const { return mShowEmojiHelper; }
 
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index 3cc0c05ffa..77f132e9d8 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -221,6 +221,16 @@ bool LLUrlEntryBase::isWikiLinkCorrect(const std::string &labeled_url) const
     },
         L'\u002F'); // Solidus
 
+    std::replace_if(wlabel.begin(),
+        wlabel.end(),
+        [](const llwchar& chr)
+    {
+        return // Not a decomposition, but suficiently similar
+            (chr == L'\u04BA') // "Cyrillic Capital Letter Shha"
+            || (chr == L'\u04BB'); // "Cyrillic Small Letter Shha"
+    },
+        L'\u0068'); // "Latin Small Letter H"
+
     std::string label = wstring_to_utf8str(wlabel);
     if ((label.find(".com") != std::string::npos
          || label.find("www.") != std::string::npos)
diff --git a/indra/llwindow/lldxhardware.cpp b/indra/llwindow/lldxhardware.cpp
index fc51979eaf..ff85b2cb14 100644
--- a/indra/llwindow/lldxhardware.cpp
+++ b/indra/llwindow/lldxhardware.cpp
@@ -47,7 +47,6 @@
 #include "llstl.h"
 #include "lltimer.h"
 
-void (*gWriteDebug)(const char* msg) = NULL;
 LLDXHardware gDXHardware;
 
 //-----------------------------------------------------------------------------
@@ -61,170 +60,6 @@ typedef BOOL ( WINAPI* PfnCoSetProxyBlanket )( IUnknown* pProxy, DWORD dwAuthnSv
                                                OLECHAR* pServerPrincName, DWORD dwAuthnLevel, DWORD dwImpLevel,
                                                RPC_AUTH_IDENTITY_HANDLE pAuthInfo, DWORD dwCapabilities );
 
-HRESULT GetVideoMemoryViaWMI(WCHAR* strInputDeviceID, DWORD* pdwAdapterRam)
-{
-    HRESULT hr;
-    bool bGotMemory = false;
-    IWbemLocator* pIWbemLocator = nullptr;
-    IWbemServices* pIWbemServices = nullptr;
-    BSTR pNamespace = nullptr;
-
-    *pdwAdapterRam = 0;
-    CoInitializeEx(0, COINIT_APARTMENTTHREADED);
-
-    hr = CoCreateInstance( CLSID_WbemLocator,
-                           nullptr,
-                           CLSCTX_INPROC_SERVER,
-                           IID_IWbemLocator,
-                           ( LPVOID* )&pIWbemLocator );
-#ifdef PRINTF_DEBUGGING
-    if( FAILED( hr ) ) wprintf( L"WMI: CoCreateInstance failed: 0x%0.8x\n", hr );
-#endif
-
-    if( SUCCEEDED( hr ) && pIWbemLocator )
-    {
-        // Using the locator, connect to WMI in the given namespace.
-        pNamespace = SysAllocString( L"\\\\.\\root\\cimv2" );
-
-        hr = pIWbemLocator->ConnectServer( pNamespace, nullptr, nullptr, 0L,
-                                           0L, nullptr, nullptr, &pIWbemServices );
-#ifdef PRINTF_DEBUGGING
-        if( FAILED( hr ) ) wprintf( L"WMI: pIWbemLocator->ConnectServer failed: 0x%0.8x\n", hr );
-#endif
-        if( SUCCEEDED( hr ) && pIWbemServices != 0 )
-        {
-            HINSTANCE hinstOle32 = nullptr;
-
-            hinstOle32 = LoadLibraryW( L"ole32.dll" );
-            if( hinstOle32 )
-            {
-                PfnCoSetProxyBlanket pfnCoSetProxyBlanket = nullptr;
-
-                pfnCoSetProxyBlanket = ( PfnCoSetProxyBlanket )GetProcAddress( hinstOle32, "CoSetProxyBlanket" );
-                if( pfnCoSetProxyBlanket != 0 )
-                {
-                    // Switch security level to IMPERSONATE.
-                    pfnCoSetProxyBlanket( pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, nullptr,
-                                          RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, nullptr, 0 );
-                }
-
-                FreeLibrary( hinstOle32 );
-            }
-
-            IEnumWbemClassObject* pEnumVideoControllers = nullptr;
-            BSTR pClassName = nullptr;
-
-            pClassName = SysAllocString( L"Win32_VideoController" );
-
-            hr = pIWbemServices->CreateInstanceEnum( pClassName, 0,
-                                                     nullptr, &pEnumVideoControllers );
-#ifdef PRINTF_DEBUGGING
-            if( FAILED( hr ) ) wprintf( L"WMI: pIWbemServices->CreateInstanceEnum failed: 0x%0.8x\n", hr );
-#endif
-
-            if( SUCCEEDED( hr ) && pEnumVideoControllers )
-            {
-                IWbemClassObject* pVideoControllers[10] = {0};
-                DWORD uReturned = 0;
-                BSTR pPropName = nullptr;
-
-                // Get the first one in the list
-                pEnumVideoControllers->Reset();
-                hr = pEnumVideoControllers->Next( 5000,             // timeout in 5 seconds
-                                                  10,                  // return the first 10
-                                                  pVideoControllers,
-                                                  &uReturned );
-#ifdef PRINTF_DEBUGGING
-                if( FAILED( hr ) ) wprintf( L"WMI: pEnumVideoControllers->Next failed: 0x%0.8x\n", hr );
-                if( uReturned == 0 ) wprintf( L"WMI: pEnumVideoControllers uReturned == 0\n" );
-#endif
-
-                VARIANT var;
-                if( SUCCEEDED( hr ) )
-                {
-                    bool bFound = false;
-                    for( UINT iController = 0; iController < uReturned; iController++ )
-                    {
-                        if ( !pVideoControllers[iController] )
-                            continue;
-
-                        // if strInputDeviceID is set find this specific device and return memory or specific device
-                        // if strInputDeviceID is not set return the best device
-                        if (strInputDeviceID)
-                        {
-                            pPropName = SysAllocString( L"PNPDeviceID" );
-                            hr = pVideoControllers[iController]->Get( pPropName, 0L, &var, nullptr, nullptr );
-#ifdef PRINTF_DEBUGGING
-                            if( FAILED( hr ) )
-                                wprintf( L"WMI: pVideoControllers[iController]->Get PNPDeviceID failed: 0x%0.8x\n", hr );
-#endif
-                            if( SUCCEEDED( hr ) && strInputDeviceID)
-                            {
-                                if( wcsstr( var.bstrVal, strInputDeviceID ) != 0 )
-                                    bFound = true;
-                            }
-                            VariantClear( &var );
-                            if( pPropName ) SysFreeString( pPropName );
-                        }
-
-                        if( bFound || !strInputDeviceID )
-                        {
-                            pPropName = SysAllocString( L"AdapterRAM" );
-                            hr = pVideoControllers[iController]->Get( pPropName, 0L, &var, nullptr, nullptr );
-#ifdef PRINTF_DEBUGGING
-                            if( FAILED( hr ) )
-                                wprintf( L"WMI: pVideoControllers[iController]->Get AdapterRAM failed: 0x%0.8x\n",
-                                         hr );
-#endif
-                            if( SUCCEEDED( hr ) )
-                            {
-                                bGotMemory = true;
-                                *pdwAdapterRam = llmax(var.ulVal, *pdwAdapterRam);
-                            }
-                            VariantClear( &var );
-                            if( pPropName ) SysFreeString( pPropName );
-                        }
-
-                        SAFE_RELEASE( pVideoControllers[iController] );
-
-                        if (bFound)
-                        {
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if( pClassName )
-                SysFreeString( pClassName );
-            SAFE_RELEASE( pEnumVideoControllers );
-        }
-
-        if( pNamespace )
-            SysFreeString( pNamespace );
-        SAFE_RELEASE( pIWbemServices );
-    }
-
-    SAFE_RELEASE( pIWbemLocator );
-
-    CoUninitialize();
-
-    if( bGotMemory )
-        return S_OK;
-    else
-        return E_FAIL;
-}
-
-//static
-U32 LLDXHardware::getMBVideoMemoryViaWMI()
-{
-    DWORD vram = 0;
-    if (SUCCEEDED(GetVideoMemoryViaWMI(NULL, &vram)))
-    {
-        return vram / (1024 * 1024);;
-    }
-    return 0;
-}
 
 //Getting the version of graphics controller driver via WMI
 std::string LLDXHardware::getDriverVersionWMI(EGPUVendor vendor)
@@ -480,495 +315,14 @@ std::string get_string(IDxDiagContainer *containerp, const WCHAR *wszPropName)
     return ll_convert<std::string>(std::wstring(wszPropValue));
 }
 
-
-LLVersion::LLVersion()
-{
-    mValid = false;
-    S32 i;
-    for (i = 0; i < 4; i++)
-    {
-        mFields[i] = 0;
-    }
-}
-
-bool LLVersion::set(const std::string &version_string)
-{
-    S32 i;
-    for (i = 0; i < 4; i++)
-    {
-        mFields[i] = 0;
-    }
-    // Split the version string.
-    std::string str(version_string);
-    typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-    boost::char_separator<char> sep(".", "", boost::keep_empty_tokens);
-    tokenizer tokens(str, sep);
-
-    tokenizer::iterator iter = tokens.begin();
-    S32 count = 0;
-    for (;(iter != tokens.end()) && (count < 4);++iter)
-    {
-        mFields[count] = atoi(iter->c_str());
-        count++;
-    }
-    if (count < 4)
-    {
-        //LL_WARNS() << "Potentially bogus version string!" << version_string << LL_ENDL;
-        for (i = 0; i < 4; i++)
-        {
-            mFields[i] = 0;
-        }
-        mValid = false;
-    }
-    else
-    {
-        mValid = true;
-    }
-    return mValid;
-}
-
-S32 LLVersion::getField(const S32 field_num)
-{
-    if (!mValid)
-    {
-        return -1;
-    }
-    else
-    {
-        return mFields[field_num];
-    }
-}
-
-std::string LLDXDriverFile::dump()
-{
-    if (gWriteDebug)
-    {
-        gWriteDebug("Filename:");
-        gWriteDebug(mName.c_str());
-        gWriteDebug("\n");
-        gWriteDebug("Ver:");
-        gWriteDebug(mVersionString.c_str());
-        gWriteDebug("\n");
-        gWriteDebug("Date:");
-        gWriteDebug(mDateString.c_str());
-        gWriteDebug("\n");
-    }
-    LL_INFOS() << mFilepath << LL_ENDL;
-    LL_INFOS() << mName << LL_ENDL;
-    LL_INFOS() << mVersionString << LL_ENDL;
-    LL_INFOS() << mDateString << LL_ENDL;
-
-    return "";
-}
-
-LLDXDevice::~LLDXDevice()
-{
-    for_each(mDriverFiles.begin(), mDriverFiles.end(), DeletePairedPointer());
-    mDriverFiles.clear();
-}
-
-std::string LLDXDevice::dump()
-{
-    if (gWriteDebug)
-    {
-        gWriteDebug("StartDevice\n");
-        gWriteDebug("DeviceName:");
-        gWriteDebug(mName.c_str());
-        gWriteDebug("\n");
-        gWriteDebug("PCIString:");
-        gWriteDebug(mPCIString.c_str());
-        gWriteDebug("\n");
-    }
-    LL_INFOS() << LL_ENDL;
-    LL_INFOS() << "DeviceName:" << mName << LL_ENDL;
-    LL_INFOS() << "PCIString:" << mPCIString << LL_ENDL;
-    LL_INFOS() << "Drivers" << LL_ENDL;
-    LL_INFOS() << "-------" << LL_ENDL;
-    for (driver_file_map_t::iterator iter = mDriverFiles.begin(),
-             end = mDriverFiles.end();
-         iter != end; iter++)
-    {
-        LLDXDriverFile *filep = iter->second;
-        filep->dump();
-    }
-    if (gWriteDebug)
-    {
-        gWriteDebug("EndDevice\n");
-    }
-
-    return "";
-}
-
-LLDXDriverFile *LLDXDevice::findDriver(const std::string &driver)
-{
-    for (driver_file_map_t::iterator iter = mDriverFiles.begin(),
-             end = mDriverFiles.end();
-         iter != end; iter++)
-    {
-        LLDXDriverFile *filep = iter->second;
-        if (!utf8str_compare_insensitive(filep->mName,driver))
-        {
-            return filep;
-        }
-    }
-
-    return NULL;
-}
-
 LLDXHardware::LLDXHardware()
 {
-    mVRAM = 0;
-    gWriteDebug = NULL;
 }
 
 void LLDXHardware::cleanup()
 {
-  // for_each(mDevices.begin(), mDevices.end(), DeletePairedPointer());
-  // mDevices.clear();
-}
-
-/*
-std::string LLDXHardware::dumpDevices()
-{
-    if (gWriteDebug)
-    {
-        gWriteDebug("\n");
-        gWriteDebug("StartAllDevices\n");
-    }
-    for (device_map_t::iterator iter = mDevices.begin(),
-             end = mDevices.end();
-         iter != end; iter++)
-    {
-        LLDXDevice *devicep = iter->second;
-        devicep->dump();
-    }
-    if (gWriteDebug)
-    {
-        gWriteDebug("EndAllDevices\n\n");
-    }
-    return "";
 }
 
-LLDXDevice *LLDXHardware::findDevice(const std::string &vendor, const std::string &devices)
-{
-    // Iterate through different devices tokenized in devices string
-    std::string str(devices);
-    typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-    boost::char_separator<char> sep("|", "", boost::keep_empty_tokens);
-    tokenizer tokens(str, sep);
-
-    tokenizer::iterator iter = tokens.begin();
-    for (;iter != tokens.end();++iter)
-    {
-        std::string dev_str = *iter;
-        for (device_map_t::iterator iter = mDevices.begin(),
-                 end = mDevices.end();
-             iter != end; iter++)
-        {
-            LLDXDevice *devicep = iter->second;
-            if ((devicep->mVendorID == vendor)
-                && (devicep->mDeviceID == dev_str))
-            {
-                return devicep;
-            }
-        }
-    }
-
-    return NULL;
-}
-*/
-
-bool LLDXHardware::getInfo(bool vram_only)
-{
-    LLTimer hw_timer;
-    bool ok = false;
-    HRESULT       hr;
-
-    // CLSID_DxDiagProvider does not work with Multithreaded?
-    CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
-
-    IDxDiagProvider *dx_diag_providerp = NULL;
-    IDxDiagContainer *dx_diag_rootp = NULL;
-    IDxDiagContainer *devices_containerp = NULL;
-    // IDxDiagContainer *system_device_containerp= NULL;
-    IDxDiagContainer *device_containerp = NULL;
-    IDxDiagContainer *file_containerp = NULL;
-    IDxDiagContainer *driver_containerp = NULL;
-    DWORD dw_device_count;
-
-    mVRAM = 0;
-
-    // CoCreate a IDxDiagProvider*
-    LL_DEBUGS("AppInit") << "CoCreateInstance IID_IDxDiagProvider" << LL_ENDL;
-    hr = CoCreateInstance(CLSID_DxDiagProvider,
-                          NULL,
-                          CLSCTX_INPROC_SERVER,
-                          IID_IDxDiagProvider,
-                          (LPVOID*) &dx_diag_providerp);
-
-    if (FAILED(hr))
-    {
-        LL_WARNS("AppInit") << "No DXDiag provider found!  DirectX 9 not installed!" << LL_ENDL;
-        gWriteDebug("No DXDiag provider found!  DirectX 9 not installed!\n");
-        goto LCleanup;
-    }
-    if (SUCCEEDED(hr)) // if FAILED(hr) then dx9 is not installed
-    {
-        // Fill out a DXDIAG_INIT_PARAMS struct and pass it to IDxDiagContainer::Initialize
-        // Passing in TRUE for bAllowWHQLChecks, allows dxdiag to check if drivers are
-        // digital signed as logo'd by WHQL which may connect via internet to update
-        // WHQL certificates.
-        DXDIAG_INIT_PARAMS dx_diag_init_params;
-        ZeroMemory(&dx_diag_init_params, sizeof(DXDIAG_INIT_PARAMS));
-
-        dx_diag_init_params.dwSize                  = sizeof(DXDIAG_INIT_PARAMS);
-        dx_diag_init_params.dwDxDiagHeaderVersion   = DXDIAG_DX9_SDK_VERSION;
-        dx_diag_init_params.bAllowWHQLChecks        = TRUE;
-        dx_diag_init_params.pReserved               = NULL;
-
-        LL_DEBUGS("AppInit") << "dx_diag_providerp->Initialize" << LL_ENDL;
-        hr = dx_diag_providerp->Initialize(&dx_diag_init_params);
-        if(FAILED(hr))
-        {
-            goto LCleanup;
-        }
-
-        LL_DEBUGS("AppInit") << "dx_diag_providerp->GetRootContainer" << LL_ENDL;
-        hr = dx_diag_providerp->GetRootContainer( &dx_diag_rootp );
-        if(FAILED(hr) || !dx_diag_rootp)
-        {
-            goto LCleanup;
-        }
-
-        HRESULT hr;
-
-        // Get display driver information
-        LL_DEBUGS("AppInit") << "dx_diag_rootp->GetChildContainer" << LL_ENDL;
-        hr = dx_diag_rootp->GetChildContainer(L"DxDiag_DisplayDevices", &devices_containerp);
-        if(FAILED(hr) || !devices_containerp)
-        {
-            // do not release 'dirty' devices_containerp at this stage, only dx_diag_rootp
-            devices_containerp = NULL;
-            goto LCleanup;
-        }
-
-        // make sure there is something inside
-        hr = devices_containerp->GetNumberOfChildContainers(&dw_device_count);
-        if (FAILED(hr) || dw_device_count == 0)
-        {
-            goto LCleanup;
-        }
-
-        // Get device 0
-        // By default 0 device is the primary one, howhever in case of various hybrid graphics
-        // like itegrated AMD and PCI AMD GPUs system might switch.
-        LL_DEBUGS("AppInit") << "devices_containerp->GetChildContainer" << LL_ENDL;
-        hr = devices_containerp->GetChildContainer(L"0", &device_containerp);
-        if(FAILED(hr) || !device_containerp)
-        {
-            goto LCleanup;
-        }
-
-        DWORD vram = 0;
-
-        WCHAR deviceID[512];
-
-        get_wstring(device_containerp, L"szDeviceID", deviceID, 512);
-        // Example: searches id like 1F06 in pnp string (aka VEN_10DE&DEV_1F06)
-        // doesn't seem to work on some systems since format is unrecognizable
-        // but in such case keyDeviceID works
-        if (SUCCEEDED(GetVideoMemoryViaWMI(deviceID, &vram)))
-        {
-            mVRAM = vram/(1024*1024);
-        }
-        else
-        {
-            get_wstring(device_containerp, L"szKeyDeviceID", deviceID, 512);
-            LL_WARNS() << "szDeviceID" << ll_convert<std::string>(std::wstring(deviceID)) << LL_ENDL;
-            // '+9' to avoid ENUM\\PCI\\ prefix
-            // Returns string like Enum\\PCI\\VEN_10DE&DEV_1F06&SUBSYS...
-            // and since GetVideoMemoryViaWMI searches by PNPDeviceID it is sufficient
-            if (SUCCEEDED(GetVideoMemoryViaWMI(deviceID + 9, &vram)))
-            {
-                mVRAM = vram / (1024 * 1024);
-            }
-        }
-
-        if (mVRAM == 0)
-        { // Get the English VRAM string
-          std::string ram_str = get_string(device_containerp, L"szDisplayMemoryEnglish");
-
-          // We don't need the device any more
-          SAFE_RELEASE(device_containerp);
-
-          // Dump the string as an int into the structure
-          char *stopstring;
-          mVRAM = strtol(ram_str.c_str(), &stopstring, 10);
-          LL_INFOS("AppInit") << "VRAM Detected: " << mVRAM << " DX9 string: " << ram_str << LL_ENDL;
-        }
-
-        if (vram_only)
-        {
-            ok = true;
-            goto LCleanup;
-        }
-
-
-        /* for now, we ONLY do vram_only the rest of this
-           is commented out, to ensure no-one is tempted
-           to use it
-
-        // Now let's get device and driver information
-        // Get the IDxDiagContainer object called "DxDiag_SystemDevices".
-        // This call may take some time while dxdiag gathers the info.
-        DWORD num_devices = 0;
-        WCHAR wszContainer[256];
-        LL_DEBUGS("AppInit") << "dx_diag_rootp->GetChildContainer DxDiag_SystemDevices" << LL_ENDL;
-        hr = dx_diag_rootp->GetChildContainer(L"DxDiag_SystemDevices", &system_device_containerp);
-        if (FAILED(hr))
-        {
-            goto LCleanup;
-        }
-
-        hr = system_device_containerp->GetNumberOfChildContainers(&num_devices);
-        if (FAILED(hr))
-        {
-            goto LCleanup;
-        }
-
-        LL_DEBUGS("AppInit") << "DX9 iterating over devices" << LL_ENDL;
-        S32 device_num = 0;
-        for (device_num = 0; device_num < (S32)num_devices; device_num++)
-        {
-            hr = system_device_containerp->EnumChildContainerNames(device_num, wszContainer, 256);
-            if (FAILED(hr))
-            {
-                goto LCleanup;
-            }
-
-            hr = system_device_containerp->GetChildContainer(wszContainer, &device_containerp);
-            if (FAILED(hr) || device_containerp == NULL)
-            {
-                goto LCleanup;
-            }
-
-            std::string device_name = get_string(device_containerp, L"szDescription");
-
-            std::string device_id = get_string(device_containerp, L"szDeviceID");
-
-            LLDXDevice *dxdevicep = new LLDXDevice;
-            dxdevicep->mName = device_name;
-            dxdevicep->mPCIString = device_id;
-            mDevices[dxdevicep->mPCIString] = dxdevicep;
-
-            // Split the PCI string based on vendor, device, subsys, rev.
-            std::string str(device_id);
-            typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-            boost::char_separator<char> sep("&\\", "", boost::keep_empty_tokens);
-            tokenizer tokens(str, sep);
-
-            tokenizer::iterator iter = tokens.begin();
-            S32 count = 0;
-            bool valid = true;
-            for (;(iter != tokens.end()) && (count < 3);++iter)
-            {
-                switch (count)
-                {
-                case 0:
-                    if (strcmp(iter->c_str(), "PCI"))
-                    {
-                        valid = false;
-                    }
-                    break;
-                case 1:
-                    dxdevicep->mVendorID = iter->c_str();
-                    break;
-                case 2:
-                    dxdevicep->mDeviceID = iter->c_str();
-                    break;
-                default:
-                    // Ignore it
-                    break;
-                }
-                count++;
-            }
-
-
-
-
-            // Now, iterate through the related drivers
-            hr = device_containerp->GetChildContainer(L"Drivers", &driver_containerp);
-            if (FAILED(hr) || !driver_containerp)
-            {
-                goto LCleanup;
-            }
-
-            DWORD num_files = 0;
-            hr = driver_containerp->GetNumberOfChildContainers(&num_files);
-            if (FAILED(hr))
-            {
-                goto LCleanup;
-            }
-
-            S32 file_num = 0;
-            for (file_num = 0; file_num < (S32)num_files; file_num++ )
-            {
-
-                hr = driver_containerp->EnumChildContainerNames(file_num, wszContainer, 256);
-                if (FAILED(hr))
-                {
-                    goto LCleanup;
-                }
-
-                hr = driver_containerp->GetChildContainer(wszContainer, &file_containerp);
-                if (FAILED(hr) || file_containerp == NULL)
-                {
-                    goto LCleanup;
-                }
-
-                std::string driver_path = get_string(file_containerp, L"szPath");
-                std::string driver_name = get_string(file_containerp, L"szName");
-                std::string driver_version = get_string(file_containerp, L"szVersion");
-                std::string driver_date = get_string(file_containerp, L"szDatestampEnglish");
-
-                LLDXDriverFile *dxdriverfilep = new LLDXDriverFile;
-                dxdriverfilep->mName = driver_name;
-                dxdriverfilep->mFilepath= driver_path;
-                dxdriverfilep->mVersionString = driver_version;
-                dxdriverfilep->mVersion.set(driver_version);
-                dxdriverfilep->mDateString = driver_date;
-
-                dxdevicep->mDriverFiles[driver_name] = dxdriverfilep;
-
-                SAFE_RELEASE(file_containerp);
-            }
-            SAFE_RELEASE(device_containerp);
-        }
-        */
-    }
-
-    // dumpDevices();
-    ok = true;
-
-LCleanup:
-    if (!ok)
-    {
-        LL_WARNS("AppInit") << "DX9 probe failed" << LL_ENDL;
-        gWriteDebug("DX9 probe failed\n");
-    }
-
-    SAFE_RELEASE(file_containerp);
-    SAFE_RELEASE(driver_containerp);
-    SAFE_RELEASE(device_containerp);
-    SAFE_RELEASE(devices_containerp);
-    SAFE_RELEASE(dx_diag_rootp);
-    SAFE_RELEASE(dx_diag_providerp);
-
-    CoUninitialize();
-
-    return ok;
-    }
-
 LLSD LLDXHardware::getDisplayInfo()
 {
     LLTimer hw_timer;
@@ -995,7 +349,6 @@ LLSD LLDXHardware::getDisplayInfo()
     if (FAILED(hr))
     {
         LL_WARNS() << "No DXDiag provider found!  DirectX 9 not installed!" << LL_ENDL;
-        gWriteDebug("No DXDiag provider found!  DirectX 9 not installed!\n");
         goto LCleanup;
     }
     if (SUCCEEDED(hr)) // if FAILED(hr) then dx9 is not installed
@@ -1111,9 +464,4 @@ LCleanup:
     return ret;
 }
 
-void LLDXHardware::setWriteDebugFunc(void (*func)(const char*))
-{
-    gWriteDebug = func;
-}
-
 #endif
diff --git a/indra/llwindow/lldxhardware.h b/indra/llwindow/lldxhardware.h
index 2b879e021c..8d8a08a4eb 100644
--- a/indra/llwindow/lldxhardware.h
+++ b/indra/llwindow/lldxhardware.h
@@ -30,64 +30,16 @@
 #include <map>
 
 #include "stdtypes.h"
-#include "llstring.h"
 #include "llsd.h"
 
-class LLVersion
-{
-public:
-    LLVersion();
-    bool set(const std::string &version_string);
-    S32 getField(const S32 field_num);
-protected:
-    std::string mVersionString;
-    S32 mFields[4];
-    bool mValid;
-};
-
-class LLDXDriverFile
-{
-public:
-    std::string dump();
-
-public:
-    std::string mFilepath;
-    std::string mName;
-    std::string mVersionString;
-    LLVersion mVersion;
-    std::string mDateString;
-};
-
-class LLDXDevice
-{
-public:
-    ~LLDXDevice();
-    std::string dump();
-
-    LLDXDriverFile *findDriver(const std::string &driver);
-public:
-    std::string mName;
-    std::string mPCIString;
-    std::string mVendorID;
-    std::string mDeviceID;
-
-    typedef std::map<std::string, LLDXDriverFile *> driver_file_map_t;
-    driver_file_map_t mDriverFiles;
-};
-
 
 class LLDXHardware
 {
 public:
     LLDXHardware();
 
-    void setWriteDebugFunc(void (*func)(const char*));
     void cleanup();
 
-    // Returns true on success.
-    // vram_only true does a "light" probe.
-    bool getInfo(bool vram_only);
-
     // WMI can return multiple GPU drivers
     // specify which one to output
     typedef enum {
@@ -98,29 +50,9 @@ public:
     } EGPUVendor;
     std::string getDriverVersionWMI(EGPUVendor vendor);
 
-    S32 getVRAM() const { return mVRAM; }
-
     LLSD getDisplayInfo();
-
-    // Will get memory of best GPU in MB, return memory on sucsess, 0 on failure
-    // Note: WMI is not accurate in some cases
-    static U32 getMBVideoMemoryViaWMI();
-
-    // Find a particular device that matches the following specs.
-    // Empty strings indicate that you don't care.
-    // You can separate multiple devices with '|' chars to indicate you want
-    // ANY of them to match and return.
-    // LLDXDevice *findDevice(const std::string &vendor, const std::string &devices);
-
-    // std::string dumpDevices();
-public:
-    typedef std::map<std::string, LLDXDevice *> device_map_t;
-    // device_map_t mDevices;
-protected:
-    S32 mVRAM;
 };
 
-extern void (*gWriteDebug)(const char* msg);
 extern LLDXHardware gDXHardware;
 
 #endif // LL_LLDXHARDWARE_H
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 6c3be3eef8..dadbc83f45 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -279,6 +279,10 @@ void callResetKeys()
 
 bool callUnicodeCallback(wchar_t character, unsigned int mask)
 {
+    if (!gWindowImplementation)
+    {
+        return false;
+    }
     NativeKeyEventData eventData;
 
     memset(&eventData, 0, sizeof(NativeKeyEventData));
@@ -300,7 +304,7 @@ bool callUnicodeCallback(wchar_t character, unsigned int mask)
 
 void callFocus()
 {
-    if (gWindowImplementation)
+    if (gWindowImplementation && gWindowImplementation->getCallbacks())
     {
         gWindowImplementation->getCallbacks()->handleFocus(gWindowImplementation);
     }
@@ -308,7 +312,7 @@ void callFocus()
 
 void callFocusLost()
 {
-    if (gWindowImplementation)
+    if (gWindowImplementation && gWindowImplementation->getCallbacks())
     {
         gWindowImplementation->getCallbacks()->handleFocusLost(gWindowImplementation);
     }
@@ -316,6 +320,10 @@ void callFocusLost()
 
 void callRightMouseDown(float *pos, MASK mask)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     if (gWindowImplementation->allowsLanguageInput())
     {
         gWindowImplementation->interruptLanguageTextInput();
@@ -329,6 +337,10 @@ void callRightMouseDown(float *pos, MASK mask)
 
 void callRightMouseUp(float *pos, MASK mask)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     if (gWindowImplementation->allowsLanguageInput())
     {
         gWindowImplementation->interruptLanguageTextInput();
@@ -342,6 +354,10 @@ void callRightMouseUp(float *pos, MASK mask)
 
 void callLeftMouseDown(float *pos, MASK mask)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     if (gWindowImplementation->allowsLanguageInput())
     {
         gWindowImplementation->interruptLanguageTextInput();
@@ -355,6 +371,10 @@ void callLeftMouseDown(float *pos, MASK mask)
 
 void callLeftMouseUp(float *pos, MASK mask)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     if (gWindowImplementation->allowsLanguageInput())
     {
         gWindowImplementation->interruptLanguageTextInput();
@@ -369,6 +389,10 @@ void callLeftMouseUp(float *pos, MASK mask)
 
 void callDoubleClick(float *pos, MASK mask)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     if (gWindowImplementation->allowsLanguageInput())
     {
         gWindowImplementation->interruptLanguageTextInput();
@@ -382,7 +406,7 @@ void callDoubleClick(float *pos, MASK mask)
 
 void callResize(unsigned int width, unsigned int height)
 {
-    if (gWindowImplementation != NULL)
+    if (gWindowImplementation && gWindowImplementation->getCallbacks())
     {
         gWindowImplementation->getCallbacks()->handleResize(gWindowImplementation, width, height);
     }
@@ -390,6 +414,10 @@ void callResize(unsigned int width, unsigned int height)
 
 void callMouseMoved(float *pos, MASK mask)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     LLCoordGL       outCoords;
     outCoords.mX = ll_round(pos[0]);
     outCoords.mY = ll_round(pos[1]);
@@ -403,6 +431,10 @@ void callMouseMoved(float *pos, MASK mask)
 
 void callMouseDragged(float *pos, MASK mask)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     LLCoordGL       outCoords;
     outCoords.mX = ll_round(pos[0]);
     outCoords.mY = ll_round(pos[1]);
@@ -424,6 +456,10 @@ void callScrollMoved(float deltaX, float deltaY)
 
 void callMouseExit()
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     gWindowImplementation->getCallbacks()->handleMouseLeave(gWindowImplementation);
 }
 
@@ -475,11 +511,19 @@ void callWindowDidChangeScreen()
 
 void callDeltaUpdate(float *delta, MASK mask)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     gWindowImplementation->updateMouseDeltas(delta);
 }
 
 void callOtherMouseDown(float *pos, MASK mask, int button)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     LLCoordGL       outCoords;
     outCoords.mX = ll_round(pos[0]);
     outCoords.mY = ll_round(pos[1]);
@@ -500,6 +544,10 @@ void callOtherMouseDown(float *pos, MASK mask, int button)
 
 void callOtherMouseUp(float *pos, MASK mask, int button)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     LLCoordGL outCoords;
     outCoords.mX = ll_round(pos[0]);
     outCoords.mY = ll_round(pos[1]);
@@ -524,27 +572,43 @@ void callModifier(MASK mask)
 
 void callHandleDragEntered(std::string url)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     gWindowImplementation->handleDragNDrop(url, LLWindowCallbacks::DNDA_START_TRACKING);
 }
 
 void callHandleDragExited(std::string url)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     gWindowImplementation->handleDragNDrop(url, LLWindowCallbacks::DNDA_STOP_TRACKING);
 }
 
 void callHandleDragUpdated(std::string url)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     gWindowImplementation->handleDragNDrop(url, LLWindowCallbacks::DNDA_TRACK);
 }
 
 void callHandleDragDropped(std::string url)
 {
+    if (!gWindowImplementation)
+    {
+        return;
+    }
     gWindowImplementation->handleDragNDrop(url, LLWindowCallbacks::DNDA_DROPPED);
 }
 
 void callQuitHandler()
 {
-    if (gWindowImplementation)
+    if (gWindowImplementation && gWindowImplementation->getCallbacks())
     {
         if(gWindowImplementation->getCallbacks()->handleCloseRequest(gWindowImplementation))
         {
@@ -555,7 +619,7 @@ void callQuitHandler()
 
 void getPreeditSelectionRange(int *position, int *length)
 {
-    if (gWindowImplementation->getPreeditor())
+    if (gWindowImplementation && gWindowImplementation->getPreeditor())
     {
         gWindowImplementation->getPreeditor()->getSelectionRange(position, length);
     }
@@ -563,7 +627,7 @@ void getPreeditSelectionRange(int *position, int *length)
 
 void getPreeditMarkedRange(int *position, int *length)
 {
-    if (gWindowImplementation->getPreeditor())
+    if (gWindowImplementation && gWindowImplementation->getPreeditor())
     {
         gWindowImplementation->getPreeditor()->getPreeditRange(position, length);
     }
@@ -571,7 +635,7 @@ void getPreeditMarkedRange(int *position, int *length)
 
 void setPreeditMarkedRange(int position, int length)
 {
-    if (gWindowImplementation->getPreeditor())
+    if (gWindowImplementation && gWindowImplementation->getPreeditor())
     {
         gWindowImplementation->getPreeditor()->markAsPreedit(position, length);
     }
@@ -580,7 +644,7 @@ void setPreeditMarkedRange(int position, int length)
 bool handleUnicodeCharacter(wchar_t c)
 {
     bool success = false;
-    if (gWindowImplementation->getPreeditor())
+    if (gWindowImplementation && gWindowImplementation->getPreeditor())
     {
         success = gWindowImplementation->getPreeditor()->handleUnicodeCharHere(c);
     }
@@ -590,7 +654,7 @@ bool handleUnicodeCharacter(wchar_t c)
 
 void resetPreedit()
 {
-    if (gWindowImplementation->getPreeditor())
+    if (gWindowImplementation && gWindowImplementation->getPreeditor())
     {
         gWindowImplementation->getPreeditor()->resetPreedit();
     }
@@ -600,7 +664,7 @@ void resetPreedit()
 // This largely mirrors the old implementation, only sans the carbon parameters.
 void setMarkedText(unsigned short *unitext, unsigned int *selectedRange, unsigned int *replacementRange, long text_len, attributedStringInfo segments)
 {
-    if (gWindowImplementation->getPreeditor())
+    if (gWindowImplementation && gWindowImplementation->getPreeditor())
     {
         LLPreeditor *preeditor = gWindowImplementation->getPreeditor();
         preeditor->resetPreedit();
@@ -623,7 +687,7 @@ void setMarkedText(unsigned short *unitext, unsigned int *selectedRange, unsigne
 
 void getPreeditLocation(float *location, unsigned int length)
 {
-    if (gWindowImplementation->getPreeditor())
+    if (gWindowImplementation && gWindowImplementation->getPreeditor())
     {
         LLPreeditor *preeditor = gWindowImplementation->getPreeditor();
         LLCoordGL coord;
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index c7d09f6737..e46e3de4c0 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -4686,9 +4686,18 @@ void LLWindowWin32::LLWindowWin32Thread::checkDXMem()
 
                         if (phys_mb > 0)
                         {
-                            // Intel uses 'shared' vram, cap it to 25% of total memory
-                            // Todo: consider caping all adapters at least to 50% ram
-                            budget_mb = llmin(budget_mb, (UINT64)(phys_mb * 0.25));
+                            if (gGLManager.mIsIntel)
+                            {
+                                // Intel uses 'shared' vram, cap it to 25% of total memory
+                                // Todo: consider a way of detecting integrated Intel and AMD
+                                budget_mb = llmin(budget_mb, (UINT64)(phys_mb * 0.25));
+                            }
+                            else
+                            {
+                                // More budget is generally better, but the way viewer
+                                // utilizes even dedicated VRAM leaves a footprint in RAM
+                                budget_mb = llmin(budget_mb, (UINT64)(phys_mb * 0.75));
+                            }
                         }
                         else
                         {
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 45a8f0983b..23b0a7723e 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -92,6 +92,7 @@ set(viewer_SOURCE_FILES
     llagentwearables.cpp
     llanimstatelabels.cpp
     llappcorehttp.cpp
+    llappearancelistener.cpp
     llappearancemgr.cpp
     llappviewer.cpp
     llappviewerlistener.cpp
@@ -291,6 +292,7 @@ set(viewer_SOURCE_FILES
     llfloatersettingscolor.cpp
     llfloatersettingsdebug.cpp
     llfloatersidepanelcontainer.cpp
+    llfloaterslapptest.cpp
     llfloatersnapshot.cpp
     llfloatersounddevices.cpp
     llfloaterspellchecksettings.cpp
@@ -760,6 +762,7 @@ set(viewer_HEADER_FILES
     llanimstatelabels.h
     llappcorehttp.h
     llappearance.h
+    llappearancelistener.h
     llappearancemgr.h
     llappviewer.h
     llappviewerlistener.h
@@ -962,6 +965,7 @@ set(viewer_HEADER_FILES
     llfloatersettingscolor.h
     llfloatersettingsdebug.h
     llfloatersidepanelcontainer.h
+    llfloaterslapptest.h
     llfloatersnapshot.h
     llfloatersounddevices.h
     llfloaterspellchecksettings.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0c83355a81..1025c9299d 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -346,6 +346,17 @@
       <key>Value</key>
       <real>0.5</real>
     </map>
+    <key>AudioLevelWind</key>
+    <map>
+      <key>Comment</key>
+      <string>Audio level of wind noise when standing still</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>0.5</real>
+    </map>
 	<key>AudioStreamingMedia</key>
     <map>
       <key>Comment</key>
@@ -3676,6 +3687,17 @@
         <key>Value</key>
         <integer>5000</integer>
     </map>
+    <key>InventoryExposeFolderID</key>
+    <map>
+        <key>Comment</key>
+        <string>Allows copying folder id from context menu</string>
+        <key>Persist</key>
+        <integer>0</integer>
+        <key>Type</key>
+        <string>Boolean</string>
+        <key>Value</key>
+        <integer>0</integer>
+    </map>
     <key>MarketplaceListingsSortOrder</key>
     <map>
       <key>Comment</key>
@@ -7803,7 +7825,7 @@
       <key>Type</key>
       <string>U32</string>
       <key>Value</key>
-      <integer>2</integer>
+      <integer>1</integer>
   </map>
   <key>RenderMinFreeMainMemoryThreshold</key>
   <map>
@@ -9076,6 +9098,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+    <key>RenderReflectionProbeDynamicAllocation</key>
+    <map>
+        <key>Comment</key>
+        <string>Enable dynamic allocation of reflection probes. -1 means no dynamic allocation. Sets a buffer to allocate when a dynamic allocation occurs otherwise.</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>S32</string>
+        <key>Value</key>
+        <integer>-1</integer>
+    </map>
     <key>RenderReflectionProbeCount</key>
     <map>
         <key>Comment</key>
@@ -9540,6 +9573,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>RenderBalanceInSnapshot</key>
+    <map>
+      <key>Comment</key>
+      <string>Display L$ balance in snapshot</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>RenderUIBuffer</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
index 205d4bff6d..5089b9e31e 100644
--- a/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
+++ b/indra/newview/app_settings/shaders/class1/windlight/atmosphericsFuncs.glsl
@@ -154,6 +154,7 @@ void calcAtmosphericVarsLinear(vec3 inPositionEye, vec3 norm, vec3 light_dir, ou
     if (classic_mode < 1)
     {
         amblit = srgb_to_linear(amblit);
+        amblit = vec3(dot(amblit, vec3(0.2126, 0.7152, 0.0722)));
         sunlit = srgb_to_linear(sunlit);
     }
 
diff --git a/indra/newview/app_settings/shaders/class3/environment/waterF.glsl b/indra/newview/app_settings/shaders/class3/environment/waterF.glsl
index 1b7b0c1937..349f3b9a67 100644
--- a/indra/newview/app_settings/shaders/class3/environment/waterF.glsl
+++ b/indra/newview/app_settings/shaders/class3/environment/waterF.glsl
@@ -264,11 +264,11 @@ void main()
 
     // Calculate some distance fade in the water to better assist with refraction blending and reducing the refraction texture's "disconnect".
 #ifdef SHORELINE_FADE
-    fade = max(0,min(1, (pos.z - refPos.z) / 10))
+    fade = max(0,min(1, (pos.z - refPos.z) / 10));
 #else
-    fade = 1 * water_mask;
+    fade = 1;
 #endif
-
+    fade *= water_mask;
     distort2 = mix(distort, distort2, min(1, fade * 10));
     depth = texture(depthMap, distort2).r;
 
diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 883963d558..c0009d24ee 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -172,7 +172,7 @@ RenderTonemapType			1   1
 RenderTonemapMix			1   0.7
 RenderDisableVintageMode           1   0
 RenderMaxTextureResolution         1   1024
-RenderReflectionProbeCount  1   16
+RenderReflectionProbeCount  1   32
 
 //
 // Medium Graphics Settings (standard)
@@ -214,7 +214,7 @@ RenderExposure				1   1
 RenderTonemapType			1   1
 RenderTonemapMix			1   0.7
 RenderMaxTextureResolution  1   2048
-RenderReflectionProbeCount  1   32
+RenderReflectionProbeCount  1   64
 
 //
 // Medium High Graphics Settings
@@ -245,7 +245,7 @@ RenderFSAASamples			1	1
 RenderReflectionsEnabled    1   1
 RenderReflectionProbeDetail	1	1
 RenderScreenSpaceReflections 1  0
-RenderReflectionProbeLevel  1   2
+RenderReflectionProbeLevel  1   1
 RenderMirrors				1	0
 RenderHeroProbeResolution	1	512
 RenderHeroProbeDistance		1	6
@@ -287,7 +287,7 @@ RenderFSAASamples			1	2
 RenderReflectionsEnabled    1   1
 RenderReflectionProbeDetail	1	1
 RenderScreenSpaceReflections 1  0
-RenderReflectionProbeLevel  1   3
+RenderReflectionProbeLevel  1   2
 RenderMirrors				1	0
 RenderHeroProbeResolution	1	512
 RenderHeroProbeDistance		1	8
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index 103d24a26d..5940d1ec12 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -172,7 +172,7 @@ RenderTonemapType			1   1
 RenderTonemapMix			1   0.7
 RenderDisableVintageMode           1   0
 RenderMaxTextureResolution         1   1024
-RenderReflectionProbeCount  1   16
+RenderReflectionProbeCount  1   32
 
 //
 // Medium Graphics Settings (standard)
@@ -214,7 +214,7 @@ RenderExposure				1   1
 RenderTonemapType			1   1
 RenderTonemapMix			1   0.7
 RenderMaxTextureResolution  1   2048
-RenderReflectionProbeCount  1   32
+RenderReflectionProbeCount  1   64
 
 //
 // Medium High Graphics Settings
diff --git a/indra/newview/gltfscenemanager.cpp b/indra/newview/gltfscenemanager.cpp
index c33d15228c..e0cd762776 100644
--- a/indra/newview/gltfscenemanager.cpp
+++ b/indra/newview/gltfscenemanager.cpp
@@ -69,9 +69,16 @@ void GLTFSceneManager::load()
                 {
                     return;
                 }
-                if (filenames.size() > 0)
+                try
+                {
+                    if (filenames.size() > 0)
+                    {
+                        GLTFSceneManager::instance().load(filenames[0]);
+                    }
+                }
+                catch (std::bad_alloc&)
                 {
-                    GLTFSceneManager::instance().load(filenames[0]);
+                    LLNotificationsUtil::add("CannotOpenFileTooBig");
                 }
             },
             LLFilePicker::FFLOAD_GLTF,
diff --git a/indra/newview/groupchatlistener.cpp b/indra/newview/groupchatlistener.cpp
index 43507f13e9..ed9e34d1bf 100644
--- a/indra/newview/groupchatlistener.cpp
+++ b/indra/newview/groupchatlistener.cpp
@@ -2,11 +2,11 @@
  * @file   groupchatlistener.cpp
  * @author Nat Goodspeed
  * @date   2011-04-11
- * @brief  Implementation for groupchatlistener.
+ * @brief  Implementation for LLGroupChatListener.
  *
- * $LicenseInfo:firstyear=2011&license=viewerlgpl$
+ * $LicenseInfo:firstyear=2024&license=viewerlgpl$
  * Second Life Viewer Source Code
- * Copyright (C) 2011, Linden Research, Inc.
+ * Copyright (C) 2024, Linden Research, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -34,43 +34,69 @@
 // std headers
 // external library headers
 // other Linden headers
+#include "llchat.h"
 #include "llgroupactions.h"
 #include "llimview.h"
 
+LLGroupChatListener::LLGroupChatListener():
+    LLEventAPI("GroupChat",
+               "API to enter, leave, send and intercept group chat messages")
+{
+    add("startGroupChat",
+        "Enter a group chat in group with UUID [\"group_id\"]\n"
+        "Assumes the logged-in agent is already a member of this group.",
+        &LLGroupChatListener::startGroupChat,
+        llsd::map("group_id", LLSD()));
+    add("leaveGroupChat",
+        "Leave a group chat in group with UUID [\"group_id\"]\n"
+        "Assumes a prior successful startIM request.",
+        &LLGroupChatListener::leaveGroupChat,
+        llsd::map("group_id", LLSD()));
+    add("sendGroupIM",
+        "send a [\"message\"] to group with UUID [\"group_id\"]",
+        &LLGroupChatListener::sendGroupIM,
+        llsd::map("message", LLSD(), "group_id", LLSD()));
+}
 
-namespace {
-    void startIm_wrapper(LLSD const & event)
+bool is_in_group(LLEventAPI::Response &response, const LLSD &data)
+{
+    if (!LLGroupActions::isInGroup(data["group_id"]))
     {
-        LLUUID session_id = LLGroupActions::startIM(event["id"].asUUID());
-        sendReply(LLSDMap("session_id", LLSD(session_id)), event);
+        response.error(stringize("You are not the member of the group:", std::quoted(data["group_id"].asString())));
+        return false;
     }
+    return true;
+}
 
-    void send_message_wrapper(const std::string& text, const LLUUID& session_id, const LLUUID& group_id)
+void LLGroupChatListener::startGroupChat(LLSD const &data)
+{
+    Response response(LLSD(), data);
+    if (!is_in_group(response, data))
+    {
+        return;
+    }
+    if (LLGroupActions::startIM(data["group_id"]).isNull())
     {
-        LLIMModel::sendMessage(text, session_id, group_id, IM_SESSION_GROUP_START);
+        return response.error(stringize("Failed to start group chat session ", std::quoted(data["group_id"].asString())));
     }
 }
 
+void LLGroupChatListener::leaveGroupChat(LLSD const &data)
+{
+    Response response(LLSD(), data);
+    if (is_in_group(response, data))
+    {
+        LLGroupActions::endIM(data["group_id"].asUUID());
+    }
+}
 
-GroupChatListener::GroupChatListener():
-    LLEventAPI("GroupChat",
-               "API to enter, leave, send and intercept group chat messages")
+void LLGroupChatListener::sendGroupIM(LLSD const &data)
 {
-    add("startIM",
-        "Enter a group chat in group with UUID [\"id\"]\n"
-        "Assumes the logged-in agent is already a member of this group.",
-        &startIm_wrapper);
-    add("endIM",
-        "Leave a group chat in group with UUID [\"id\"]\n"
-        "Assumes a prior successful startIM request.",
-        &LLGroupActions::endIM,
-        llsd::array("id"));
-    add("sendIM",
-        "send a groupchat IM",
-        &send_message_wrapper,
-        llsd::array("text", "session_id", "group_id"));
+    Response response(LLSD(), data);
+    if (!is_in_group(response, data))
+    {
+        return;
+    }
+    LLUUID group_id(data["group_id"]);
+    LLIMModel::sendMessage(data["message"], gIMMgr->computeSessionID(IM_SESSION_GROUP_START, group_id), group_id, IM_SESSION_SEND);
 }
-/*
-    static void sendMessage(const std::string& utf8_text, const LLUUID& im_session_id,
-                                const LLUUID& other_participant_id, EInstantMessage dialog);
-*/
diff --git a/indra/newview/groupchatlistener.h b/indra/newview/groupchatlistener.h
index 3819ac59b7..14cd7266a3 100644
--- a/indra/newview/groupchatlistener.h
+++ b/indra/newview/groupchatlistener.h
@@ -26,15 +26,20 @@
  * $/LicenseInfo$
  */
 
-#if ! defined(LL_GROUPCHATLISTENER_H)
-#define LL_GROUPCHATLISTENER_H
+#if ! defined(LL_LLGROUPCHATLISTENER_H)
+#define LL_LLGROUPCHATLISTENER_H
 
 #include "lleventapi.h"
 
-class GroupChatListener: public LLEventAPI
+class LLGroupChatListener: public LLEventAPI
 {
 public:
-    GroupChatListener();
+    LLGroupChatListener();
+
+private:
+    void startGroupChat(LLSD const &data);
+    void leaveGroupChat(LLSD const &data);
+    void sendGroupIM(LLSD const &data);
 };
 
-#endif /* ! defined(LL_GROUPCHATLISTENER_H) */
+#endif /* ! defined(LL_LLGROUPCHATLISTENER_H) */
diff --git a/indra/newview/llagentlistener.cpp b/indra/newview/llagentlistener.cpp
index 0c120ae01d..5ddb87558a 100644
--- a/indra/newview/llagentlistener.cpp
+++ b/indra/newview/llagentlistener.cpp
@@ -31,19 +31,25 @@
 #include "llagentlistener.h"
 
 #include "llagent.h"
+#include "llagentcamera.h"
+#include "llavatarname.h"
+#include "llavatarnamecache.h"
 #include "llvoavatar.h"
 #include "llcommandhandler.h"
+#include "llinventorymodel.h"
 #include "llslurl.h"
 #include "llurldispatcher.h"
+#include "llviewercontrol.h"
 #include "llviewernetwork.h"
 #include "llviewerobject.h"
 #include "llviewerobjectlist.h"
 #include "llviewerregion.h"
+#include "llvoavatarself.h"
 #include "llsdutil.h"
 #include "llsdutil_math.h"
 #include "lltoolgrab.h"
 #include "llhudeffectlookat.h"
-#include "llagentcamera.h"
+#include "llviewercamera.h"
 
 LLAgentListener::LLAgentListener(LLAgent &agent)
   : LLEventAPI("LLAgent",
@@ -69,13 +75,6 @@ LLAgentListener::LLAgentListener(LLAgent &agent)
     add("resetAxes",
         "Set the agent to a fixed orientation (optionally specify [\"lookat\"] = array of [x, y, z])",
         &LLAgentListener::resetAxes);
-    add("getAxes",
-        "Obsolete - use getPosition instead\n"
-        "Send information about the agent's orientation on [\"reply\"]:\n"
-        "[\"euler\"]: map of {roll, pitch, yaw}\n"
-        "[\"quat\"]:  array of [x, y, z, w] quaternion values",
-        &LLAgentListener::getAxes,
-        LLSDMap("reply", LLSD()));
     add("getPosition",
         "Send information about the agent's position and orientation on [\"reply\"]:\n"
         "[\"region\"]: array of region {x, y, z} position\n"
@@ -87,33 +86,34 @@ LLAgentListener::LLAgentListener(LLAgent &agent)
     add("startAutoPilot",
         "Start the autopilot system using the following parameters:\n"
         "[\"target_global\"]: array of target global {x, y, z} position\n"
-        "[\"stop_distance\"]: target maxiumum distance from target [default: autopilot guess]\n"
+        "[\"stop_distance\"]: maximum stop distance from target [default: autopilot guess]\n"
         "[\"target_rotation\"]: array of [x, y, z, w] quaternion values [default: no target]\n"
         "[\"rotation_threshold\"]: target maximum angle from target facing rotation [default: 0.03 radians]\n"
-        "[\"behavior_name\"]: name of the autopilot behavior [default: \"\"]"
-        "[\"allow_flying\"]: allow flying during autopilot [default: True]",
-        //"[\"callback_pump\"]: pump to send success/failure and callback data to [default: none]\n"
-        //"[\"callback_data\"]: data to send back during a callback [default: none]",
-        &LLAgentListener::startAutoPilot);
+        "[\"behavior_name\"]: name of the autopilot behavior [default: \"\"]\n"
+        "[\"allow_flying\"]: allow flying during autopilot [default: True]\n"
+        "event with [\"success\"] flag is sent to 'LLAutopilot' event pump, when auto pilot is terminated",
+        &LLAgentListener::startAutoPilot,
+        llsd::map("target_global", LLSD()));
     add("getAutoPilot",
         "Send information about current state of the autopilot system to [\"reply\"]:\n"
         "[\"enabled\"]: boolean indicating whether or not autopilot is enabled\n"
         "[\"target_global\"]: array of target global {x, y, z} position\n"
         "[\"leader_id\"]: uuid of target autopilot is following\n"
-        "[\"stop_distance\"]: target maximum distance from target\n"
+        "[\"stop_distance\"]: maximum stop distance from target\n"
         "[\"target_distance\"]: last known distance from target\n"
         "[\"use_rotation\"]: boolean indicating if autopilot has a target facing rotation\n"
         "[\"target_facing\"]: array of {x, y} target direction to face\n"
         "[\"rotation_threshold\"]: target maximum angle from target facing rotation\n"
         "[\"behavior_name\"]: name of the autopilot behavior",
         &LLAgentListener::getAutoPilot,
-        LLSDMap("reply", LLSD()));
+        llsd::map("reply", LLSD()));
     add("startFollowPilot",
         "[\"leader_id\"]: uuid of target to follow using the autopilot system (optional with avatar_name)\n"
         "[\"avatar_name\"]: avatar name to follow using the autopilot system (optional with leader_id)\n"
         "[\"allow_flying\"]: allow flying during autopilot [default: True]\n"
-        "[\"stop_distance\"]: target maxiumum distance from target [default: autopilot guess]",
-        &LLAgentListener::startFollowPilot);
+        "[\"stop_distance\"]: maximum stop distance from target [default: autopilot guess]",
+        &LLAgentListener::startFollowPilot,
+        llsd::map("reply", LLSD()));
     add("setAutoPilotTarget",
         "Update target for currently running autopilot:\n"
         "[\"target_global\"]: array of target global {x, y, z} position",
@@ -138,6 +138,69 @@ LLAgentListener::LLAgentListener(LLAgent &agent)
         "[\"contrib\"]: user's land contribution to this group\n",
         &LLAgentListener::getGroups,
         LLSDMap("reply", LLSD()));
+    //camera params are similar to LSL, see https://wiki.secondlife.com/wiki/LlSetCameraParams
+    add("setCameraParams",
+        "Set Follow camera params, and then activate it:\n"
+        "[\"camera_pos\"]: vector3, camera position in region coordinates\n"
+        "[\"focus_pos\"]: vector3, what the camera is aimed at (in region coordinates)\n"
+        "[\"focus_offset\"]: vector3, adjusts the camera focus position relative to the target, default is (1, 0, 0)\n"
+        "[\"distance\"]: float (meters), distance the camera wants to be from its target, default is 3\n"
+        "[\"focus_threshold\"]: float (meters), sets the radius of a sphere around the camera's target position within which its focus is not affected by target motion, default is 1\n"
+        "[\"camera_threshold\"]: float (meters), sets the radius of a sphere around the camera's ideal position within which it is not affected by target motion, default is 1\n"
+        "[\"focus_lag\"]: float (seconds), how much the camera lags as it tries to aim towards the target, default is 0.1\n"
+        "[\"camera_lag\"]: float (seconds), how much the camera lags as it tries to move towards its 'ideal' position, default is 0.1\n"
+        "[\"camera_pitch\"]: float (degrees), adjusts the angular amount that the camera aims straight ahead vs. straight down, maintaining the same distance, default is 0\n"
+        "[\"behindness_angle\"]: float (degrees), sets the angle in degrees within which the camera is not constrained by changes in target rotation, default is 10\n"
+        "[\"behindness_lag\"]: float (seconds), sets how strongly the camera is forced to stay behind the target if outside of behindness angle, default is 0\n"
+        "[\"camera_locked\"]: bool, locks the camera position so it will not move\n"
+        "[\"focus_locked\"]: bool, locks the camera focus so it will not move",
+        &LLAgentListener::setFollowCamParams);
+    add("setFollowCamActive",
+        "Turns on or off scripted control of the camera using boolean [\"active\"]",
+        &LLAgentListener::setFollowCamActive,
+        llsd::map("active", LLSD()));
+    add("removeCameraParams",
+        "Reset Follow camera params",
+        &LLAgentListener::removeFollowCamParams);
+
+    add("playAnimation",
+        "Play [\"item_id\"] animation locally (by default) or [\"inworld\"] (when set to true)",
+        &LLAgentListener::playAnimation,
+        llsd::map("item_id", LLSD(), "reply", LLSD()));
+    add("stopAnimation",
+        "Stop playing [\"item_id\"] animation",
+        &LLAgentListener::stopAnimation,
+        llsd::map("item_id", LLSD(), "reply", LLSD()));
+    add("getAnimationInfo",
+        "Return information about [\"item_id\"] animation",
+        &LLAgentListener::getAnimationInfo,
+        llsd::map("item_id", LLSD(), "reply", LLSD()));
+
+    add("getID",
+        "Return your own avatar ID",
+        &LLAgentListener::getID,
+        llsd::map("reply", LLSD()));
+
+    add("getNearbyAvatarsList",
+        "Return result set key [\"result\"] for nearby avatars in a range of [\"dist\"]\n"
+        "if [\"dist\"] is not specified, 'RenderFarClip' setting is used\n"
+        "reply contains \"result\" table with \"id\", \"name\", \"global_pos\", \"region_pos\", \"region_id\" fields",
+        &LLAgentListener::getNearbyAvatarsList,
+        llsd::map("reply", LLSD()));
+
+    add("getNearbyObjectsList",
+        "Return result set key [\"result\"] for nearby objects in a range of [\"dist\"]\n"
+        "if [\"dist\"] is not specified, 'RenderFarClip' setting is used\n"
+        "reply contains \"result\" table with \"id\", \"global_pos\", \"region_pos\", \"region_id\" fields",
+        &LLAgentListener::getNearbyObjectsList,
+        llsd::map("reply", LLSD()));
+
+    add("getAgentScreenPos",
+        "Return screen position of the [\"avatar_id\"] avatar or own avatar if not specified\n"
+        "reply contains \"x\", \"y\" coordinates and \"onscreen\" flag to indicate if it's actually in within the current window\n"
+        "avatar render position is used as the point",
+        &LLAgentListener::getAgentScreenPos,
+        llsd::map("reply", LLSD()));
 }
 
 void LLAgentListener::requestTeleport(LLSD const & event_data) const
@@ -168,7 +231,7 @@ void LLAgentListener::requestSit(LLSD const & event_data) const
     //mAgent.getAvatarObject()->sitOnObject();
     // shamelessly ripped from llviewermenu.cpp:handle_sit_or_stand()
     // *TODO - find a permanent place to share this code properly.
-
+    Response response(LLSD(), event_data);
     LLViewerObject *object = NULL;
     if (event_data.has("obj_uuid"))
     {
@@ -177,7 +240,13 @@ void LLAgentListener::requestSit(LLSD const & event_data) const
     else if (event_data.has("position"))
     {
         LLVector3 target_position = ll_vector3_from_sd(event_data["position"]);
-        object = findObjectClosestTo(target_position);
+        object = findObjectClosestTo(target_position, true);
+    }
+    else
+    {
+        //just sit on the ground
+        mAgent.setControlFlags(AGENT_CONTROL_SIT_ON_GROUND);
+        return;
     }
 
     if (object && object->getPCode() == LL_PCODE_VOLUME)
@@ -194,8 +263,7 @@ void LLAgentListener::requestSit(LLSD const & event_data) const
     }
     else
     {
-        LL_WARNS() << "LLAgent requestSit could not find the sit target: "
-            << event_data << LL_ENDL;
+        response.error("requestSit could not find the sit target");
     }
 }
 
@@ -205,7 +273,7 @@ void LLAgentListener::requestStand(LLSD const & event_data) const
 }
 
 
-LLViewerObject * LLAgentListener::findObjectClosestTo( const LLVector3 & position ) const
+LLViewerObject * LLAgentListener::findObjectClosestTo(const LLVector3 & position, bool sit_target) const
 {
     LLViewerObject *object = NULL;
 
@@ -216,8 +284,13 @@ LLViewerObject * LLAgentListener::findObjectClosestTo( const LLVector3 & positio
     while (cur_index < num_objects)
     {
         LLViewerObject * cur_object = gObjectList.getObject(cur_index++);
-        if (cur_object)
-        {   // Calculate distance from the target position
+        if (cur_object && !cur_object->isAttachment())
+        {
+            if(sit_target && (cur_object->getPCode() != LL_PCODE_VOLUME))
+            {
+                continue;
+            }
+            // Calculate distance from the target position
             LLVector3 target_diff = cur_object->getPositionRegion() - position;
             F32 distance_to_target = target_diff.length();
             if (distance_to_target < min_distance)
@@ -296,22 +369,6 @@ void LLAgentListener::resetAxes(const LLSD& event_data) const
     }
 }
 
-void LLAgentListener::getAxes(const LLSD& event_data) const
-{
-    LLQuaternion quat(mAgent.getQuat());
-    F32 roll, pitch, yaw;
-    quat.getEulerAngles(&roll, &pitch, &yaw);
-    // The official query API for LLQuaternion's [x, y, z, w] values is its
-    // public member mQ...
-    LLSD reply = LLSD::emptyMap();
-    reply["quat"] = llsd_copy_array(boost::begin(quat.mQ), boost::end(quat.mQ));
-    reply["euler"] = LLSD::emptyMap();
-    reply["euler"]["roll"] = roll;
-    reply["euler"]["pitch"] = pitch;
-    reply["euler"]["yaw"] = yaw;
-    sendReply(reply, event_data);
-}
-
 void LLAgentListener::getPosition(const LLSD& event_data) const
 {
     F32 roll, pitch, yaw;
@@ -333,14 +390,13 @@ void LLAgentListener::getPosition(const LLSD& event_data) const
 
 void LLAgentListener::startAutoPilot(LLSD const & event_data)
 {
-    LLQuaternion target_rotation_value;
     LLQuaternion* target_rotation = NULL;
     if (event_data.has("target_rotation"))
     {
-        target_rotation_value = ll_quaternion_from_sd(event_data["target_rotation"]);
+        LLQuaternion target_rotation_value = ll_quaternion_from_sd(event_data["target_rotation"]);
         target_rotation = &target_rotation_value;
     }
-    // *TODO: Use callback_pump and callback_data
+
     F32 rotation_threshold = 0.03f;
     if (event_data.has("rotation_threshold"))
     {
@@ -360,13 +416,24 @@ void LLAgentListener::startAutoPilot(LLSD const & event_data)
         stop_distance = (F32)event_data["stop_distance"].asReal();
     }
 
+    std::string behavior_name = LLCoros::getName();
+    if (event_data.has("behavior_name"))
+    {
+        behavior_name = event_data["behavior_name"].asString();
+    }
+
     // Clear follow target, this is doing a path
     mFollowTarget.setNull();
 
+    auto finish_cb = [](bool success, void*)
+    {
+        LLEventPumps::instance().obtain("LLAutopilot").post(llsd::map("success", success));
+    };
+
     mAgent.startAutoPilotGlobal(ll_vector3d_from_sd(event_data["target_global"]),
-                                event_data["behavior_name"],
+                                behavior_name,
                                 target_rotation,
-                                NULL, NULL,
+                                finish_cb, NULL,
                                 stop_distance,
                                 rotation_threshold,
                                 allow_flying);
@@ -374,7 +441,7 @@ void LLAgentListener::startAutoPilot(LLSD const & event_data)
 
 void LLAgentListener::getAutoPilot(const LLSD& event_data) const
 {
-    LLSD reply = LLSD::emptyMap();
+    Response reply(LLSD(), event_data);
 
     LLSD::Boolean enabled = mAgent.getAutoPilot();
     reply["enabled"] = enabled;
@@ -403,12 +470,11 @@ void LLAgentListener::getAutoPilot(const LLSD& event_data) const
     reply["rotation_threshold"] = mAgent.getAutoPilotRotationThreshold();
     reply["behavior_name"] = mAgent.getAutoPilotBehaviorName();
     reply["fly"] = (LLSD::Boolean) mAgent.getFlying();
-
-    sendReply(reply, event_data);
 }
 
 void LLAgentListener::startFollowPilot(LLSD const & event_data)
 {
+    Response response(LLSD(), event_data);
     LLUUID target_id;
 
     bool allow_flying = true;
@@ -442,6 +508,10 @@ void LLAgentListener::startFollowPilot(LLSD const & event_data)
             }
         }
     }
+    else
+    {
+        return response.error("'leader_id' or 'avatar_name' should be specified");
+    }
 
     F32 stop_distance = 0.f;
     if (event_data.has("stop_distance"))
@@ -449,13 +519,16 @@ void LLAgentListener::startFollowPilot(LLSD const & event_data)
         stop_distance = (F32)event_data["stop_distance"].asReal();
     }
 
-    if (target_id.notNull())
+    if (!gObjectList.findObject(target_id))
     {
-        mAgent.setFlying(allow_flying);
-        mFollowTarget = target_id;  // Save follow target so we can report distance later
-
-        mAgent.startFollowPilot(target_id, allow_flying, stop_distance);
+        std::string target_info = event_data.has("leader_id") ? event_data["leader_id"] : event_data["avatar_name"];
+        return response.error(stringize("Target ", std::quoted(target_info), " was not found"));
     }
+
+    mAgent.setFlying(allow_flying);
+    mFollowTarget = target_id;  // Save follow target so we can report distance later
+
+    mAgent.startFollowPilot(target_id, allow_flying, stop_distance);
 }
 
 void LLAgentListener::setAutoPilotTarget(LLSD const & event_data) const
@@ -519,3 +592,209 @@ void LLAgentListener::getGroups(const LLSD& event) const
     }
     sendReply(LLSDMap("groups", reply), event);
 }
+
+/*----------------------------- camera control -----------------------------*/
+// specialize LLSDParam to support (const LLVector3&) arguments -- this
+// wouldn't even be necessary except that the relevant LLVector3 constructor
+// is explicitly explicit
+template <>
+class LLSDParam<const LLVector3&>: public LLSDParamBase
+{
+public:
+    LLSDParam(const LLSD& value): value(LLVector3(value)) {}
+
+    operator const LLVector3&() const { return value; }
+
+private:
+    LLVector3 value;
+};
+
+// accept any of a number of similar LLFollowCamMgr methods with different
+// argument types, and return a wrapper lambda that accepts LLSD and converts
+// to the target argument type
+template <typename T>
+auto wrap(void (LLFollowCamMgr::*method)(const LLUUID& source, T arg))
+{
+    return [method](LLFollowCamMgr& followcam, const LLUUID& source, const LLSD& arg)
+    { (followcam.*method)(source, LLSDParam<T>(arg)); };
+}
+
+// table of supported LLFollowCamMgr methods,
+// with the corresponding setFollowCamParams() argument keys
+static std::pair<std::string, std::function<void(LLFollowCamMgr&, const LLUUID&, const LLSD&)>>
+cam_params[] =
+{
+    { "camera_pos",       wrap(&LLFollowCamMgr::setPosition) },
+    { "focus_pos",        wrap(&LLFollowCamMgr::setFocus) },
+    { "focus_offset",     wrap(&LLFollowCamMgr::setFocusOffset) },
+    { "camera_locked",    wrap(&LLFollowCamMgr::setPositionLocked) },
+    { "focus_locked",     wrap(&LLFollowCamMgr::setFocusLocked) },
+    { "distance",         wrap(&LLFollowCamMgr::setDistance) },
+    { "focus_threshold",  wrap(&LLFollowCamMgr::setFocusThreshold) },
+    { "camera_threshold", wrap(&LLFollowCamMgr::setPositionThreshold) },
+    { "focus_lag",        wrap(&LLFollowCamMgr::setFocusLag) },
+    { "camera_lag",       wrap(&LLFollowCamMgr::setPositionLag) },
+    { "camera_pitch",     wrap(&LLFollowCamMgr::setPitch) },
+    { "behindness_lag",   wrap(&LLFollowCamMgr::setBehindnessLag) },
+    { "behindness_angle", wrap(&LLFollowCamMgr::setBehindnessAngle) },
+};
+
+void LLAgentListener::setFollowCamParams(const LLSD& event) const
+{
+    auto& followcam{ LLFollowCamMgr::instance() };
+    for (const auto& pair : cam_params)
+    {
+        if (event.has(pair.first))
+        {
+            pair.second(followcam, gAgentID, event[pair.first]);
+        }
+    }
+    followcam.setCameraActive(gAgentID, true);
+}
+
+void LLAgentListener::setFollowCamActive(LLSD const & event) const
+{
+    LLFollowCamMgr::getInstance()->setCameraActive(gAgentID, event["active"]);
+}
+
+void LLAgentListener::removeFollowCamParams(LLSD const & event) const
+{
+    LLFollowCamMgr::getInstance()->removeFollowCamParams(gAgentID);
+}
+
+LLViewerInventoryItem* get_anim_item(LLEventAPI::Response &response, const LLSD &event_data)
+{
+    LLViewerInventoryItem* item = gInventory.getItem(event_data["item_id"].asUUID());
+    if (!item || (item->getInventoryType() != LLInventoryType::IT_ANIMATION))
+    {
+        response.error(stringize("Animation item ", std::quoted(event_data["item_id"].asString()), " was not found"));
+        return NULL;
+    }
+    return item;
+}
+
+void LLAgentListener::playAnimation(LLSD const &event_data)
+{
+    Response response(LLSD(), event_data);
+    if (LLViewerInventoryItem* item = get_anim_item(response, event_data))
+    {
+        if (event_data["inworld"].asBoolean())
+        {
+            mAgent.sendAnimationRequest(item->getAssetUUID(), ANIM_REQUEST_START);
+        }
+        else
+        {
+            gAgentAvatarp->startMotion(item->getAssetUUID());
+        }
+    }
+}
+
+void LLAgentListener::stopAnimation(LLSD const &event_data)
+{
+    Response response(LLSD(), event_data);
+    if (LLViewerInventoryItem* item = get_anim_item(response, event_data))
+    {
+        gAgentAvatarp->stopMotion(item->getAssetUUID());
+        mAgent.sendAnimationRequest(item->getAssetUUID(), ANIM_REQUEST_STOP);
+    }
+}
+
+void LLAgentListener::getAnimationInfo(LLSD const &event_data)
+{
+    Response response(LLSD(), event_data);
+    if (LLViewerInventoryItem* item = get_anim_item(response, event_data))
+    {
+        // if motion exists, will return existing one
+        LLMotion* motion = gAgentAvatarp->createMotion(item->getAssetUUID());
+        response["anim_info"] = llsd::map("duration", motion->getDuration(),
+                                               "is_loop", motion->getLoop(),
+                                               "num_joints", motion->getNumJointMotions(),
+                                               "asset_id", item->getAssetUUID(),
+                                               "priority", motion->getPriority());
+    }
+}
+
+void LLAgentListener::getID(LLSD const& event_data)
+{
+    Response response(llsd::map("id", gAgentID), event_data);
+}
+
+F32 get_search_radius(LLSD const& event_data)
+{
+    static LLCachedControl<F32> render_far_clip(gSavedSettings, "RenderFarClip", 64);
+    F32 dist = render_far_clip;
+    if (event_data.has("dist"))
+    {
+        dist = llclamp((F32)event_data["dist"].asReal(), 1, 512);
+    }
+   return dist * dist;
+}
+
+void LLAgentListener::getNearbyAvatarsList(LLSD const& event_data)
+{
+    Response response(LLSD(), event_data);
+    F32 radius = get_search_radius(event_data);
+    LLVector3d agent_pos = gAgent.getPositionGlobal();
+    for (LLCharacter* character : LLCharacter::sInstances)
+    {
+        LLVOAvatar* avatar = (LLVOAvatar*)character;
+        if (avatar && !avatar->isDead() && !avatar->isControlAvatar() && !avatar->isSelf())
+        {
+            if ((dist_vec_squared(avatar->getPositionGlobal(), agent_pos) <= radius))
+            {
+                LLAvatarName av_name;
+                LLAvatarNameCache::get(avatar->getID(), &av_name);
+                LLVector3 region_pos = avatar->getCharacterPosition();
+                response["result"].append(llsd::map("id", avatar->getID(), "global_pos", ll_sd_from_vector3d(avatar->getPosGlobalFromAgent(region_pos)),
+                                                    "region_pos", ll_sd_from_vector3(region_pos), "name", av_name.getUserName(), "region_id", avatar->getRegion()->getRegionID()));
+            }
+        }
+    }
+}
+
+void LLAgentListener::getNearbyObjectsList(LLSD const& event_data)
+{
+    Response response(LLSD(), event_data);
+    F32 radius = get_search_radius(event_data);
+    S32 num_objects = gObjectList.getNumObjects();
+    LLVector3d agent_pos = gAgent.getPositionGlobal();
+    for (S32 i = 0; i < num_objects; ++i)
+    {
+        LLViewerObject* object = gObjectList.getObject(i);
+        if (object && object->getVolume() && !object->isAttachment())
+        {
+            if ((dist_vec_squared(object->getPositionGlobal(), agent_pos) <= radius))
+            {
+                response["result"].append(llsd::map("id", object->getID(), "global_pos", ll_sd_from_vector3d(object->getPositionGlobal()), "region_pos",
+                          ll_sd_from_vector3(object->getPositionRegion()), "region_id", object->getRegion()->getRegionID()));
+            }
+        }
+    }
+}
+
+void LLAgentListener::getAgentScreenPos(LLSD const& event_data)
+{
+    Response response(LLSD(), event_data);
+    LLVector3 render_pos;
+    if (event_data.has("avatar_id") && (event_data["avatar_id"].asUUID() != gAgentID))
+    {
+        LLUUID avatar_id(event_data["avatar_id"]);
+        for (LLCharacter* character : LLCharacter::sInstances)
+        {
+            LLVOAvatar* avatar = (LLVOAvatar*)character;
+            if (!avatar->isDead() && (avatar->getID() == avatar_id))
+            {
+                render_pos = avatar->getRenderPosition();
+                break;
+            }
+        }
+    }
+    else if (gAgentAvatarp.notNull() && gAgentAvatarp->isValid())
+    {
+        render_pos = gAgentAvatarp->getRenderPosition();
+    }
+    LLCoordGL screen_pos;
+    response["onscreen"] = LLViewerCamera::getInstance()->projectPosAgentToScreen(render_pos, screen_pos, false);
+    response["x"] = screen_pos.mX;
+    response["y"] = screen_pos.mY;
+}
diff --git a/indra/newview/llagentlistener.h b/indra/newview/llagentlistener.h
index c544d089ce..b5bea8c0bd 100644
--- a/indra/newview/llagentlistener.h
+++ b/indra/newview/llagentlistener.h
@@ -48,7 +48,6 @@ private:
     void requestStand(LLSD const & event_data) const;
     void requestTouch(LLSD const & event_data) const;
     void resetAxes(const LLSD& event_data) const;
-    void getAxes(const LLSD& event_data) const;
     void getGroups(const LLSD& event) const;
     void getPosition(const LLSD& event_data) const;
     void startAutoPilot(const LLSD& event_data);
@@ -58,7 +57,20 @@ private:
     void stopAutoPilot(const LLSD& event_data) const;
     void lookAt(LLSD const & event_data) const;
 
-    LLViewerObject * findObjectClosestTo( const LLVector3 & position ) const;
+    void setFollowCamParams(LLSD const & event_data) const;
+    void setFollowCamActive(LLSD const & event_data) const;
+    void removeFollowCamParams(LLSD const & event_data) const;
+
+    void playAnimation(LLSD const &event_data);
+    void stopAnimation(LLSD const &event_data);
+    void getAnimationInfo(LLSD const &event_data);
+
+    void getID(LLSD const& event_data);
+    void getNearbyAvatarsList(LLSD const& event_data);
+    void getNearbyObjectsList(LLSD const& event_data);
+    void getAgentScreenPos(LLSD const& event_data);
+
+    LLViewerObject * findObjectClosestTo( const LLVector3 & position, bool sit_target = false ) const;
 
 private:
     LLAgent &   mAgent;
diff --git a/indra/newview/llappearancelistener.cpp b/indra/newview/llappearancelistener.cpp
new file mode 100644
index 0000000000..dc7bbc3236
--- /dev/null
+++ b/indra/newview/llappearancelistener.cpp
@@ -0,0 +1,158 @@
+/**
+ * @file llappearancelistener.cpp
+ *
+ * $LicenseInfo:firstyear=2024&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2024, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llappearancelistener.h"
+
+#include "llappearancemgr.h"
+#include "llinventoryfunctions.h"
+#include "lltransutil.h"
+#include "llwearableitemslist.h"
+#include "stringize.h"
+
+LLAppearanceListener::LLAppearanceListener()
+  : LLEventAPI("LLAppearance",
+               "API to wear a specified outfit and wear/remove individual items")
+{
+    add("wearOutfit",
+        "Wear outfit by folder id: [\"folder_id\"] OR by folder name: [\"folder_name\"]\n"
+        "When [\"append\"] is true, outfit will be added to COF\n"
+        "otherwise it will replace current oufit",
+        &LLAppearanceListener::wearOutfit);
+
+    add("wearItems",
+        "Wear items by id: [items_id]",
+        &LLAppearanceListener::wearItems,
+        llsd::map("items_id", LLSD(), "replace", LLSD()));
+
+    add("detachItems",
+        "Detach items by id: [items_id]",
+        &LLAppearanceListener::detachItems,
+        llsd::map("items_id", LLSD()));
+
+    add("getOutfitsList",
+        "Return the table with Outfits info(id and name)",
+         &LLAppearanceListener::getOutfitsList);
+
+    add("getOutfitItems",
+        "Return the table of items with info(id : name, wearable_type, is_worn) inside specified outfit folder",
+         &LLAppearanceListener::getOutfitItems);
+}
+
+
+void LLAppearanceListener::wearOutfit(LLSD const &data)
+{
+    Response response(LLSD(), data);
+    if (!data.has("folder_id") && !data.has("folder_name"))
+    {
+        return response.error("Either [folder_id] or [folder_name] is required");
+    }
+
+    bool append = data.has("append") ? data["append"].asBoolean() : false;
+    if (!LLAppearanceMgr::instance().wearOutfit(data, append))
+    {
+        response.error("Failed to wear outfit");
+    }
+}
+
+void LLAppearanceListener::wearItems(LLSD const &data)
+{
+    const LLSD& items_id{ data["items_id"] };
+    uuid_vec_t  ids;
+    if (!items_id.isArray())
+    {
+        ids.push_back(items_id.asUUID());
+    }
+    else // array
+    {
+        for (const auto& id : llsd::inArray(items_id))
+        {
+            ids.push_back(id);
+        }
+    }
+    LLAppearanceMgr::instance().wearItemsOnAvatar(ids, true, data["replace"].asBoolean());
+}
+
+void LLAppearanceListener::detachItems(LLSD const &data)
+{
+    const LLSD& items_id{ data["items_id"] };
+    uuid_vec_t  ids;
+    if (!items_id.isArray())
+    {
+        ids.push_back(items_id.asUUID());
+    }
+    else // array
+    {
+        for (const auto& id : llsd::inArray(items_id))
+        {
+            ids.push_back(id);
+        }
+    }
+    LLAppearanceMgr::instance().removeItemsFromAvatar(ids);
+}
+
+void LLAppearanceListener::getOutfitsList(LLSD const &data)
+{
+    Response response(LLSD(), data);
+    const LLUUID outfits_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
+
+    LLInventoryModel::cat_array_t cat_array;
+    LLInventoryModel::item_array_t item_array;
+
+    LLIsFolderType is_category(LLFolderType::FT_OUTFIT);
+    gInventory.collectDescendentsIf(outfits_id, cat_array, item_array, LLInventoryModel::EXCLUDE_TRASH, is_category);
+
+    response["outfits"] = llsd::toMap(cat_array,
+        [](const LLPointer<LLViewerInventoryCategory> &cat)
+        { return std::make_pair(cat->getUUID().asString(), cat->getName()); });
+}
+
+void LLAppearanceListener::getOutfitItems(LLSD const &data)
+{
+    Response response(LLSD(), data);
+    LLUUID outfit_id(data["outfit_id"].asUUID());
+    LLViewerInventoryCategory *cat = gInventory.getCategory(outfit_id);
+    if (!cat || cat->getPreferredType() != LLFolderType::FT_OUTFIT)
+    {
+        return response.error(stringize("Couldn't find outfit ", outfit_id.asString()));
+    }
+    LLInventoryModel::cat_array_t  cat_array;
+    LLInventoryModel::item_array_t item_array;
+
+    LLFindOutfitItems collector = LLFindOutfitItems();
+    gInventory.collectDescendentsIf(outfit_id, cat_array, item_array, LLInventoryModel::EXCLUDE_TRASH, collector);
+
+    response["items"] = llsd::toMap(item_array,
+        [](const LLPointer<LLViewerInventoryItem> &it)
+        {
+            return std::make_pair(
+                it->getUUID().asString(),
+                llsd::map(
+                    "name", it->getName(),
+                    "wearable_type", LLWearableType::getInstance()->getTypeName(it->isWearableType() ? it->getWearableType() : LLWearableType::WT_NONE),
+                    "is_worn", get_is_item_worn(it)));
+        });
+}
diff --git a/indra/newview/llappearancelistener.h b/indra/newview/llappearancelistener.h
new file mode 100644
index 0000000000..04c5eac2eb
--- /dev/null
+++ b/indra/newview/llappearancelistener.h
@@ -0,0 +1,46 @@
+/**
+ * @file llappearancelistener.h
+ *
+ * $LicenseInfo:firstyear=2024&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2024, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+
+#ifndef LL_LLAPPEARANCELISTENER_H
+#define LL_LLAPPEARANCELISTENER_H
+
+#include "lleventapi.h"
+
+class LLAppearanceListener : public LLEventAPI
+{
+public:
+    LLAppearanceListener();
+
+private:
+    void wearOutfit(LLSD const &data);
+    void wearItems(LLSD const &data);
+    void detachItems(LLSD const &data);
+    void getOutfitsList(LLSD const &data);
+    void getOutfitItems(LLSD const &data);
+};
+
+#endif // LL_LLAPPEARANCELISTENER_H
+
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 4e0c5d7df0..e9d455ae53 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -31,6 +31,7 @@
 #include "llagent.h"
 #include "llagentcamera.h"
 #include "llagentwearables.h"
+#include "llappearancelistener.h"
 #include "llappearancemgr.h"
 #include "llattachmentsmgr.h"
 #include "llcommandhandler.h"
@@ -66,6 +67,8 @@
 
 #include "llavatarpropertiesprocessor.h"
 
+LLAppearanceListener sAppearanceListener;
+
 namespace
 {
     const S32   BAKE_RETRY_MAX_COUNT = 5;
@@ -4722,48 +4725,69 @@ void wear_multiple(const uuid_vec_t& ids, bool replace)
     LLAppearanceMgr::instance().wearItemsOnAvatar(ids, true, replace, cb);
 }
 
-// SLapp for easy-wearing of a stock (library) avatar
-//
+bool wear_category(const LLSD& query_map, bool append)
+{
+    LLUUID folder_uuid;
+
+    if (query_map.has("folder_name"))
+    {
+        std::string outfit_folder_name = query_map["folder_name"];
+        folder_uuid = findDescendentCategoryIDByName(gInventory.getLibraryRootFolderID(), outfit_folder_name);
+        if (folder_uuid.isNull())
+            LL_WARNS() << "Couldn't find " << std::quoted(outfit_folder_name) << " in the Library" << LL_ENDL;
+    }
+    if (folder_uuid.isNull() && query_map.has("folder_id"))
+    {
+        folder_uuid = query_map["folder_id"].asUUID();
+    }
+
+    if (folder_uuid.notNull())
+    {
+        if (LLViewerInventoryCategory* cat = gInventory.getCategory(folder_uuid))
+        {
+            if (bool is_library = gInventory.isObjectDescendentOf(folder_uuid, gInventory.getRootFolderID()))
+            {
+                LLPointer<LLInventoryCategory> new_category = new LLInventoryCategory(folder_uuid, LLUUID::null, LLFolderType::FT_CLOTHING, "Quick Appearance");
+                LLAppearanceMgr::getInstance()->wearInventoryCategory(new_category, true, append);
+            }
+            else
+            {
+                LLAppearanceMgr::getInstance()->wearInventoryCategory(cat, true, append);
+            }
+            return true;
+        }
+        else
+        {
+            LL_WARNS() << "Couldn't find folder id" << folder_uuid << " in Inventory" << LL_ENDL;
+        }
+    }
+
+    return false;
+}
+
+bool LLAppearanceMgr::wearOutfit(const LLSD& query_map, bool append)
+{
+    return wear_category(query_map, append);
+}
+
 class LLWearFolderHandler : public LLCommandHandler
 {
 public:
     // not allowed from outside the app
-    LLWearFolderHandler() : LLCommandHandler("wear_folder", UNTRUSTED_BLOCK) { }
+    LLWearFolderHandler() : LLCommandHandler("wear_folder", UNTRUSTED_BLOCK) {}
 
     bool handle(const LLSD& tokens,
                 const LLSD& query_map,
                 const std::string& grid,
                 LLMediaCtrl* web)
     {
-        LLSD::UUID folder_uuid;
-
-        if (folder_uuid.isNull() && query_map.has("folder_name"))
-        {
-            std::string outfit_folder_name = query_map["folder_name"];
-            folder_uuid = findDescendentCategoryIDByName(
-                gInventory.getLibraryRootFolderID(),
-                outfit_folder_name);
-        }
-        if (folder_uuid.isNull() && query_map.has("folder_id"))
+        if (wear_category(query_map, false))
         {
-            folder_uuid = query_map["folder_id"].asUUID();
-        }
+            // Assume this is coming from the predefined avatars web floater
+            LLUIUsage::instance().logCommand("Avatar.WearPredefinedAppearance");
 
-        if (folder_uuid.notNull())
-        {
-            LLPointer<LLInventoryCategory> category = new LLInventoryCategory(folder_uuid,
-                                                                              LLUUID::null,
-                                                                              LLFolderType::FT_CLOTHING,
-                                                                              "Quick Appearance");
-            if ( gInventory.getCategory( folder_uuid ) != NULL )
-            {
-                // Assume this is coming from the predefined avatars web floater
-                LLUIUsage::instance().logCommand("Avatar.WearPredefinedAppearance");
-                LLAppearanceMgr::getInstance()->wearInventoryCategory(category, true, false);
-
-                // *TODOw: This may not be necessary if initial outfit is chosen already -- josh
-                gAgent.setOutfitChosen(true);
-            }
+            // *TODOw: This may not be necessary if initial outfit is chosen already -- josh
+            gAgent.setOutfitChosen(true);
         }
 
         // release avatar picker keyboard focus
@@ -4773,4 +4797,46 @@ public:
     }
 };
 
+class LLAddFolderHandler : public LLCommandHandler
+{
+public:
+    // not allowed from outside the app
+    LLAddFolderHandler() : LLCommandHandler("add_folder", UNTRUSTED_BLOCK) {}
+
+    bool handle(const LLSD& tokens, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
+    {
+        wear_category(query_map, true);
+
+        return true;
+    }
+};
+
+class LLRemoveFolderHandler : public LLCommandHandler
+{
+public:
+    LLRemoveFolderHandler() : LLCommandHandler("remove_folder", UNTRUSTED_BLOCK) {}
+
+    bool handle(const LLSD& tokens, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web)
+    {
+        if (query_map.has("folder_id"))
+        {
+            LLUUID folder_id = query_map["folder_id"].asUUID();
+            if (folder_id.notNull())
+            {
+                if (LLViewerInventoryCategory* cat = gInventory.getCategory(folder_id))
+                {
+                    LLAppearanceMgr::instance().takeOffOutfit(cat->getLinkedUUID());
+                }
+                else
+                {
+                    LL_WARNS() << "Couldn't find folder id" << folder_id << " in Inventory" << LL_ENDL;
+                }
+            }
+        }
+        return true;
+    }
+};
+
 LLWearFolderHandler gWearFolderHandler;
+LLAddFolderHandler gAddFolderHandler;
+LLRemoveFolderHandler gRemoveFolderHandler;
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index 6c45a32856..bc7dc9506b 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -60,6 +60,7 @@ public:
     void wearInventoryCategoryOnAvatar(LLInventoryCategory* category, bool append);
     void wearCategoryFinal(const LLUUID& cat_id, bool copy_items, bool append);
     void wearOutfitByName(const std::string& name);
+    bool wearOutfit(const LLSD& query_map, bool append = false);
     void changeOutfit(bool proceed, const LLUUID& category, bool append);
     void replaceCurrentOutfit(const LLUUID& new_outfit);
     void renameOutfit(const LLUUID& outfit_id);
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 1251a900b0..2fa94cd27b 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -445,8 +445,8 @@ void idle_afk_check()
 {
     // check idle timers
     F32 current_idle = gAwayTriggerTimer.getElapsedTimeF32();
-    F32 afk_timeout  = (F32)gSavedSettings.getS32("AFKTimeout");
-    if (afk_timeout && (current_idle > afk_timeout) && ! gAgent.getAFK())
+    static LLCachedControl<S32> afk_timeout(gSavedSettings, "AFKTimeout", 300);
+    if (afk_timeout() && (current_idle > (F32)afk_timeout()) && !gAgent.getAFK())
     {
         LL_INFOS("IdleAway") << "Idle more than " << afk_timeout << " seconds: automatically changing to Away status" << LL_ENDL;
         gAgent.setAFK();
@@ -4550,6 +4550,7 @@ void LLAppViewer::saveFinalSnapshot()
                                     false,
                                     gSavedSettings.getBOOL("RenderHUDInSnapshot"),
                                     true,
+                                    false,
                                     LLSnapshotModel::SNAPSHOT_TYPE_COLOR,
                                     LLSnapshotModel::SNAPSHOT_FORMAT_PNG);
         mSavedFinalSnapshot = true;
@@ -5226,15 +5227,28 @@ void LLAppViewer::sendLogoutRequest()
         gLogoutInProgress = true;
         if (!mSecondInstance)
         {
-            mLogoutMarkerFileName = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,LOGOUT_MARKER_FILE_NAME);
-
-            mLogoutMarkerFile.open(mLogoutMarkerFileName, LL_APR_WB);
-            if (mLogoutMarkerFile.getFileHandle())
+            mLogoutMarkerFileName = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, LOGOUT_MARKER_FILE_NAME);
+            try
             {
-                LL_INFOS("MarkerFile") << "Created logout marker file '"<< mLogoutMarkerFileName << "' " << LL_ENDL;
-                recordMarkerVersion(mLogoutMarkerFile);
+                if (!mLogoutMarkerFile.getFileHandle())
+                {
+                    mLogoutMarkerFile.open(mLogoutMarkerFileName, LL_APR_WB);
+                    if (mLogoutMarkerFile.getFileHandle())
+                    {
+                        LL_INFOS("MarkerFile") << "Created logout marker file '" << mLogoutMarkerFileName << "' " << LL_ENDL;
+                        recordMarkerVersion(mLogoutMarkerFile);
+                    }
+                    else
+                    {
+                        LL_WARNS("MarkerFile") << "Cannot create logout marker file " << mLogoutMarkerFileName << LL_ENDL;
+                    }
+                }
+                else
+                {
+                    LL_WARNS("MarkerFile") << "Atempted to reopen file '" << mLogoutMarkerFileName << "' " << LL_ENDL;
+                }
             }
-            else
+            catch (...)
             {
                 LL_WARNS("MarkerFile") << "Cannot create logout marker file " << mLogoutMarkerFileName << LL_ENDL;
             }
@@ -5251,6 +5265,8 @@ void LLAppViewer::sendLogoutRequest()
         msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
         gAgent.sendReliableMessage();
 
+        LL_INFOS("Agent") << "Logging out as agent: " << gAgent.getID() << " Session: " << gAgent.getSessionID() << LL_ENDL;
+
         gLogoutTimer.reset();
         gLogoutMaxTime = LOGOUT_REQUEST_TIME;
         mLogoutRequestSent = true;
@@ -5386,7 +5402,8 @@ void LLAppViewer::idleNetwork()
     gObjectList.mNumNewObjects = 0;
     S32 total_decoded = 0;
 
-    if (!gSavedSettings.getBOOL("SpeedTest"))
+    static LLCachedControl<bool> speed_test(gSavedSettings, "SpeedTest", false);
+    if (!speed_test())
     {
         LL_PROFILE_ZONE_NAMED_CATEGORY_NETWORK("idle network"); //LL_RECORD_BLOCK_TIME(FTM_IDLE_NETWORK); // decode
 
@@ -5445,7 +5462,9 @@ void LLAppViewer::idleNetwork()
             }
 
             // Handle per-frame message system processing.
-            lmc.processAcks(gSavedSettings.getF32("AckCollectTime"));
+
+            static LLCachedControl<F32> ack_collection_time(gSavedSettings, "AckCollectTime", 0.1f);
+            lmc.processAcks(ack_collection_time());
         }
     }
     add(LLStatViewer::NUM_NEW_OBJECTS, gObjectList.mNumNewObjects);
@@ -5453,6 +5472,7 @@ void LLAppViewer::idleNetwork()
     // Retransmit unacknowledged packets.
     gXferManager->retransmitUnackedPackets();
     gAssetStorage->checkForTimeouts();
+    gViewerThrottle.setBufferLoadRate(gMessageSystem->getBufferLoadRate());
     gViewerThrottle.updateDynamicThrottle();
 
     // Check that the circuit between the viewer and the agent's current
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 0eb7f7fdb7..2fb1ae7906 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -155,10 +155,10 @@ namespace
 
             sBugSplatSender->setAttribute(WCSTR(L"OS"), WCSTR(LLOSInfo::instance().getOSStringSimple())); // In case we ever stop using email for this
             sBugSplatSender->setAttribute(WCSTR(L"AppState"), WCSTR(LLStartUp::getStartupStateString()));
-            sBugSplatSender->setAttribute(WCSTR(L"GL Vendor"), WCSTR(gGLManager.mGLVendor));
-            sBugSplatSender->setAttribute(WCSTR(L"GL Version"), WCSTR(gGLManager.mGLVersionString));
-            sBugSplatSender->setAttribute(WCSTR(L"GPU Version"), WCSTR(gGLManager.mDriverVersionVendorString));
-            sBugSplatSender->setAttribute(WCSTR(L"GL Renderer"), WCSTR(gGLManager.mGLRenderer));
+            sBugSplatSender->setAttribute(WCSTR(L"GLVendor"), WCSTR(gGLManager.mGLVendor));
+            sBugSplatSender->setAttribute(WCSTR(L"GLVersion"), WCSTR(gGLManager.mGLVersionString));
+            sBugSplatSender->setAttribute(WCSTR(L"GPUVersion"), WCSTR(gGLManager.mDriverVersionVendorString));
+            sBugSplatSender->setAttribute(WCSTR(L"GLRenderer"), WCSTR(gGLManager.mGLRenderer));
             sBugSplatSender->setAttribute(WCSTR(L"VRAM"), WCSTR(STRINGIZE(gGLManager.mVRAM)));
             sBugSplatSender->setAttribute(WCSTR(L"RAM"), WCSTR(STRINGIZE(gSysMemory.getPhysicalMemoryKB().value())));
 
@@ -842,69 +842,11 @@ void write_debug_dx(const std::string& str)
 
 bool LLAppViewerWin32::initHardwareTest()
 {
-    //
-    // Do driver verification and initialization based on DirectX
-    // hardware polling and driver versions
-    //
-    if (true == gSavedSettings.getBOOL("ProbeHardwareOnStartup") && false == gSavedSettings.getBOOL("NoHardwareProbe"))
-    {
-        // per DEV-11631 - disable hardware probing for everything
-        // but vram.
-        bool vram_only = true;
-
-        LLSplashScreen::update(LLTrans::getString("StartupDetectingHardware"));
-
-        LL_DEBUGS("AppInit") << "Attempting to poll DirectX for hardware info" << LL_ENDL;
-        gDXHardware.setWriteDebugFunc(write_debug_dx);
-        bool probe_ok = gDXHardware.getInfo(vram_only);
-
-        if (!probe_ok
-            && gWarningSettings.getBOOL("AboutDirectX9"))
-        {
-            LL_WARNS("AppInit") << "DirectX probe failed, alerting user." << LL_ENDL;
-
-            // Warn them that runnin without DirectX 9 will
-            // not allow us to tell them about driver issues
-            std::ostringstream msg;
-            msg << LLTrans::getString ("MBNoDirectX");
-            S32 button = OSMessageBox(
-                msg.str(),
-                LLTrans::getString("MBWarning"),
-                OSMB_YESNO);
-            if (OSBTN_NO== button)
-            {
-                LL_INFOS("AppInit") << "User quitting after failed DirectX 9 detection" << LL_ENDL;
-                LLWeb::loadURLExternal("http://secondlife.com/support/", false);
-                return false;
-            }
-            gWarningSettings.setBOOL("AboutDirectX9", false);
-        }
-        LL_DEBUGS("AppInit") << "Done polling DirectX for hardware info" << LL_ENDL;
-
-        // Only probe once after installation
-        gSavedSettings.setBOOL("ProbeHardwareOnStartup", false);
-
-        // Disable so debugger can work
-        std::string splash_msg;
-        LLStringUtil::format_map_t args;
-        args["[APP_NAME]"] = LLAppViewer::instance()->getSecondLifeTitle();
-        splash_msg = LLTrans::getString("StartupLoading", args);
-
-        LLSplashScreen::update(splash_msg);
-    }
-
     if (!restoreErrorTrap())
     {
-        LL_WARNS("AppInit") << " Someone took over my exception handler (post hardware probe)!" << LL_ENDL;
+        LL_WARNS("AppInit") << " Someone took over my exception handler!" << LL_ENDL;
     }
 
-    if (gGLManager.mVRAM == 0)
-    {
-        gGLManager.mVRAM = gDXHardware.getVRAM();
-    }
-
-    LL_INFOS("AppInit") << "Detected VRAM: " << gGLManager.mVRAM << LL_ENDL;
-
     return true;
 }
 
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index 549c7ed0e4..829b6380cd 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -42,6 +42,7 @@
 #include "llinventorymodel.h"
 #include "llnotifications.h"
 #include "llslurl.h"
+#include "llstartup.h"
 #include "llimview.h"
 #include "lltrans.h"
 #include "llviewercontrol.h"
@@ -743,7 +744,11 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
 
         mModifyMask |= LLFriendObserver::ONLINE;
         instance().notifyObservers();
-        gInventory.notifyObservers();
+        // Skip if we had received the friends list before the inventory callbacks were properly initialized
+        if (LLStartUp::getStartupState() > STATE_INVENTORY_CALLBACKS)
+        {
+            gInventory.notifyObservers();
+        }
     }
 }
 
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 4921964b35..9d212cfe8b 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -253,7 +253,15 @@ void LLDrawable::cleanupReferences()
     std::for_each(mFaces.begin(), mFaces.end(), DeletePointer());
     mFaces.clear();
 
-    gPipeline.unlinkDrawable(this);
+    if (gPipeline.mInitialized)
+    {
+        gPipeline.unlinkDrawable(this);
+    }
+    else if (getSpatialGroup())
+    {
+        // Not supposed to happen?
+        getSpatialGroup()->getSpatialPartition()->remove(this, getSpatialGroup());
+    }
 
     removeFromOctree();
 
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 95f96e85d6..90ee95d424 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -491,7 +491,6 @@ void LLDrawPoolAvatar::beginImpostor()
 
     if (!LLPipeline::sReflectionRender)
     {
-        LLVOAvatar::sRenderDistance = llclamp(LLVOAvatar::sRenderDistance, 16.f, 256.f);
         LLVOAvatar::sNumVisibleAvatars = 0;
     }
 
@@ -547,7 +546,6 @@ void LLDrawPoolAvatar::beginDeferredImpostor()
 
     if (!LLPipeline::sReflectionRender)
     {
-        LLVOAvatar::sRenderDistance = llclamp(LLVOAvatar::sRenderDistance, 16.f, 256.f);
         LLVOAvatar::sNumVisibleAvatars = 0;
     }
 
diff --git a/indra/newview/lldrawpoolterrain.h b/indra/newview/lldrawpoolterrain.h
index 5380463d01..23cf253b6a 100644
--- a/indra/newview/lldrawpoolterrain.h
+++ b/indra/newview/lldrawpoolterrain.h
@@ -38,6 +38,7 @@ public:
         VERTEX_DATA_MASK = LLVertexBuffer::MAP_VERTEX |
                     LLVertexBuffer::MAP_NORMAL |
                     LLVertexBuffer::MAP_TANGENT | // Only PBR terrain uses this currently
+                    LLVertexBuffer::MAP_TEXCOORD0 | // Ownership overlay
                     LLVertexBuffer::MAP_TEXCOORD1
     };
 
diff --git a/indra/newview/lldrawpooltree.cpp b/indra/newview/lldrawpooltree.cpp
index 6efd503574..26ef190fbb 100644
--- a/indra/newview/lldrawpooltree.cpp
+++ b/indra/newview/lldrawpooltree.cpp
@@ -108,8 +108,9 @@ void LLDrawPoolTree::beginShadowPass(S32 pass)
 {
     LL_PROFILE_ZONE_SCOPED;
 
-    glPolygonOffset(gSavedSettings.getF32("RenderDeferredTreeShadowOffset"),
-                    gSavedSettings.getF32("RenderDeferredTreeShadowBias"));
+    static LLCachedControl<F32> shadow_offset(gSavedSettings, "RenderDeferredTreeShadowOffset");
+    static LLCachedControl<F32> shadow_bias(gSavedSettings, "RenderDeferredTreeShadowBias");
+    glPolygonOffset(shadow_offset(), shadow_bias());
 
     LLEnvironment& environment = LLEnvironment::instance();
 
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 77a6e20b07..f08ef8d24a 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -2214,7 +2214,7 @@ bool LLFace::calcPixelArea(F32& cos_angle_to_view_dir, F32& radius)
     {
         LL_PROFILE_ZONE_NAMED_CATEGORY_FACE("calcPixelArea - rigged");
         //override with joint volume face joint bounding boxes
-        LLVOAvatar* avatar = mVObjp->getAvatar();
+        LLVOAvatar* avatar = mVObjp.notNull() ? mVObjp->getAvatar() : nullptr;
         bool hasRiggedExtents = false;
 
         if (avatar && avatar->mDrawable)
diff --git a/indra/newview/llfetchedgltfmaterial.cpp b/indra/newview/llfetchedgltfmaterial.cpp
index c2821d56d6..558fc92018 100644
--- a/indra/newview/llfetchedgltfmaterial.cpp
+++ b/indra/newview/llfetchedgltfmaterial.cpp
@@ -199,6 +199,7 @@ bool LLFetchedGLTFMaterial::replaceLocalTexture(const LLUUID& tracking_id, const
     {
         mTrackingIdToLocalTexture.erase(tracking_id);
     }
+    updateLocalTexDataDigest();
 
     return res;
 }
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index e55bf50724..e4b14d8df6 100644
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1939,7 +1939,7 @@ bool LLFloaterIMContainer::removeConversationListItem(const LLUUID& uuid, bool c
     mConversationEventQueue.erase(uuid);
 
     // Don't let the focus fall IW, select and refocus on the first conversation in the list
-    if (change_focus)
+    if (change_focus && isInVisibleChain())
     {
         setFocus(true);
         if (new_selection)
@@ -1959,6 +1959,10 @@ bool LLFloaterIMContainer::removeConversationListItem(const LLUUID& uuid, bool c
             }
         }
     }
+    else
+    {
+        LL_INFOS() << "Conversation widgets: " << (S32)mConversationsWidgets.size() << LL_ENDL;
+    }
     return is_widget_selected;
 }
 
diff --git a/indra/newview/llfloaterimnearbychat.cpp b/indra/newview/llfloaterimnearbychat.cpp
index 28c651f0cd..db6f9ac22a 100644
--- a/indra/newview/llfloaterimnearbychat.cpp
+++ b/indra/newview/llfloaterimnearbychat.cpp
@@ -52,6 +52,7 @@
 
 #include "llfirstuse.h"
 #include "llfloaterimnearbychat.h"
+#include "llfloaterimnearbychatlistener.h"
 #include "llagent.h" // gAgent
 #include "llgesturemgr.h"
 #include "llmultigesture.h"
@@ -71,6 +72,8 @@
 
 S32 LLFloaterIMNearbyChat::sLastSpecialChatChannel = 0;
 
+static LLFloaterIMNearbyChatListener sChatListener;
+
 constexpr S32 EXPANDED_HEIGHT = 266;
 constexpr S32 COLLAPSED_HEIGHT = 60;
 constexpr S32 EXPANDED_MIN_HEIGHT = 150;
diff --git a/indra/newview/llfloaterimnearbychatlistener.cpp b/indra/newview/llfloaterimnearbychatlistener.cpp
index 43173d3680..b15a32ce40 100644
--- a/indra/newview/llfloaterimnearbychatlistener.cpp
+++ b/indra/newview/llfloaterimnearbychatlistener.cpp
@@ -34,12 +34,12 @@
 #include "llagent.h"
 #include "llchat.h"
 #include "llviewercontrol.h"
+#include "stringize.h"
 
+static const F32 CHAT_THROTTLE_PERIOD = 1.f;
 
-LLFloaterIMNearbyChatListener::LLFloaterIMNearbyChatListener(LLFloaterIMNearbyChat & chatbar)
-  : LLEventAPI("LLChatBar",
-               "LLChatBar listener to (e.g.) sendChat, etc."),
-    mChatbar(chatbar)
+LLFloaterIMNearbyChatListener::LLFloaterIMNearbyChatListener() :
+    LLEventAPI("LLChatBar", "LLChatBar listener to (e.g.) sendChat, etc.")
 {
     add("sendChat",
         "Send chat to the simulator:\n"
@@ -49,10 +49,18 @@ LLFloaterIMNearbyChatListener::LLFloaterIMNearbyChatListener(LLFloaterIMNearbyCh
         &LLFloaterIMNearbyChatListener::sendChat);
 }
 
-
 // "sendChat" command
-void LLFloaterIMNearbyChatListener::sendChat(LLSD const & chat_data) const
+void LLFloaterIMNearbyChatListener::sendChat(LLSD const& chat_data)
 {
+    F64 cur_time = LLTimer::getElapsedSeconds();
+
+    if (cur_time < mLastThrottleTime + CHAT_THROTTLE_PERIOD)
+    {
+        LL_WARNS("LLFloaterIMNearbyChatListener") << "'sendChat' was  throttled" << LL_ENDL;
+        return;
+    }
+    mLastThrottleTime = cur_time;
+
     // Extract the data
     std::string chat_text = chat_data["message"].asString();
 
@@ -81,20 +89,12 @@ void LLFloaterIMNearbyChatListener::sendChat(LLSD const & chat_data) const
     }
 
     // Have to prepend /42 style channel numbers
-    std::string chat_to_send;
-    if (channel == 0)
-    {
-        chat_to_send = chat_text;
-    }
-    else
+    if (channel)
     {
-        chat_to_send += "/";
-        chat_to_send += chat_data["channel"].asString();
-        chat_to_send += " ";
-        chat_to_send += chat_text;
+        chat_text = stringize("/", chat_data["channel"].asString(), " ", chat_text);
     }
 
     // Send it as if it was typed in
-    mChatbar.sendChatFromViewer(chat_to_send, type_o_chat, ((bool)(channel == 0)) && gSavedSettings.getBOOL("PlayChatAnim"));
+    LLFloaterIMNearbyChat::sendChatFromViewer(chat_text, type_o_chat, (channel == 0) && gSavedSettings.getBOOL("PlayChatAnim"));
 }
 
diff --git a/indra/newview/llfloaterimnearbychatlistener.h b/indra/newview/llfloaterimnearbychatlistener.h
index 96184d95b3..71eba53a9a 100644
--- a/indra/newview/llfloaterimnearbychatlistener.h
+++ b/indra/newview/llfloaterimnearbychatlistener.h
@@ -38,12 +38,12 @@ class LLFloaterIMNearbyChat;
 class LLFloaterIMNearbyChatListener : public LLEventAPI
 {
 public:
-    LLFloaterIMNearbyChatListener(LLFloaterIMNearbyChat & chatbar);
+    LLFloaterIMNearbyChatListener();
 
 private:
-    void sendChat(LLSD const & chat_data) const;
+    void sendChat(LLSD const & chat_data);
 
-    LLFloaterIMNearbyChat & mChatbar;
+    F64 mLastThrottleTime{0};
 };
 
 #endif // LL_LLFLOATERIMNEARBYCHATLISTENER_H
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 655674357f..50e765c236 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -39,6 +39,7 @@
 #include "llchicletbar.h"
 #include "lldraghandle.h"
 #include "llemojidictionary.h"
+#include "llemojihelper.h"
 #include "llfloaterreg.h"
 #include "llfloateremojipicker.h"
 #include "llfloaterimsession.h"
@@ -300,6 +301,8 @@ bool LLFloaterIMSessionTab::postBuild()
 
     mEmojiPickerShowBtn = getChild<LLButton>("emoji_picker_show_btn");
     mEmojiPickerShowBtn->setClickedCallback([this](LLUICtrl*, const LLSD&) { onEmojiPickerShowBtnClicked(); });
+    mEmojiPickerShowBtn->setMouseDownCallback([this](LLUICtrl*, const LLSD&) { onEmojiPickerShowBtnDown(); });
+    mEmojiCloseConn = LLEmojiHelper::instance().setCloseCallback([this](LLUICtrl*, const LLSD&) { onEmojiPickerClosed(); });
 
     mGearBtn = getChild<LLButton>("gear_btn");
     mAddBtn = getChild<LLButton>("add_btn");
@@ -532,8 +535,43 @@ void LLFloaterIMSessionTab::onEmojiRecentPanelToggleBtnClicked()
 
 void LLFloaterIMSessionTab::onEmojiPickerShowBtnClicked()
 {
-    mInputEditor->setFocus(true);
-    mInputEditor->showEmojiHelper();
+    if (!mEmojiPickerShowBtn->getToggleState())
+    {
+        mInputEditor->hideEmojiHelper();
+        mInputEditor->setFocus(true);
+        mInputEditor->showEmojiHelper();
+        mEmojiPickerShowBtn->setToggleState(true); // in case hideEmojiHelper closed a visible instance
+    }
+    else
+    {
+        mInputEditor->hideEmojiHelper();
+        mEmojiPickerShowBtn->setToggleState(false);
+    }
+}
+
+void LLFloaterIMSessionTab::onEmojiPickerShowBtnDown()
+{
+    if (mEmojiHelperLastCallbackFrame == LLFrameTimer::getFrameCount())
+    {
+        // Helper gets closed by focus lost event on Down before before onEmojiPickerShowBtnDown
+        // triggers.
+        // If this condition is true, user pressed button and it was 'toggled' during press,
+        // restore 'toggled' state so that button will not reopen helper.
+        mEmojiPickerShowBtn->setToggleState(true);
+    }
+}
+
+void LLFloaterIMSessionTab::onEmojiPickerClosed()
+{
+    if (mEmojiPickerShowBtn->getToggleState())
+    {
+        mEmojiPickerShowBtn->setToggleState(false);
+        // Helper gets closed by focus lost event on Down before onEmojiPickerShowBtnDown
+        // triggers. If mEmojiHelperLastCallbackFrame is set and matches Down, means close
+        // was triggered by user's press.
+        // A bit hacky, but I can't think of a better way to handle this without rewriting helper.
+        mEmojiHelperLastCallbackFrame = LLFrameTimer::getFrameCount();
+    }
 }
 
 void LLFloaterIMSessionTab::initEmojiRecentPanel()
diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index 367d988f26..6d04d622e1 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -235,6 +235,8 @@ private:
 
     void onEmojiRecentPanelToggleBtnClicked();
     void onEmojiPickerShowBtnClicked();
+    void onEmojiPickerShowBtnDown();
+    void onEmojiPickerClosed();
     void initEmojiRecentPanel();
     void onEmojiRecentPanelFocusReceived();
     void onEmojiRecentPanelFocusLost();
@@ -249,6 +251,9 @@ private:
     S32 mInputEditorPad;
     S32 mChatLayoutPanelHeight;
     S32 mFloaterHeight;
+
+    boost::signals2::connection mEmojiCloseConn;
+    U32 mEmojiHelperLastCallbackFrame = { 0 };
 };
 
 
diff --git a/indra/newview/llfloaterslapptest.cpp b/indra/newview/llfloaterslapptest.cpp
new file mode 100644
index 0000000000..0075379529
--- /dev/null
+++ b/indra/newview/llfloaterslapptest.cpp
@@ -0,0 +1,51 @@
+/**
+ * @file llfloaterslapptest.cpp
+ *
+ * $LicenseInfo:firstyear=2025&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2025, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaterslapptest.h"
+#include "lluictrlfactory.h"
+
+#include "lllineeditor.h"
+#include "lltextbox.h"
+
+LLFloaterSLappTest::LLFloaterSLappTest(const LLSD& key)
+    :   LLFloater("floater_test_slapp")
+{
+}
+
+LLFloaterSLappTest::~LLFloaterSLappTest()
+{}
+
+bool LLFloaterSLappTest::postBuild()
+{
+    getChild<LLLineEditor>("remove_folder_id")->setKeystrokeCallback([this](LLLineEditor* editor, void*)
+        {
+            std::string slapp(getString("remove_folder_slapp"));
+            getChild<LLTextBox>("remove_folder_txt")->setValue(slapp + editor->getValue().asString());
+        }, NULL);
+
+    return true;
+}
diff --git a/indra/newview/llfloaterslapptest.h b/indra/newview/llfloaterslapptest.h
new file mode 100644
index 0000000000..ec727cb629
--- /dev/null
+++ b/indra/newview/llfloaterslapptest.h
@@ -0,0 +1,42 @@
+/**
+ * @file llfloaterslapptest.h
+ *
+ * $LicenseInfo:firstyear=2025&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2025, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLFLOATERSLAPPTEST_H
+#define LL_LLFLOATERSLAPPTEST_H
+
+#include "llfloater.h"
+
+class LLFloaterSLappTest:
+    public LLFloater
+{
+    friend class LLFloaterReg;
+    virtual bool postBuild() override;
+
+private:
+    LLFloaterSLappTest(const LLSD& key);
+    ~LLFloaterSLappTest();
+};
+
+#endif
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 68b9e758a1..faf7ed0d8c 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -60,12 +60,13 @@ LLPanelSnapshot* LLFloaterSnapshot::Impl::getActivePanel(LLFloaterSnapshotBase*
 {
     LLSideTrayPanelContainer* panel_container = floater->getChild<LLSideTrayPanelContainer>("panel_container");
     LLPanelSnapshot* active_panel = dynamic_cast<LLPanelSnapshot*>(panel_container->getCurrentPanel());
-    if (!active_panel)
-    {
-        LL_WARNS() << "No snapshot active panel, current panel index: " << panel_container->getCurrentPanelIndex() << LL_ENDL;
-    }
+
     if (!ok_if_not_found)
     {
+        if (!active_panel)
+        {
+            LL_WARNS() << "No snapshot active panel, current panel index: " << panel_container->getCurrentPanelIndex() << LL_ENDL;
+        }
         llassert_always(active_panel != NULL);
     }
     return active_panel;
@@ -516,34 +517,13 @@ void LLFloaterSnapshotBase::ImplBase::onClickFilter(LLUICtrl *ctrl, void* data)
 }
 
 // static
-void LLFloaterSnapshotBase::ImplBase::onClickUICheck(LLUICtrl *ctrl, void* data)
+void LLFloaterSnapshotBase::ImplBase::onClickDisplaySetting(LLUICtrl* ctrl, void* data)
 {
-    LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl;
-    gSavedSettings.setBOOL( "RenderUIInSnapshot", check->get() );
-
-    LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;
+    LLFloaterSnapshot* view = (LLFloaterSnapshot*)data;
     if (view)
     {
         LLSnapshotLivePreview* previewp = view->getPreviewView();
-        if(previewp)
-        {
-            previewp->updateSnapshot(true, true);
-        }
-        view->impl->updateControls(view);
-    }
-}
-
-// static
-void LLFloaterSnapshotBase::ImplBase::onClickHUDCheck(LLUICtrl *ctrl, void* data)
-{
-    LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl;
-    gSavedSettings.setBOOL( "RenderHUDInSnapshot", check->get() );
-
-    LLFloaterSnapshot *view = (LLFloaterSnapshot *)data;
-    if (view)
-    {
-        LLSnapshotLivePreview* previewp = view->getPreviewView();
-        if(previewp)
+        if (previewp)
         {
             previewp->updateSnapshot(true, true);
         }
@@ -1002,11 +982,9 @@ bool LLFloaterSnapshot::postBuild()
     mSucceessLblPanel = getChild<LLUICtrl>("succeeded_panel");
     mFailureLblPanel = getChild<LLUICtrl>("failed_panel");
 
-    childSetCommitCallback("ui_check", ImplBase::onClickUICheck, this);
-    getChild<LLUICtrl>("ui_check")->setValue(gSavedSettings.getBOOL("RenderUIInSnapshot"));
-
-    childSetCommitCallback("hud_check", ImplBase::onClickHUDCheck, this);
-    getChild<LLUICtrl>("hud_check")->setValue(gSavedSettings.getBOOL("RenderHUDInSnapshot"));
+    childSetCommitCallback("ui_check", ImplBase::onClickDisplaySetting, this);
+    childSetCommitCallback("balance_check", ImplBase::onClickDisplaySetting, this);
+    childSetCommitCallback("hud_check", ImplBase::onClickDisplaySetting, this);
 
     ((Impl*)impl)->setAspectRatioCheckboxValue(this, gSavedSettings.getBOOL("KeepAspectForSnapshot"));
 
diff --git a/indra/newview/llfloatersnapshot.h b/indra/newview/llfloatersnapshot.h
index 6df851b839..186d9c41cf 100644
--- a/indra/newview/llfloatersnapshot.h
+++ b/indra/newview/llfloatersnapshot.h
@@ -103,8 +103,7 @@ public:
     static void onClickAutoSnap(LLUICtrl *ctrl, void* data);
     static void onClickNoPost(LLUICtrl *ctrl, void* data);
     static void onClickFilter(LLUICtrl *ctrl, void* data);
-    static void onClickUICheck(LLUICtrl *ctrl, void* data);
-    static void onClickHUDCheck(LLUICtrl *ctrl, void* data);
+    static void onClickDisplaySetting(LLUICtrl *ctrl, void* data);
     static void onCommitFreezeFrame(LLUICtrl* ctrl, void* data);
 
     virtual LLPanelSnapshot* getActivePanel(LLFloaterSnapshotBase* floater, bool ok_if_not_found = true) = 0;
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 30ed723db6..a798ba31ee 100755
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -486,8 +486,11 @@ void LLFloaterWorldMap::onOpen(const LLSD& key)
         const LLUUID landmark_folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK);
         LLInventoryModelBackgroundFetch::instance().start(landmark_folder_id);
 
-        mLocationEditor->setFocus( true);
-        gFocusMgr.triggerFocusFlash();
+        if (hasFocus())
+        {
+            mLocationEditor->setFocus( true);
+            gFocusMgr.triggerFocusFlash();
+        }
 
         buildAvatarIDList();
         buildLandmarkIDLists();
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index ba9c9fa13f..34d96aa024 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -46,7 +46,7 @@
 //
 // Globals
 //
-static GroupChatListener sGroupChatListener;
+static LLGroupChatListener sGroupChatListener;
 
 class LLGroupHandler : public LLCommandHandler
 {
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 479b7c19ac..5bd17d4d5b 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -104,7 +104,6 @@ static bool check_item(const LLUUID& item_id,
                        LLInventoryFilter* filter);
 
 // Helper functions
-
 bool isAddAction(const std::string& action)
 {
     return ("wear" == action || "attach" == action || "activate" == action);
@@ -2697,7 +2696,12 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
         U32 max_items_to_wear = gSavedSettings.getU32("WearFolderLimit");
         if (is_movable && move_is_into_outfit)
         {
-            if (mUUID == my_outifts_id)
+            if ((inv_cat->getPreferredType() != LLFolderType::FT_NONE) && (inv_cat->getPreferredType() != LLFolderType::FT_OUTFIT))
+            {
+                tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");
+                is_movable = false;
+            }
+            else if (mUUID == my_outifts_id)
             {
                 if (source != LLToolDragAndDrop::SOURCE_AGENT || move_is_from_marketplacelistings)
                 {
@@ -2714,13 +2718,39 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
                     is_movable = false;
                 }
             }
-            else if(getCategory() && getCategory()->getPreferredType() == LLFolderType::FT_NONE)
+            else if (!getCategory())
             {
-                is_movable = ((inv_cat->getPreferredType() == LLFolderType::FT_NONE) || (inv_cat->getPreferredType() == LLFolderType::FT_OUTFIT));
+                is_movable = false;
+                tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");
             }
             else
             {
-                is_movable = false;
+                EMyOutfitsSubfolderType dest_res = myoutfit_object_subfolder_type(model, mUUID, my_outifts_id);
+                EMyOutfitsSubfolderType inv_res = myoutfit_object_subfolder_type(model, cat_id, my_outifts_id);
+                if ((dest_res == MY_OUTFITS_OUTFIT || dest_res == MY_OUTFITS_SUBOUTFIT) && inv_res == MY_OUTFITS_OUTFIT)
+                {
+                    is_movable = false;
+                    tooltip_msg = LLTrans::getString("TooltipCantMoveOutfitIntoOutfit");
+                }
+                else if ((dest_res == MY_OUTFITS_OUTFIT || dest_res == MY_OUTFITS_SUBOUTFIT) && inv_res == MY_OUTFITS_SUBFOLDER)
+                {
+                    is_movable = false;
+                    tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");
+                }
+                else if (dest_res == MY_OUTFITS_SUBFOLDER && inv_res == MY_OUTFITS_SUBOUTFIT)
+                {
+                    is_movable = false;
+                    tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");
+                }
+                else if (can_move_to_my_outfits(model, inv_cat, max_items_to_wear))
+                {
+                    is_movable = true;
+                }
+                else
+                {
+                    is_movable = false;
+                    tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");
+                }
             }
         }
         if (is_movable && move_is_into_current_outfit && is_link)
@@ -2912,9 +2942,77 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 
             if (mUUID == my_outifts_id)
             {
-                // Category can contains objects,
-                // create a new folder and populate it with links to original objects
-                dropToMyOutfits(inv_cat, cb);
+                EMyOutfitsSubfolderType inv_res = myoutfit_object_subfolder_type(model, cat_id, my_outifts_id);
+                if (inv_res == MY_OUTFITS_SUBFOLDER || inv_res == MY_OUTFITS_OUTFIT)
+                {
+                    LLInvFVBridge::changeCategoryParent(
+                        model,
+                        (LLViewerInventoryCategory*)inv_cat,
+                        mUUID,
+                        false);
+                    if (cb) cb->fire(inv_cat->getUUID());
+                }
+                else
+                {
+                    // Moving from inventory
+                    // create a new folder and populate it with links to original objects
+                    dropToMyOutfits(inv_cat, cb);
+                }
+            }
+            else if (move_is_into_my_outfits)
+            {
+                EMyOutfitsSubfolderType dest_res = myoutfit_object_subfolder_type(model, mUUID, my_outifts_id);
+                EMyOutfitsSubfolderType inv_res = myoutfit_object_subfolder_type(model, cat_id, my_outifts_id);
+                switch (inv_res)
+                {
+                case MY_OUTFITS_NO:
+                    // Moning from outside outfits into outfits
+                    if (dest_res == MY_OUTFITS_SUBFOLDER)
+                    {
+                        // turn it into outfit
+                        dropToMyOutfitsSubfolder(inv_cat, mUUID, LLFolderType::FT_OUTFIT, cb);
+                    }
+                    else
+                    {
+                        // or link it?
+                        dropToMyOutfitsSubfolder(inv_cat, mUUID, LLFolderType::FT_NONE, cb);
+                    }
+                    break;
+                case MY_OUTFITS_SUBFOLDER:
+                case MY_OUTFITS_OUTFIT:
+                    // only permit moving subfodlers and outfits into other subfolders
+                    if (dest_res == MY_OUTFITS_SUBFOLDER)
+                    {
+                        LLInvFVBridge::changeCategoryParent(
+                            model,
+                            (LLViewerInventoryCategory*)inv_cat,
+                            mUUID,
+                            false);
+                        if (cb) cb->fire(inv_cat->getUUID());
+                    }
+                    else
+                    {
+                        assert(false); // mot permitted, shouldn't have accepted
+                    }
+                    break;
+                case MY_OUTFITS_SUBOUTFIT:
+                    if (dest_res == MY_OUTFITS_SUBOUTFIT || dest_res == MY_OUTFITS_OUTFIT)
+                    {
+                        LLInvFVBridge::changeCategoryParent(
+                            model,
+                            (LLViewerInventoryCategory*)inv_cat,
+                            mUUID,
+                            false);
+                        if (cb) cb->fire(inv_cat->getUUID());
+                    }
+                    else
+                    {
+                        assert(false); // mot permitted, shouldn't have accepted
+                    }
+                    break;
+                default:
+                    break;
+                }
             }
             // if target is current outfit folder we use link
             else if (move_is_into_current_outfit &&
@@ -3599,6 +3697,13 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
         const LLUUID &marketplacelistings_id = model->findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS);
         move_folder_to_marketplacelistings(cat, marketplacelistings_id, ("move_to_marketplace_listings" != action), (("copy_or_move_to_marketplace_listings" == action)));
     }
+    else if ("copy_folder_uuid" == action)
+    {
+        LLInventoryCategory* cat = gInventory.getCategory(mUUID);
+        if (!cat) return;
+        gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(mUUID.asString()));
+        return;
+    }
 }
 
 void LLFolderBridge::gatherMessage(std::string& message, S32 depth, LLError::ELevel log_level)
@@ -4001,6 +4106,7 @@ void LLFolderBridge::perform_pasteFromClipboard()
                 {
                     if (!move_is_into_my_outfits && item && can_move_to_outfit(item, move_is_into_current_outfit))
                     {
+                        // todo: this is going to create dupplicate folders?
                         dropToOutfit(item, move_is_into_current_outfit, cb);
                     }
                     else if (move_is_into_my_outfits && LLAssetType::AT_CATEGORY == obj->getType())
@@ -4009,7 +4115,23 @@ void LLFolderBridge::perform_pasteFromClipboard()
                         U32 max_items_to_wear = gSavedSettings.getU32("WearFolderLimit");
                         if (cat && can_move_to_my_outfits(model, cat, max_items_to_wear))
                         {
-                            dropToMyOutfits(cat, cb);
+                            if (mUUID == my_outifts_id)
+                            {
+                                dropToMyOutfits(cat, cb);
+                            }
+                            else if (move_is_into_my_outfits)
+                            {
+                                EMyOutfitsSubfolderType res = myoutfit_object_subfolder_type(model, mUUID, my_outifts_id);
+                                if (res == MY_OUTFITS_SUBFOLDER)
+                                {
+                                    // turn it into outfit
+                                    dropToMyOutfitsSubfolder(cat, mUUID, LLFolderType::FT_OUTFIT, cb);
+                                }
+                                else
+                                {
+                                    dropToMyOutfitsSubfolder(cat, mUUID, LLFolderType::FT_NONE, cb);
+                                }
+                            }
                         }
                         else
                         {
@@ -4249,6 +4371,7 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
 
     if (outfits_id == mUUID)
     {
+        items.push_back(std::string("New Outfit Folder"));
         items.push_back(std::string("New Outfit"));
     }
 
@@ -4342,63 +4465,85 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
     else if(isAgentInventory()) // do not allow creating in library
     {
         LLViewerInventoryCategory *cat = getCategory();
-        // BAP removed protected check to re-enable standard ops in untyped folders.
-        // Not sure what the right thing is to do here.
-        if (!isCOFFolder() && cat && (cat->getPreferredType() != LLFolderType::FT_OUTFIT))
-        {
-            if (!isInboxFolder() // don't allow creation in inbox
-                && outfits_id != mUUID)
-            {
-                bool menu_items_added = false;
-                // Do not allow to create 2-level subfolder in the Calling Card/Friends folder. EXT-694.
-                if (!LLFriendCardsManager::instance().isCategoryInFriendFolder(cat))
-                {
-                    items.push_back(std::string("New Folder"));
-                    menu_items_added = true;
-                }
-                if (!isMarketplaceListingsFolder())
-                {
-                    items.push_back(std::string("upload_def"));
-                    items.push_back(std::string("create_new"));
-                    items.push_back(std::string("New Script"));
-                    items.push_back(std::string("New Note"));
-                    items.push_back(std::string("New Gesture"));
-                    items.push_back(std::string("New Material"));
-                    items.push_back(std::string("New Clothes"));
-                    items.push_back(std::string("New Body Parts"));
-                    items.push_back(std::string("New Settings"));
-                    if (!LLEnvironment::instance().isInventoryEnabled())
-                    {
-                        disabled_items.push_back("New Settings");
-                    }
-                }
-                else
-                {
-                    items.push_back(std::string("New Listing Folder"));
-                }
-                if (menu_items_added)
-                {
-                    items.push_back(std::string("Create Separator"));
-                }
-            }
-            getClipboardEntries(false, items, disabled_items, flags);
-        }
-        else
+
+        if (cat)
         {
-            // Want some but not all of the items from getClipboardEntries for outfits.
-            if (cat && (cat->getPreferredType() == LLFolderType::FT_OUTFIT))
+            if (cat->getPreferredType() == LLFolderType::FT_OUTFIT)
             {
+                // Want some but not all of the items from getClipboardEntries for outfits.
+                items.push_back(std::string("New Outfit Folder"));
                 items.push_back(std::string("Rename"));
                 items.push_back(std::string("thumbnail"));
 
                 addDeleteContextMenuOptions(items, disabled_items);
                 // EXT-4030: disallow deletion of currently worn outfit
-                const LLViewerInventoryItem *base_outfit_link = LLAppearanceMgr::instance().getBaseOutfitLink();
+                const LLViewerInventoryItem* base_outfit_link = LLAppearanceMgr::instance().getBaseOutfitLink();
                 if (base_outfit_link && (cat == base_outfit_link->getLinkedCategory()))
                 {
                     disabled_items.push_back(std::string("Delete"));
                 }
             }
+            else if (outfits_id == mUUID)
+            {
+                getClipboardEntries(false, items, disabled_items, flags);
+            }
+            else if (!isCOFFolder())
+            {
+                EMyOutfitsSubfolderType in_my_outfits = myoutfit_object_subfolder_type(model, mUUID, outfits_id);
+                if (in_my_outfits != MY_OUTFITS_NO)
+                {
+                    if (in_my_outfits == MY_OUTFITS_SUBFOLDER)
+                    {
+                        // Not inside an outfit, but inside 'my outfits'
+                        items.push_back(std::string("New Outfit"));
+                    }
+
+                    items.push_back(std::string("New Outfit Folder"));
+                    items.push_back(std::string("Rename"));
+                    items.push_back(std::string("thumbnail"));
+
+                    addDeleteContextMenuOptions(items, disabled_items);
+                }
+                else
+                {
+                    if (!isInboxFolder() // don't allow creation in inbox
+                        && outfits_id != mUUID)
+                    {
+                        bool menu_items_added = false;
+                        // Do not allow to create 2-level subfolder in the Calling Card/Friends folder. EXT-694.
+                        if (!LLFriendCardsManager::instance().isCategoryInFriendFolder(cat))
+                        {
+                            items.push_back(std::string("New Folder"));
+                            menu_items_added = true;
+                        }
+                        if (!isMarketplaceListingsFolder())
+                        {
+                            items.push_back(std::string("upload_def"));
+                            items.push_back(std::string("create_new"));
+                            items.push_back(std::string("New Script"));
+                            items.push_back(std::string("New Note"));
+                            items.push_back(std::string("New Gesture"));
+                            items.push_back(std::string("New Material"));
+                            items.push_back(std::string("New Clothes"));
+                            items.push_back(std::string("New Body Parts"));
+                            items.push_back(std::string("New Settings"));
+                            if (!LLEnvironment::instance().isInventoryEnabled())
+                            {
+                                disabled_items.push_back("New Settings");
+                            }
+                        }
+                        else
+                        {
+                            items.push_back(std::string("New Listing Folder"));
+                        }
+                        if (menu_items_added)
+                        {
+                            items.push_back(std::string("Create Separator"));
+                        }
+                    }
+                    getClipboardEntries(false, items, disabled_items, flags);
+                }
+            }
         }
 
         if (model->findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT) == mUUID)
@@ -4466,6 +4611,14 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
     {
         disabled_items.push_back(std::string("Delete System Folder"));
     }
+    else
+    {
+        static LLCachedControl<bool> show_copy_id(gSavedSettings, "InventoryExposeFolderID", false);
+        if (show_copy_id())
+        {
+            items.push_back(std::string("Copy UUID"));
+        }
+    }
 
     if (isAgentInventory() && !isMarketplaceListingsFolder())
     {
@@ -4543,7 +4696,11 @@ void LLFolderBridge::buildContextMenuFolderOptions(U32 flags,   menuentry_vec_t&
 
         if (((flags & ITEM_IN_MULTI_SELECTION) == 0) && hasChildren() && (type != LLFolderType::FT_OUTFIT))
         {
-            items.push_back(std::string("Ungroup folder items"));
+            const LLUUID my_outfits = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
+            if (!gInventory.isObjectDescendentOf(mUUID, my_outfits))
+            {
+                items.push_back(std::string("Ungroup folder items"));
+            }
         }
     }
     else
@@ -5316,13 +5473,24 @@ void LLFolderBridge::dropToMyOutfits(LLInventoryCategory* inv_cat, LLPointer<LLI
     // Note: creation will take time, so passing folder id to callback is slightly unreliable,
     // but so is collecting and passing descendants' ids
     inventory_func_type func = boost::bind(outfitFolderCreatedCallback, inv_cat->getUUID(), _1, cb, mInventoryPanel);
-    gInventory.createNewCategory(dest_id,
+    getInventoryModel()->createNewCategory(dest_id,
                                  LLFolderType::FT_OUTFIT,
                                  inv_cat->getName(),
                                  func,
                                  inv_cat->getThumbnailUUID());
 }
 
+void LLFolderBridge::dropToMyOutfitsSubfolder(LLInventoryCategory* inv_cat, const LLUUID& dest_id, LLFolderType::EType preferred_type, LLPointer<LLInventoryCallback> cb)
+{
+    const LLUUID outfits_id = getInventoryModel()->findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
+    inventory_func_type func = boost::bind(outfitFolderCreatedCallback, inv_cat->getUUID(), _1, cb, mInventoryPanel);
+    getInventoryModel()->createNewCategory(dest_id,
+        preferred_type,
+        inv_cat->getName(),
+        func,
+        inv_cat->getThumbnailUUID());
+}
+
 void LLFolderBridge::outfitFolderCreatedCallback(LLUUID cat_source_id,
                                                  LLUUID cat_dest_id,
                                                  LLPointer<LLInventoryCallback> cb,
@@ -5496,7 +5664,9 @@ bool LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
         }
         else if (user_confirm && (move_is_into_current_outfit || move_is_into_outfit))
         {
-            accept = can_move_to_outfit(inv_item, move_is_into_current_outfit);
+            EMyOutfitsSubfolderType res = myoutfit_object_subfolder_type(model, mUUID, my_outifts_id);
+            // don't allow items in my outfits' subfodlers, only in outfits and outfit's subfolders
+            accept = res != MY_OUTFITS_SUBFOLDER && can_move_to_outfit(inv_item, move_is_into_current_outfit);
         }
         else if (user_confirm && (move_is_into_favorites || move_is_into_landmarks))
         {
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 3e7f74384b..a101c7368a 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -369,6 +369,7 @@ protected:
     void dropToFavorites(LLInventoryItem* inv_item, LLPointer<LLInventoryCallback> cb = NULL);
     void dropToOutfit(LLInventoryItem* inv_item, bool move_is_into_current_outfit, LLPointer<LLInventoryCallback> cb = NULL);
     void dropToMyOutfits(LLInventoryCategory* inv_cat, LLPointer<LLInventoryCallback> cb = NULL);
+    void dropToMyOutfitsSubfolder(LLInventoryCategory* inv_cat, const LLUUID& dest, LLFolderType::EType preferred_type, LLPointer<LLInventoryCallback> cb = NULL);
 
     //--------------------------------------------------------------------
     // Messy hacks for handling folder options
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 1ccefa3212..7fff88fba7 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -2493,6 +2493,40 @@ bool can_share_item(const LLUUID& item_id)
 
     return can_share;
 }
+
+EMyOutfitsSubfolderType myoutfit_object_subfolder_type(
+    LLInventoryModel* model,
+    const LLUUID& obj_id,
+    const LLUUID& my_outfits_id)
+{
+    if (obj_id == my_outfits_id) return MY_OUTFITS_NO;
+
+    const LLViewerInventoryCategory* test_cat = model->getCategory(obj_id);
+    if (test_cat->getPreferredType() == LLFolderType::FT_OUTFIT)
+    {
+        return MY_OUTFITS_OUTFIT;
+    }
+    while (test_cat)
+    {
+        if (test_cat->getPreferredType() == LLFolderType::FT_OUTFIT)
+        {
+            return MY_OUTFITS_SUBOUTFIT;
+        }
+
+        const LLUUID& parent_id = test_cat->getParentUUID();
+        if (parent_id.isNull())
+        {
+            return MY_OUTFITS_NO;
+        }
+        if (parent_id == my_outfits_id)
+        {
+            return MY_OUTFITS_SUBFOLDER;
+        }
+        test_cat = model->getCategory(parent_id);
+    }
+
+    return MY_OUTFITS_NO;
+}
 ///----------------------------------------------------------------------------
 /// LLMarketplaceValidator implementations
 ///----------------------------------------------------------------------------
@@ -2621,6 +2655,11 @@ bool LLInventoryCollectFunctor::itemTransferCommonlyAllowed(const LLInventoryIte
     return false;
 }
 
+bool LLIsFolderType::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
+{
+    return cat && cat->getPreferredType() == mType;
+}
+
 bool LLIsType::operator()(LLInventoryCategory* cat, LLInventoryItem* item)
 {
     if(mType == LLAssetType::AT_CATEGORY)
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index 13a64f21dc..0ab045f2a0 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -121,6 +121,18 @@ std::string get_searchable_creator_name(LLInventoryModel* model, const LLUUID& i
 std::string get_searchable_UUID(LLInventoryModel* model, const LLUUID& item_id);
 bool can_share_item(const LLUUID& item_id);
 
+enum EMyOutfitsSubfolderType
+{
+    MY_OUTFITS_NO,
+    MY_OUTFITS_SUBFOLDER,
+    MY_OUTFITS_OUTFIT,
+    MY_OUTFITS_SUBOUTFIT,
+};
+EMyOutfitsSubfolderType myoutfit_object_subfolder_type(
+    LLInventoryModel* model,
+    const LLUUID& obj_id,
+    const LLUUID& my_outfits_id);
+
 /**                    Miscellaneous global functions
  **                                                                            **
  *******************************************************************************/
@@ -234,6 +246,24 @@ protected:
 // the type is the type passed in during construction.
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+class LLIsFolderType : public LLInventoryCollectFunctor
+{
+public:
+    LLIsFolderType(LLFolderType::EType type) : mType(type) {}
+    virtual ~LLIsFolderType() {}
+    virtual bool operator()(LLInventoryCategory* cat,
+        LLInventoryItem* item);
+protected:
+    LLFolderType::EType mType;
+};
+
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// Class LLIsType
+//
+// Implementation of a LLInventoryCollectFunctor which returns true if
+// the type is the type passed in during construction.
+//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 class LLIsType : public LLInventoryCollectFunctor
 {
 public:
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index c4f93cee98..713d87787e 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -60,10 +60,12 @@ static LLPanelInjector<LLInventoryGallery> t_inventory_gallery("inventory_galler
 const S32 GALLERY_ITEMS_PER_ROW_MIN = 2;
 const S32 FAST_LOAD_THUMBNAIL_TRSHOLD = 50; // load folders below this value immediately
 
+
 // Helper dnd functions
 bool dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat, bool drop, std::string& tooltip_msg, bool is_link);
 bool dragItemIntoFolder(LLUUID folder_id, LLInventoryItem* inv_item, bool drop, std::string& tooltip_msg, bool user_confirm);
 void dropToMyOutfits(LLInventoryCategory* inv_cat);
+void dropToMyOutfitsSubfolder(LLInventoryCategory* inv_cat, const LLUUID& dest_id, LLFolderType::EType preferred_type);
 
 class LLGalleryPanel: public LLPanel
 {
@@ -3745,7 +3747,12 @@ bool dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat,
         U32 max_items_to_wear = gSavedSettings.getU32("WearFolderLimit");
         if (is_movable && move_is_into_outfit)
         {
-            if (dest_id == my_outifts_id)
+            if ((inv_cat->getPreferredType() != LLFolderType::FT_NONE) && (inv_cat->getPreferredType() != LLFolderType::FT_OUTFIT))
+            {
+                tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");
+                is_movable = false;
+            }
+            else if (dest_id == my_outifts_id)
             {
                 if (source != LLToolDragAndDrop::SOURCE_AGENT || move_is_from_marketplacelistings)
                 {
@@ -3762,13 +3769,39 @@ bool dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat,
                     is_movable = false;
                 }
             }
-            else if (dest_cat && dest_cat->getPreferredType() == LLFolderType::FT_NONE)
+            else if (!dest_cat)
             {
-                is_movable = ((inv_cat->getPreferredType() == LLFolderType::FT_NONE) || (inv_cat->getPreferredType() == LLFolderType::FT_OUTFIT));
+                is_movable = false;
+                tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");
             }
             else
             {
-                is_movable = false;
+                EMyOutfitsSubfolderType dest_res = myoutfit_object_subfolder_type(model, dest_id, my_outifts_id);
+                EMyOutfitsSubfolderType inv_res = myoutfit_object_subfolder_type(model, cat_id, my_outifts_id);
+                if ((dest_res == MY_OUTFITS_OUTFIT || dest_res == MY_OUTFITS_SUBOUTFIT) && inv_res == MY_OUTFITS_OUTFIT)
+                {
+                    is_movable = false;
+                    tooltip_msg = LLTrans::getString("TooltipCantMoveOutfitIntoOutfit");
+                }
+                else if ((dest_res == MY_OUTFITS_OUTFIT || dest_res == MY_OUTFITS_SUBOUTFIT) && inv_res == MY_OUTFITS_SUBFOLDER)
+                {
+                    is_movable = false;
+                    tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");
+                }
+                else if (dest_res == MY_OUTFITS_SUBFOLDER && inv_res == MY_OUTFITS_SUBOUTFIT)
+                {
+                    is_movable = false;
+                    tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");
+                }
+                else if (can_move_to_my_outfits(model, inv_cat, max_items_to_wear))
+                {
+                    is_movable = true;
+                }
+                else
+                {
+                    is_movable = false;
+                    tooltip_msg = LLTrans::getString("TooltipCantCreateOutfit");
+                }
             }
         }
         if (is_movable && move_is_into_current_outfit && is_link)
@@ -3894,9 +3927,70 @@ bool dragCategoryIntoFolder(LLUUID dest_id, LLInventoryCategory* inv_cat,
 
             if (dest_id == my_outifts_id)
             {
-                // Category can contains objects,
-                // create a new folder and populate it with links to original objects
-                dropToMyOutfits(inv_cat);
+                EMyOutfitsSubfolderType inv_res = myoutfit_object_subfolder_type(model, cat_id, my_outifts_id);
+                if (inv_res == MY_OUTFITS_SUBFOLDER || inv_res == MY_OUTFITS_OUTFIT)
+                {
+                    gInventory.changeCategoryParent(
+                        (LLViewerInventoryCategory*)inv_cat,
+                        dest_id,
+                        move_is_into_trash);
+                }
+                else
+                {
+                    // Category can contains objects,
+                    // create a new folder and populate it with links to original objects
+                    dropToMyOutfits(inv_cat);
+                }
+            }
+            else if (move_is_into_my_outfits)
+            {
+                EMyOutfitsSubfolderType dest_res = myoutfit_object_subfolder_type(model, dest_id, my_outifts_id);
+                EMyOutfitsSubfolderType inv_res = myoutfit_object_subfolder_type(model, cat_id, my_outifts_id);
+                switch (inv_res)
+                {
+                case MY_OUTFITS_NO:
+                    // Moning from outside outfits into outfits
+                    if (dest_res == MY_OUTFITS_SUBFOLDER)
+                    {
+                        // turn it into outfit
+                        dropToMyOutfitsSubfolder(inv_cat, dest_id, LLFolderType::FT_OUTFIT);
+                    }
+                    else
+                    {
+                        dropToMyOutfitsSubfolder(inv_cat, dest_id, LLFolderType::FT_NONE);
+                    }
+                    break;
+                case MY_OUTFITS_SUBFOLDER:
+                case MY_OUTFITS_OUTFIT:
+                    // only permit moving subfodlers and outfits into other subfolders
+                    if (dest_res == MY_OUTFITS_SUBFOLDER)
+                    {
+                        gInventory.changeCategoryParent(
+                            (LLViewerInventoryCategory*)inv_cat,
+                            dest_id,
+                            move_is_into_trash);
+                    }
+                    else
+                    {
+                        assert(false); // mot permitted, shouldn't have accepted
+                    }
+                    break;
+                case MY_OUTFITS_SUBOUTFIT:
+                    if (dest_res == MY_OUTFITS_SUBOUTFIT || dest_res == MY_OUTFITS_OUTFIT)
+                    {
+                        gInventory.changeCategoryParent(
+                            (LLViewerInventoryCategory*)inv_cat,
+                            dest_id,
+                            move_is_into_trash);
+                    }
+                    else
+                    {
+                        assert(false); // mot permitted, shouldn't have accepted
+                    }
+                    break;
+                default:
+                    break;
+                }
             }
             // if target is current outfit folder we use link
             else if (move_is_into_current_outfit &&
@@ -4041,3 +4135,11 @@ void dropToMyOutfits(LLInventoryCategory* inv_cat)
     inventory_func_type func = boost::bind(&outfitFolderCreatedCallback, inv_cat->getUUID(), _1);
     gInventory.createNewCategory(dest_id, LLFolderType::FT_OUTFIT, inv_cat->getName(), func, inv_cat->getThumbnailUUID());
 }
+
+void dropToMyOutfitsSubfolder(LLInventoryCategory* inv_cat, const LLUUID &dest_id, LLFolderType::EType preferred_type)
+{
+    // Note: creation will take time, so passing folder id to callback is slightly unreliable,
+    // but so is collecting and passing descendants' ids
+    inventory_func_type func = boost::bind(&outfitFolderCreatedCallback, inv_cat->getUUID(), _1);
+    gInventory.createNewCategory(dest_id, preferred_type, inv_cat->getName(), func, inv_cat->getThumbnailUUID());
+}
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index dbf4821ca1..7acd3b90a2 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -586,7 +586,9 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
     bool is_trash = (selected_id == gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH));
     bool is_in_trash = gInventory.isObjectDescendentOf(selected_id, gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH));
     bool is_lost_and_found = (selected_id == gInventory.findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND));
-    bool is_outfits= (selected_id == gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS));
+    const LLUUID my_outfits = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
+    bool is_outfits= (selected_id == my_outfits);
+    bool is_in_outfits = is_outfits || gInventory.isObjectDescendentOf(selected_id, my_outfits);
     bool is_in_favorites = gInventory.isObjectDescendentOf(selected_id, gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE));
     //bool is_favorites= (selected_id == gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE));
 
@@ -725,7 +727,7 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
     }
     else
     {
-        if (is_agent_inventory && !is_inbox && !is_cof && !is_in_favorites && !is_outfits)
+        if (is_agent_inventory && !is_inbox && !is_cof && !is_in_favorites && !is_outfits && !is_in_outfits)
         {
             LLViewerInventoryCategory* category = gInventory.getCategory(selected_id);
             if (!category || !LLFriendCardsManager::instance().isCategoryInFriendFolder(category))
@@ -769,15 +771,26 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
                 items.push_back(std::string("upload_def"));
             }
 
-            if(is_outfits && !isRootFolder())
+            if(is_outfits)
             {
-                items.push_back(std::string("New Outfit"));
+                EMyOutfitsSubfolderType res = myoutfit_object_subfolder_type(&gInventory, selected_id, my_outfits);
+                if (res != MY_OUTFITS_OUTFIT && res != MY_OUTFITS_SUBOUTFIT)
+                {
+                    items.push_back(std::string("New Outfit"));
+                }
+                items.push_back(std::string("New Outfit Folder"));
+                items.push_back(std::string("Delete"));
+                items.push_back(std::string("Rename"));
+                if (!get_is_category_and_children_removable(&gInventory, selected_id, false))
+                {
+                    disabled_items.push_back(std::string("Delete"));
+                }
             }
 
             items.push_back(std::string("Subfolder Separator"));
-            if (!is_system_folder && !isRootFolder())
+            if (!is_system_folder && !isRootFolder() && !is_outfits)
             {
-                if(has_children && (folder_type != LLFolderType::FT_OUTFIT))
+                if(has_children && (folder_type != LLFolderType::FT_OUTFIT) && !is_in_outfits)
                 {
                     items.push_back(std::string("Ungroup folder items"));
                 }
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 9fffe6378e..0a2d938bd0 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1007,7 +1007,8 @@ void LLInventoryModel::createNewCategory(const LLUUID& parent_id,
         return;
     }
 
-    if (preferred_type != LLFolderType::FT_NONE)
+    if (preferred_type != LLFolderType::FT_NONE
+        && preferred_type != LLFolderType::FT_OUTFIT)
     {
         // Ultimately this should only be done for non-singleton
         // types. Requires back-end changes to guarantee that others
@@ -3525,7 +3526,7 @@ bool LLInventoryModel::saveToFile(const std::string& filename,
 
         fileXML.close();
 
-        LL_INFOS(LOG_INV) << "Inventory saved: " << cat_count << " categories, " << it_count << " items." << LL_ENDL;
+        LL_INFOS(LOG_INV) << "Inventory saved: " << (S32)cat_count << " categories, " << (S32)it_count << " items." << LL_ENDL;
     }
     catch (...)
     {
diff --git a/indra/newview/lllocalbitmaps.cpp b/indra/newview/lllocalbitmaps.cpp
index dbddf8e72a..a99c9df0ff 100644
--- a/indra/newview/lllocalbitmaps.cpp
+++ b/indra/newview/lllocalbitmaps.cpp
@@ -38,6 +38,7 @@
 /* image compression headers. */
 #include "llimagebmp.h"
 #include "llimagetga.h"
+#include "llimagej2c.h"
 #include "llimagejpeg.h"
 #include "llimagepng.h"
 
@@ -106,6 +107,10 @@ LLLocalBitmap::LLLocalBitmap(std::string filename)
     {
         mExtension = ET_IMG_JPG;
     }
+    else if (temp_exten == "j2c" || temp_exten == "jp2")
+    {
+        mExtension = ET_IMG_J2C;
+    }
     else if (temp_exten == "png")
     {
         mExtension = ET_IMG_PNG;
@@ -293,8 +298,9 @@ void LLLocalBitmap::addGLTFMaterial(LLGLTFMaterial* mat)
         return;
     }
 
-    mat_list_t::iterator end = mGLTFMaterialWithLocalTextures.end();
-    for (mat_list_t::iterator it = mGLTFMaterialWithLocalTextures.begin(); it != end;)
+    mat->addLocalTextureTracking(getTrackingID(), getWorldID());
+
+    for (mat_list_t::iterator it = mGLTFMaterialWithLocalTextures.begin(); it != mGLTFMaterialWithLocalTextures.end();)
     {
         if (it->get() == mat)
         {
@@ -304,15 +310,12 @@ void LLLocalBitmap::addGLTFMaterial(LLGLTFMaterial* mat)
         if ((*it)->getNumRefs() == 1)
         {
             it = mGLTFMaterialWithLocalTextures.erase(it);
-            end = mGLTFMaterialWithLocalTextures.end();
         }
         else
         {
             it++;
         }
     }
-
-    mat->addLocalTextureTracking(getTrackingID(), getWorldID());
     mGLTFMaterialWithLocalTextures.push_back(mat);
 }
 
@@ -356,6 +359,21 @@ bool LLLocalBitmap::decodeBitmap(LLPointer<LLImageRaw> rawimg)
             break;
         }
 
+        case ET_IMG_J2C:
+        {
+            LLPointer<LLImageJ2C> jpeg_image = new LLImageJ2C;
+            if (jpeg_image->load(mFilename))
+            {
+                jpeg_image->setDiscardLevel(0);
+                if (jpeg_image->decode(rawimg, 0.0f))
+                {
+                    rawimg->biasedScaleToPowerOfTwo(LLViewerFetchedTexture::MAX_IMAGE_SIZE_DEFAULT);
+                    decode_successful = true;
+                }
+            }
+            break;
+        }
+
         case ET_IMG_PNG:
         {
             LLPointer<LLImagePNG> png_image = new LLImagePNG;
@@ -628,16 +646,16 @@ void LLLocalBitmap::updateUserLayers(LLUUID old_id, LLUUID new_id, LLWearableTyp
 void LLLocalBitmap::updateGLTFMaterials(LLUUID old_id, LLUUID new_id)
 {
     // Might be a better idea to hold this in LLGLTFMaterialList
-    mat_list_t::iterator end = mGLTFMaterialWithLocalTextures.end();
-    for (mat_list_t::iterator it = mGLTFMaterialWithLocalTextures.begin(); it != end;)
+    for (mat_list_t::iterator it = mGLTFMaterialWithLocalTextures.begin(); it != mGLTFMaterialWithLocalTextures.end();)
     {
         if ((*it)->getNumRefs() == 1)
         {
             // render and override materials are often recreated,
             // clean up any remains
             it = mGLTFMaterialWithLocalTextures.erase(it);
-            end = mGLTFMaterialWithLocalTextures.end();
         }
+        // Render material consists of base and override materials, make sure replaceLocalTexture
+        // gets called for base and override before applyOverride
         else if ((*it)->replaceLocalTexture(mTrackingID, old_id, new_id))
         {
             it++;
@@ -647,43 +665,51 @@ void LLLocalBitmap::updateGLTFMaterials(LLUUID old_id, LLUUID new_id)
             // Matching id not found, no longer in use
             // material would clean itself, remove from the list
             it = mGLTFMaterialWithLocalTextures.erase(it);
-            end = mGLTFMaterialWithLocalTextures.end();
         }
     }
 
-    // Render material consists of base and override materials, make sure replaceLocalTexture
-    // gets called for base and override before applyOverride
-    end = mGLTFMaterialWithLocalTextures.end();
-    for (mat_list_t::iterator it = mGLTFMaterialWithLocalTextures.begin(); it != end;)
+    // Updating render materials calls updateTextureTracking which can modify
+    // mGLTFMaterialWithLocalTextures, so precollect all entries that need to be updated
+    std::set<LLTextureEntry*> update_entries;
+    for (LLGLTFMaterial* mat : mGLTFMaterialWithLocalTextures)
     {
-        LLFetchedGLTFMaterial* fetched_mat = dynamic_cast<LLFetchedGLTFMaterial*>((*it).get());
+        // mGLTFMaterialWithLocalTextures includes overrides that are not 'fetched'
+        // and don't have texture entries (they don't need to since render material does).
+        LLFetchedGLTFMaterial* fetched_mat = dynamic_cast<LLFetchedGLTFMaterial*>(mat);
         if (fetched_mat)
         {
             for (LLTextureEntry* entry : fetched_mat->mTextureEntires)
             {
-                // Normally a change in applied material id is supposed to
-                // drop overrides thus reset material, but local materials
-                // currently reuse their existing asset id, and purpose is
-                // to preview how material will work in-world, overrides
-                // included, so do an override to render update instead.
-                LLGLTFMaterial* override_mat = entry->getGLTFMaterialOverride();
-                if (override_mat)
-                {
-                    // do not create a new material, reuse existing pointer
-                    LLFetchedGLTFMaterial* render_mat = dynamic_cast<LLFetchedGLTFMaterial*>(entry->getGLTFRenderMaterial());
-                    if (render_mat)
-                    {
-                            *render_mat = *fetched_mat;
-                        render_mat->applyOverride(*override_mat);
-                    }
-                    else
-                    {
-                        LL_WARNS_ONCE() << "Failed to apply local material override, render material not found" << LL_ENDL;
-                    }
-                }
+                update_entries.insert(entry);
+            }
+        }
+    }
+
+
+    for (LLTextureEntry* entry : update_entries)
+    {
+        // Normally a change in applied material id is supposed to
+        // drop overrides thus reset material, but local materials
+        // currently reuse their existing asset id, and purpose is
+        // to preview how material will work in-world, overrides
+        // included, so do an override to render update instead.
+        LLGLTFMaterial* override_mat = entry->getGLTFMaterialOverride();
+        LLGLTFMaterial* mat = entry->getGLTFMaterial();
+        if (override_mat && mat)
+        {
+            // do not create a new material, reuse existing pointer
+            // so that mTextureEntires remains untouched
+            LLGLTFMaterial* render_mat = entry->getGLTFRenderMaterial();
+            if (render_mat && render_mat != mat)
+            {
+                *render_mat = *mat;
+                render_mat->applyOverride(*override_mat); // can update mGLTFMaterialWithLocalTextures
+            }
+            else
+            {
+                LL_WARNS() << "A TE had an override, but no render material" << LL_ENDL;
             }
         }
-        ++it;
     }
 }
 
diff --git a/indra/newview/lllocalbitmaps.h b/indra/newview/lllocalbitmaps.h
index e169f96e70..6c9d65e3b6 100644
--- a/indra/newview/lllocalbitmaps.h
+++ b/indra/newview/lllocalbitmaps.h
@@ -89,6 +89,7 @@ class LLLocalBitmap
             ET_IMG_BMP,
             ET_IMG_TGA,
             ET_IMG_JPG,
+            ET_IMG_J2C,
             ET_IMG_PNG
         };
 
@@ -106,7 +107,7 @@ class LLLocalBitmap
 
         // Store a list of accosiated materials
         // Might be a better idea to hold this in LLGLTFMaterialList
-        typedef std::vector<LLPointer<LLGLTFMaterial> > mat_list_t;
+        typedef std::list<LLPointer<LLGLTFMaterial> > mat_list_t;
         mat_list_t mGLTFMaterialWithLocalTextures;
 
 };
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index d58f5d5285..46d4c70f87 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -2858,9 +2858,16 @@ void LLMaterialEditor::importMaterial()
                 {
                     return;
                 }
-                if (filenames.size() > 0)
+                try
                 {
-                    LLMaterialEditor::loadMaterialFromFile(filenames[0], -1);
+                    if (filenames.size() > 0)
+                    {
+                        LLMaterialEditor::loadMaterialFromFile(filenames[0], -1);
+                    }
+                }
+                catch (std::bad_alloc&)
+                {
+                    LLNotificationsUtil::add("CannotOpenFileTooBig");
                 }
             },
         LLFilePicker::FFLOAD_MATERIAL,
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index e1fa84b4d8..48c80842b9 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -1210,6 +1210,12 @@ void LLMeshRepoThread::run()
         LL_WARNS(LOG_MESH) << "Convex decomposition unable to be quit." << LL_ENDL;
     }
 }
+void LLMeshRepoThread::cleanup()
+{
+    mShuttingDown = true;
+    mSignal->broadcast();
+    mMeshThreadPool->close();
+}
 
 // Mutex:  LLMeshRepoThread::mMutex must be held on entry
 void LLMeshRepoThread::loadMeshSkinInfo(const LLUUID& mesh_id)
@@ -1493,6 +1499,11 @@ bool LLMeshRepoThread::fetchMeshSkinInfo(const LLUUID& mesh_id)
                         [mesh_id, buffer, size]
                         ()
                     {
+                        if (gMeshRepo.mThread->isShuttingDown())
+                        {
+                            delete[] buffer;
+                            return;
+                        }
                         if (!gMeshRepo.mThread->skinInfoReceived(mesh_id, buffer, size))
                         {
                             // either header is faulty or something else overwrote the cache
@@ -1993,6 +2004,11 @@ bool LLMeshRepoThread::fetchMeshLOD(const LLVolumeParams& mesh_params, S32 lod)
                         [params, mesh_id, lod, buffer, size]
                         ()
                     {
+                        if (gMeshRepo.mThread->isShuttingDown())
+                        {
+                            delete[] buffer;
+                            return;
+                        }
                         if (gMeshRepo.mThread->lodReceived(params, lod, buffer, size) == MESH_OK)
                         {
                             LL_DEBUGS(LOG_MESH) << "Mesh/Cache: Mesh body for ID " << mesh_id << " - was retrieved from the cache." << LL_ENDL;
@@ -3792,6 +3808,11 @@ void LLMeshLODHandler::processData(LLCore::BufferArray * /* body */, S32 /* body
             [shrd_handler, data, data_size]
             ()
         {
+            if (gMeshRepo.mThread->isShuttingDown())
+            {
+                delete[] data;
+                return;
+            }
             LLMeshLODHandler* handler = (LLMeshLODHandler * )shrd_handler.get();
             handler->processLod(data, data_size);
             delete[] data;
@@ -3905,6 +3926,11 @@ void LLMeshSkinInfoHandler::processData(LLCore::BufferArray * /* body */, S32 /*
             [shrd_handler, data, data_size]
             ()
         {
+            if (gMeshRepo.mThread->isShuttingDown())
+            {
+                delete[] data;
+                return;
+            }
             LLMeshSkinInfoHandler* handler = (LLMeshSkinInfoHandler*)shrd_handler.get();
             handler->processSkin(data, data_size);
             delete[] data;
@@ -4127,8 +4153,7 @@ void LLMeshRepository::shutdown()
         mUploads[i]->discard() ; //discard the uploading requests.
     }
 
-    mThread->mSignal->broadcast();
-    mThread->mMeshThreadPool->close();
+    mThread->cleanup();
 
     while (!mThread->isStopped())
     {
@@ -4573,6 +4598,8 @@ void LLMeshRepository::notifyLoadedMeshes()
                 std::partial_sort(mPendingRequests.begin(), mPendingRequests.begin() + push_count,
                                   mPendingRequests.end(), PendingRequestBase::CompareScoreGreater());
             }
+            LLMutexTrylock lock3(mThread->mHeaderMutex);
+            LLMutexTrylock lock4(mThread->mPendingMutex);
             while (!mPendingRequests.empty() && push_count > 0)
             {
                 std::unique_ptr<PendingRequestBase>& req_p = mPendingRequests.front();
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index 0d9da32e27..b9acb3573f 100644
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -515,6 +515,8 @@ public:
     ~LLMeshRepoThread();
 
     virtual void run();
+    void cleanup();
+    bool isShuttingDown() { return mShuttingDown; }
 
     void lockAndLoadMeshLOD(const LLVolumeParams& mesh_params, S32 lod);
     void loadMeshLOD(const LLVolumeParams& mesh_params, S32 lod);
@@ -583,6 +585,7 @@ private:
     U8* getDiskCacheBuffer(S32 size);
     S32 mDiskCacheBufferSize = 0;
     U8* mDiskCacheBuffer = nullptr;
+    bool mShuttingDown = false;
 };
 
 
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index 29ab4e38c0..5a8fd299bf 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -132,20 +132,21 @@ std::string getLodSuffix(S32 lod)
     return suffix;
 }
 
-void FindModel(LLModelLoader::scene& scene, const std::string& name_to_match, LLModel*& baseModelOut, LLMatrix4& matOut)
+static bool FindModel(const LLModelLoader::scene& scene, const std::string& name_to_match, LLModel*& baseModelOut, LLMatrix4& matOut)
 {
-    for (auto scene_iter = scene.begin(); scene_iter != scene.end(); scene_iter++)
+    for (const auto& scene_pair : scene)
     {
-        for (auto model_iter = scene_iter->second.begin(); model_iter != scene_iter->second.end(); model_iter++)
+        for (const auto& model_iter : scene_pair.second)
         {
-            if (model_iter->mModel && (model_iter->mModel->mLabel == name_to_match))
+            if (model_iter.mModel && (model_iter.mModel->mLabel == name_to_match))
             {
-                baseModelOut = model_iter->mModel;
-                matOut = scene_iter->first;
-                return;
+                baseModelOut = model_iter.mModel;
+                matOut = scene_pair.first;
+                return true;
             }
         }
     }
+    return false;
 }
 
 //-----------------------------------------------------------------------------
@@ -319,10 +320,8 @@ void LLModelPreview::rebuildUploadData()
 
         mat *= scale_mat;
 
-        for (auto model_iter = iter->second.begin(); model_iter != iter->second.end(); ++model_iter)
-        { // for each instance with said transform applied
-            LLModelInstance instance = *model_iter;
-
+        for (LLModelInstance& instance : iter->second)
+        { //for each instance with said transform applied
             LLModel* base_model = instance.mModel;
 
             if (base_model && !requested_name.empty())
@@ -354,7 +353,7 @@ void LLModelPreview::rebuildUploadData()
                     }
                     else
                     {
-                        //Physics can be inherited from other LODs or loaded, so we need to adjust what extension we are searching for
+                        // Physics can be inherited from other LODs or loaded, so we need to adjust what extension we are searching for
                         extensionLOD = mPhysicsSearchLOD;
                     }
 
@@ -365,9 +364,9 @@ void LLModelPreview::rebuildUploadData()
                         name_to_match += toAdd;
                     }
 
-                    FindModel(mScene[i], name_to_match, lod_model, transform);
+                    bool found = FindModel(mScene[i], name_to_match, lod_model, transform);
 
-                    if (!lod_model && i != LLModel::LOD_PHYSICS)
+                    if (!found && i != LLModel::LOD_PHYSICS)
                     {
                         if (mImporterDebug)
                         {
@@ -380,7 +379,7 @@ void LLModelPreview::rebuildUploadData()
                         }
 
                         int searchLOD = (i > LLModel::LOD_HIGH) ? LLModel::LOD_HIGH : i;
-                        while ((searchLOD <= LLModel::LOD_HIGH) && !lod_model)
+                        for (; searchLOD <= LLModel::LOD_HIGH; ++searchLOD)
                         {
                             std::string name_to_match = instance.mLabel;
                             llassert(!name_to_match.empty());
@@ -394,8 +393,8 @@ void LLModelPreview::rebuildUploadData()
 
                             // See if we can find an appropriately named model in LOD 'searchLOD'
                             //
-                            FindModel(mScene[searchLOD], name_to_match, lod_model, transform);
-                            searchLOD++;
+                            if (FindModel(mScene[searchLOD], name_to_match, lod_model, transform))
+                                break;
                         }
                     }
                 }
@@ -1174,8 +1173,7 @@ void LLModelPreview::loadModelCallback(S32 loaded_lod)
 
                         LLModel* found_model = NULL;
                         LLMatrix4 transform;
-                        FindModel(mBaseScene, loaded_name, found_model, transform);
-                        if (found_model)
+                        if (FindModel(mBaseScene, loaded_name, found_model, transform))
                         { // don't rename correctly named models (even if they are placed in a wrong order)
                             name_based = true;
                         }
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index 6e666b8a4b..9d8493549d 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -819,6 +819,50 @@ void LLOutfitListBase::observerCallback(const LLUUID& category_id)
     refreshList(category_id);
 }
 
+class LLIsOutfitListFolder : public LLInventoryCollectFunctor
+{
+public:
+    LLIsOutfitListFolder()
+    {
+        mOutfitsId = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS);
+    }
+    virtual ~LLIsOutfitListFolder() {}
+
+    bool operator()(LLInventoryCategory* cat, LLInventoryItem* item) override
+    {
+        if (cat)
+        {
+            if (cat->getPreferredType() == LLFolderType::FT_OUTFIT)
+            {
+                return true;
+            }
+            if (cat->getPreferredType() == LLFolderType::FT_NONE
+                && cat->getParentUUID() == mOutfitsId)
+            {
+                LLViewerInventoryCategory* inv_cat = dynamic_cast<LLViewerInventoryCategory*>(cat);
+                if (inv_cat && inv_cat->getDescendentCount() > 3)
+                {
+                    LLInventoryModel::cat_array_t* cats;
+                    LLInventoryModel::item_array_t* items;
+                    gInventory.getDirectDescendentsOf(inv_cat->getUUID(), cats, items);
+                    if (cats->empty() // protection against outfits inside
+                        && items->size() > 3) // eyes, skin, hair and shape are required
+                    {
+                        // For now assume this to be an old style outfit, not a subfolder
+                        // but ideally no such 'outfits' should be left in My Outfits
+                        // Todo: stop counting FT_NONE as outfits,
+                        // convert obvious outfits into FT_OUTFIT
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+protected:
+    LLUUID mOutfitsId;
+};
+
 void LLOutfitListBase::refreshList(const LLUUID& category_id)
 {
     bool wasNull = mRefreshListState.CategoryUUID.isNull();
@@ -828,13 +872,13 @@ void LLOutfitListBase::refreshList(const LLUUID& category_id)
     LLInventoryModel::item_array_t item_array;
 
     // Collect all sub-categories of a given category.
-    LLIsType is_category(LLAssetType::AT_CATEGORY);
+    LLIsOutfitListFolder is_outfit;
     gInventory.collectDescendentsIf(
         category_id,
         cat_array,
         item_array,
         LLInventoryModel::EXCLUDE_TRASH,
-        is_category);
+        is_outfit);
 
     // Memorize item names for each UUID
     std::map<LLUUID, std::string> names;
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index f491cccaf8..b7d9df6ea6 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -3075,8 +3075,7 @@ void LLPanelFace::onCommitHideWater()
     }
     else
     {
-        // reset texture to default plywood
-        LLSelectMgr::getInstance()->selectionSetImage(DEFAULT_OBJECT_TEXTURE);
+        LLSelectMgr::getInstance()->clearWaterExclusion();
     }
 }
 
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 5bd2a53e7c..d964fa9170 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1582,7 +1582,7 @@ void LLPanelMainInventory::initInventoryViews()
 
 void LLPanelMainInventory::toggleViewMode()
 {
-    if(mSingleFolderMode && isCombinationViewMode())
+    if(mSingleFolderMode && isCombinationViewMode() && mCombinationGalleryPanel->getRootFolder().notNull())
     {
         mCombinationInventoryPanel->getRootFolder()->setForceArrange(false);
     }
@@ -2047,7 +2047,8 @@ bool LLPanelMainInventory::isSaveTextureEnabled(const LLSD& userdata)
     }
     else
     {
-        LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
+        LLFolderView* root_folder = getActivePanel() ? getActivePanel()->getRootFolder() : nullptr;
+        LLFolderViewItem* current_item = root_folder ? root_folder->getCurSelectedItem() : nullptr;
         if (current_item)
         {
             inv_item = dynamic_cast<LLViewerInventoryItem*>(static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getInventoryObject());
@@ -2443,8 +2444,6 @@ void LLPanelMainInventory::updateCombinationVisibility()
             mCombinationGalleryPanel->handleModifiedFilter();
         }
 
-        getActivePanel()->getRootFolder();
-
         if (mReshapeInvLayout
             && show_inv_pane
             && (mCombinationGalleryPanel->hasVisibleItems() || mCombinationGalleryPanel->areViewsInitialized())
@@ -2501,8 +2500,12 @@ void LLPanelMainInventory::updateCombinationVisibility()
         && mCombinationInventoryPanel->areViewsInitialized())
     {
         mCombinationInventoryPanel->setSelectionByID(mCombInvUUIDNeedsRename, true);
-        mCombinationInventoryPanel->getRootFolder()->scrollToShowSelection();
-        mCombinationInventoryPanel->getRootFolder()->setNeedsAutoRename(true);
+        LLFolderView* root = mCombinationInventoryPanel->getRootFolder();
+        if (root)
+        {
+            root->scrollToShowSelection();
+            root->setNeedsAutoRename(true);
+        }
         mCombInvUUIDNeedsRename.setNull();
     }
 }
diff --git a/indra/newview/llpanelprofileclassifieds.cpp b/indra/newview/llpanelprofileclassifieds.cpp
index 3920dd82c8..62829b0745 100644
--- a/indra/newview/llpanelprofileclassifieds.cpp
+++ b/indra/newview/llpanelprofileclassifieds.cpp
@@ -78,13 +78,6 @@ class LLClassifiedHandler : public LLCommandHandler, public LLAvatarPropertiesOb
 public:
     // throttle calls from untrusted browsers
     LLClassifiedHandler() : LLCommandHandler("classified", UNTRUSTED_THROTTLE) {}
-    virtual ~LLClassifiedHandler()
-    {
-        if (LLAvatarPropertiesProcessor::instanceExists())
-        {
-            LLAvatarPropertiesProcessor::getInstance()->removeObserver(LLUUID(), this);
-        }
-    }
 
     std::set<LLUUID> mClassifiedIds;
     std::string mRequestVerb;
diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp
index 09b8011ce4..a87ef4f0f9 100644
--- a/indra/newview/llpanelprofilepicks.cpp
+++ b/indra/newview/llpanelprofilepicks.cpp
@@ -55,7 +55,7 @@
 static LLPanelInjector<LLPanelProfilePicks> t_panel_profile_picks("panel_profile_picks");
 static LLPanelInjector<LLPanelProfilePick> t_panel_profile_pick("panel_profile_pick");
 
-constexpr F32 REQUEST_TIMOUT = 60;
+constexpr F32 REQUEST_TIMEOUT = 60;
 constexpr F32 LOCATION_CACHE_TIMOUT = 900;
 
 class LLPickHandler : public LLCommandHandler
@@ -842,7 +842,7 @@ std::string LLPanelProfilePick::getLocationNotice()
 
 void LLPanelProfilePick::sendParcelInfoRequest()
 {
-    if (mParcelId != mRequestedId || mLastRequestTimer.getElapsedTimeF32() > REQUEST_TIMOUT)
+    if (mParcelId != mRequestedId || mLastRequestTimer.getElapsedTimeF32() > REQUEST_TIMEOUT)
     {
         if (mRequestedId.notNull())
         {
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 951dc45a78..2fbdbeaf59 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -576,32 +576,48 @@ void LLPanelVolume::getState( )
             return object->getMaterial();
         }
     } func;
-    bool material_same = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, material_code );
+    LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
+    bool material_same = selection->getSelectedTEValue( &func, material_code );
     std::string LEGACY_FULLBRIGHT_DESC = LLTrans::getString("Fullbright");
-    if (editable && single_volume && material_same)
+
+    bool enable_material = editable && single_volume && material_same;
+    LLCachedControl<bool> edit_linked(gSavedSettings, "EditLinkedParts", false);
+    if (!enable_material && !edit_linked())
     {
-        mComboMaterial->setEnabled( true );
-        if (material_code == LL_MCODE_LIGHT)
+        LLViewerObject* root = selection->getPrimaryObject();
+        while (root && !root->isAvatar() && root->getParent())
         {
-            if (mComboMaterial->getItemCount() == mComboMaterialItemCount)
+            LLViewerObject* parent = (LLViewerObject*)root->getParent();
+            if (parent->isAvatar())
             {
-                mComboMaterial->add(LEGACY_FULLBRIGHT_DESC);
+                break;
             }
-            mComboMaterial->setSimple(LEGACY_FULLBRIGHT_DESC);
+            root = parent;
         }
-        else
+        if (root)
         {
-            if (mComboMaterial->getItemCount() != mComboMaterialItemCount)
-            {
-                mComboMaterial->remove(LEGACY_FULLBRIGHT_DESC);
-            }
+            material_code = root->getMaterial();
+        }
+    }
 
-            mComboMaterial->setSimple(std::string(LLMaterialTable::basic.getName(material_code)));
+    mComboMaterial->setEnabled(enable_material);
+
+    if (material_code == LL_MCODE_LIGHT)
+    {
+        if (mComboMaterial->getItemCount() == mComboMaterialItemCount)
+        {
+            mComboMaterial->add(LEGACY_FULLBRIGHT_DESC);
         }
+        mComboMaterial->setSimple(LEGACY_FULLBRIGHT_DESC);
     }
     else
     {
-        mComboMaterial->setEnabled( false );
+        if (mComboMaterial->getItemCount() != mComboMaterialItemCount)
+        {
+            mComboMaterial->remove(LEGACY_FULLBRIGHT_DESC);
+        }
+
+        mComboMaterial->setSimple(std::string(LLMaterialTable::basic.getName(material_code)));
     }
 
     // Physics properties
diff --git a/indra/newview/llreflectionmap.cpp b/indra/newview/llreflectionmap.cpp
index f3adb52d5e..910509928d 100644
--- a/indra/newview/llreflectionmap.cpp
+++ b/indra/newview/llreflectionmap.cpp
@@ -52,6 +52,9 @@ LLReflectionMap::~LLReflectionMap()
 void LLReflectionMap::update(U32 resolution, U32 face, bool force_dynamic, F32 near_clip, bool useClipPlane, LLPlane clipPlane)
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_DISPLAY;
+    if (!mCubeArray.notNull())
+        return;
+
     mLastUpdateTime = gFrameTimeSeconds;
     llassert(mCubeArray.notNull());
     llassert(mCubeIndex != -1);
diff --git a/indra/newview/llreflectionmapmanager.cpp b/indra/newview/llreflectionmapmanager.cpp
index b67721f21c..713acde887 100644
--- a/indra/newview/llreflectionmapmanager.cpp
+++ b/indra/newview/llreflectionmapmanager.cpp
@@ -144,13 +144,14 @@ static void touch_default_probe(LLReflectionMap* probe)
 
 LLReflectionMapManager::LLReflectionMapManager()
 {
+    mDynamicProbeCount = LL_MAX_REFLECTION_PROBE_COUNT;
     initCubeFree();
 }
 
 void LLReflectionMapManager::initCubeFree()
 {
     // start at 1 because index 0 is reserved for mDefaultProbe
-    for (int i = 1; i < LL_MAX_REFLECTION_PROBE_COUNT; ++i)
+    for (U32 i = 1; i < mDynamicProbeCount; ++i)
     {
         mCubeFree.push_back(i);
     }
@@ -222,12 +223,53 @@ void LLReflectionMapManager::update()
         resume();
     }
 
-    static LLCachedControl<U32> probe_count(gSavedSettings, "RenderReflectionProbeCount", 256U);
-    bool countReset = mReflectionProbeCount != probe_count;
+    static LLCachedControl<S32> sDetail(gSavedSettings, "RenderReflectionProbeDetail", -1);
+    static LLCachedControl<S32> sLevel(gSavedSettings, "RenderReflectionProbeLevel", 3);
+    static LLCachedControl<U32> sReflectionProbeCount(gSavedSettings, "RenderReflectionProbeCount", 256U);
+    static LLCachedControl<S32> sProbeDynamicAllocation(gSavedSettings, "RenderReflectionProbeDynamicAllocation", -1);
+    mResetFade = llmin((F32)(mResetFade + gFrameIntervalSeconds * 2.f), 1.f);
 
-    if (countReset)
     {
-        mResetFade = -0.5f;
+        U32 probe_count_temp = mDynamicProbeCount;
+        if (sProbeDynamicAllocation > -1)
+        {
+            if (sLevel == 0)
+            {
+                mDynamicProbeCount = 1;
+            }
+            else if (sLevel == 1)
+            {
+                mDynamicProbeCount = (U32)mProbes.size();
+            }
+            else if (sLevel == 2)
+            {
+                mDynamicProbeCount = llmax((U32)mProbes.size(), 128);
+            }
+            else
+            {
+                mDynamicProbeCount = 256;
+            }
+
+            if (sProbeDynamicAllocation > 1)
+            {
+                // Round mDynamicProbeCount to the nearest increment of 16
+                mDynamicProbeCount = ((mDynamicProbeCount + sProbeDynamicAllocation / 2) / sProbeDynamicAllocation) * 16;
+                mDynamicProbeCount = llclamp(mDynamicProbeCount, 1, sReflectionProbeCount);
+            }
+            else
+            {
+                mDynamicProbeCount = llclamp(mDynamicProbeCount + sProbeDynamicAllocation, 1, sReflectionProbeCount);
+            }
+        }
+        else
+        {
+            mDynamicProbeCount = sReflectionProbeCount;
+        }
+
+        mDynamicProbeCount = llmin(mDynamicProbeCount, LL_MAX_REFLECTION_PROBE_COUNT);
+
+        if (mDynamicProbeCount != probe_count_temp)
+            mResetFade = 1.f;
     }
 
     initReflectionMaps();
@@ -287,9 +329,6 @@ void LLReflectionMapManager::update()
 
     bool did_update = false;
 
-    static LLCachedControl<S32> sDetail(gSavedSettings, "RenderReflectionProbeDetail", -1);
-    static LLCachedControl<S32> sLevel(gSavedSettings, "RenderReflectionProbeLevel", 3);
-
     bool realtime = sDetail >= (S32)LLReflectionMapManager::DetailLevel::REALTIME;
 
     LLReflectionMap* closestDynamic = nullptr;
@@ -324,6 +363,7 @@ void LLReflectionMapManager::update()
             probe->mCubeArray = nullptr;
             probe->mCubeIndex = -1;
             probe->mComplete = false;
+            probe->mFadeIn = 0;
         }
     }
 
@@ -344,12 +384,7 @@ void LLReflectionMapManager::update()
         }
     }
 
-    if (countReset)
-    {
-        mResetFade = -0.5f;
-    }
-
-    mResetFade = llmin((F32)(mResetFade + gFrameIntervalSeconds), 1.f);
+    mResetFade = llmin((F32)(mResetFade + gFrameIntervalSeconds * 2.f), 1.f);
 
     for (unsigned int i = 0; i < mProbes.size(); ++i)
     {
@@ -521,6 +556,16 @@ LLReflectionMap* LLReflectionMapManager::addProbe(LLSpatialGroup* group)
     return probe;
 }
 
+U32 LLReflectionMapManager::probeCount()
+{
+    return mDynamicProbeCount;
+}
+
+U32 LLReflectionMapManager::probeMemory()
+{
+    return (mDynamicProbeCount * 6 * (mProbeResolution * mProbeResolution) * 4) / 1024 / 1024 + (mDynamicProbeCount * 6 * (LL_IRRADIANCE_MAP_RESOLUTION * LL_IRRADIANCE_MAP_RESOLUTION) * 4) / 1024 / 1024;
+}
+
 struct CompareProbeDepth
 {
     bool operator()(const LLReflectionMap* lhs, const LLReflectionMap* rhs)
@@ -1062,7 +1107,11 @@ void LLReflectionMapManager::updateUniforms()
 
     bool is_ambiance_pass = gCubeSnapshot && !isRadiancePass();
     F32 ambscale = is_ambiance_pass ? 0.f : 1.f;
+    ambscale *= mResetFade;
+    ambscale = llmax(0, ambscale);
     F32 radscale = is_ambiance_pass ? 0.5f : 1.f;
+    radscale *= mResetFade;
+    radscale = llmax(0, radscale);
 
     for (auto* refmap : mReflectionMaps)
     {
@@ -1133,8 +1182,8 @@ void LLReflectionMapManager::updateUniforms()
         }
 
         mProbeData.refParams[count].set(
-            llmax(minimum_ambiance, refmap->getAmbiance())*ambscale * llmax(mResetFade, 0.f), // ambiance scale
-            radscale * llmax(mResetFade, 0.f), // radiance scale
+            llmax(minimum_ambiance, refmap->getAmbiance())*ambscale, // ambiance scale
+            radscale, // radiance scale
             refmap->mFadeIn, // fade in weight
             oa.getF32ptr()[2] - refmap->mRadius); // z near
 
@@ -1369,12 +1418,9 @@ void LLReflectionMapManager::renderDebug()
 
 void LLReflectionMapManager::initReflectionMaps()
 {
-    static LLCachedControl<U32> probe_count(gSavedSettings, "RenderReflectionProbeCount", 256U);
-    U32 count = probe_count();
-
     static LLCachedControl<U32> ref_probe_res(gSavedSettings, "RenderReflectionProbeResolution", 128U);
     U32 probe_resolution = nhpo2(llclamp(ref_probe_res(), (U32)64, (U32)512));
-    if (mTexture.isNull() || mReflectionProbeCount != count || mProbeResolution != probe_resolution || mReset)
+    if (mTexture.isNull() || mReflectionProbeCount != mDynamicProbeCount || mProbeResolution != probe_resolution || mReset)
     {
         if(mProbeResolution != probe_resolution)
         {
@@ -1383,9 +1429,8 @@ void LLReflectionMapManager::initReflectionMaps()
         }
 
         gEXRImage = nullptr;
-
         mReset = false;
-        mReflectionProbeCount = count;
+        mReflectionProbeCount = mDynamicProbeCount;
         mProbeResolution = probe_resolution;
         mMaxProbeLOD = log2f((F32)mProbeResolution) - 1.f; // number of mips - 1
 
@@ -1393,15 +1438,25 @@ void LLReflectionMapManager::initReflectionMaps()
             mTexture->getWidth() != mProbeResolution ||
             mReflectionProbeCount + 2 != mTexture->getCount())
         {
-            mTexture = new LLCubeMapArray();
+            if (mTexture)
+            {
+                mTexture = new LLCubeMapArray(*mTexture, mProbeResolution, mReflectionProbeCount + 2);
 
-            static LLCachedControl<bool> render_hdr(gSavedSettings, "RenderHDREnabled", true);
+                mIrradianceMaps = new LLCubeMapArray(*mIrradianceMaps, LL_IRRADIANCE_MAP_RESOLUTION, mReflectionProbeCount);
+            }
+            else
+            {
+                mTexture = new LLCubeMapArray();
 
-            // store mReflectionProbeCount+2 cube maps, final two cube maps are used for render target and radiance map generation source)
-            mTexture->allocate(mProbeResolution, 3, mReflectionProbeCount + 2, true, render_hdr);
+                static LLCachedControl<bool> render_hdr(gSavedSettings, "RenderHDREnabled", true);
 
-            mIrradianceMaps = new LLCubeMapArray();
-            mIrradianceMaps->allocate(LL_IRRADIANCE_MAP_RESOLUTION, 3, mReflectionProbeCount, false, render_hdr);
+                // store mReflectionProbeCount+2 cube maps, final two cube maps are used for render target and radiance map generation
+                // source)
+                mTexture->allocate(mProbeResolution, 3, mReflectionProbeCount + 2, true, render_hdr);
+
+                mIrradianceMaps = new LLCubeMapArray();
+                mIrradianceMaps->allocate(LL_IRRADIANCE_MAP_RESOLUTION, 3, mReflectionProbeCount, false, render_hdr);
+            }
         }
 
         // reset probe state
@@ -1421,6 +1476,7 @@ void LLReflectionMapManager::initReflectionMaps()
             probe->mCubeArray = nullptr;
             probe->mCubeIndex = -1;
             probe->mNeighbors.clear();
+            probe->mFadeIn = 0;
         }
 
         mCubeFree.clear();
diff --git a/indra/newview/llreflectionmapmanager.h b/indra/newview/llreflectionmapmanager.h
index 9f88776ac2..0719c28134 100644
--- a/indra/newview/llreflectionmapmanager.h
+++ b/indra/newview/llreflectionmapmanager.h
@@ -38,7 +38,7 @@ class LLViewerObject;
 #define LL_MAX_REFLECTION_PROBE_COUNT 256
 
 // reflection probe resolution
-#define LL_IRRADIANCE_MAP_RESOLUTION 64
+#define LL_IRRADIANCE_MAP_RESOLUTION 16
 
 // reflection probe mininum scale
 #define LL_REFLECTION_PROBE_MINIMUM_SCALE 1.f;
@@ -159,6 +159,9 @@ public:
     // with false when done.
     void forceDefaultProbeAndUpdateUniforms(bool force = true);
 
+    U32 probeCount();
+    U32 probeMemory();
+
 private:
     friend class LLPipeline;
     friend class LLHeroProbeManager;
@@ -166,6 +169,9 @@ private:
     // initialize mCubeFree array to default values
     void initCubeFree();
 
+    // Just does a bulk clear of all of the cubemaps.
+    void clearCubeMaps();
+
     // delete the probe with the given index in mProbes
     void deleteProbe(U32 i);
 
@@ -240,6 +246,8 @@ private:
     // number of reflection probes to use for rendering
     U32 mReflectionProbeCount;
 
+    U32 mDynamicProbeCount;
+
     // resolution of reflection probes
     U32 mProbeResolution = 128;
 
@@ -253,6 +261,7 @@ private:
     bool mReset = false;
 
     float mResetFade = 1.f;
+    float mGlobalFadeTarget = 1.f;
 
     // if true, only update the default probe
     bool mPaused = false;
diff --git a/indra/newview/llremoteparcelrequest.cpp b/indra/newview/llremoteparcelrequest.cpp
index 7b80e8c27f..d0aa1af2f3 100644
--- a/indra/newview/llremoteparcelrequest.cpp
+++ b/indra/newview/llremoteparcelrequest.cpp
@@ -102,7 +102,15 @@ void LLRemoteParcelInfoProcessor::processParcelInfoReply(LLMessageSystem* msg, v
     msg->getS32     ("Data", "SalePrice", parcel_data.sale_price);
     msg->getS32     ("Data", "AuctionID", parcel_data.auction_id);
 
-    LLRemoteParcelInfoProcessor::observer_multimap_t & observers = LLRemoteParcelInfoProcessor::getInstance()->mObservers;
+    LLRemoteParcelInfoProcessor* inst = LLRemoteParcelInfoProcessor::getInstance();
+
+    requests_map_t::const_iterator found = inst->mPendingParcelRequests.find(parcel_data.parcel_id);
+    if (found != inst->mPendingParcelRequests.end())
+    {
+        inst->mPendingParcelRequests.erase(found);
+    }
+
+    LLRemoteParcelInfoProcessor::observer_multimap_t & observers = inst->mObservers;
 
     typedef std::vector<observer_multimap_t::iterator> deadlist_t;
     deadlist_t dead_iters;
@@ -151,6 +159,15 @@ void LLRemoteParcelInfoProcessor::processParcelInfoReply(LLMessageSystem* msg, v
 
 void LLRemoteParcelInfoProcessor::sendParcelInfoRequest(const LLUUID& parcel_id)
 {
+    constexpr F32 DUPPLICATE_TIMEOUT = 0.5f;
+    requests_map_t::const_iterator found = mPendingParcelRequests.find(parcel_id);
+    if (found != mPendingParcelRequests.end() && found->second.getElapsedTimeF32() < DUPPLICATE_TIMEOUT)
+    {
+        // recently requested
+        return;
+    }
+    mPendingParcelRequests[parcel_id].reset();
+
     LLMessageSystem *msg = gMessageSystem;
 
     msg->newMessage("ParcelInfoRequest");
diff --git a/indra/newview/llremoteparcelrequest.h b/indra/newview/llremoteparcelrequest.h
index 1420b4032e..7059e14bec 100644
--- a/indra/newview/llremoteparcelrequest.h
+++ b/indra/newview/llremoteparcelrequest.h
@@ -91,6 +91,8 @@ public:
 private:
     typedef std::multimap<LLUUID, LLHandle<LLRemoteParcelInfoObserver> > observer_multimap_t;
     observer_multimap_t mObservers;
+    typedef std::map<LLUUID, LLTimer> requests_map_t;
+    requests_map_t mPendingParcelRequests; // Dupplicate request avoidance
 
     void regionParcelInfoCoro(std::string url, LLUUID regionId, LLVector3 posRegion, LLVector3d posGlobal, LLHandle<LLRemoteParcelInfoObserver> observerHandle);
 };
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index b307de787c..be1e64ce54 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1995,7 +1995,7 @@ bool LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
                     asset_id = BLANK_MATERIAL_ASSET_ID;
                 }
             }
-
+            objectp->clearTEWaterExclusion(te);
             // Blank out most override data on the object and send to server
             objectp->setRenderMaterialID(te, asset_id);
 
@@ -2477,6 +2477,7 @@ void LLSelectMgr::selectionSetMedia(U8 media_type, const LLSD &media_data)
                     }
                     else {
                         // Add/update media
+                        object->clearTEWaterExclusion(te);
                         object->setTEMediaFlags(te, mMediaFlags);
                         LLVOVolume *vo = dynamic_cast<LLVOVolume*>(object);
                         llassert(NULL != vo);
@@ -3138,6 +3139,8 @@ void LLSelectMgr::adjustTexturesByScale(bool send_to_sim, bool stretch)
 
                     F32 scale_x = 1;
                     F32 scale_y = 1;
+                    F32 offset_x = 0;
+                    F32 offset_y = 0;
 
                     for (U32 i = 0; i < LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT; ++i)
                     {
@@ -3154,6 +3157,21 @@ void LLSelectMgr::adjustTexturesByScale(bool send_to_sim, bool stretch)
                             scale_y = scale_ratio.mV[t_axis] * object_scale.mV[t_axis];
                         }
                         material->mTextureTransform[i].mScale.set(scale_x, scale_y);
+
+                        LLVector2 scales = selectNode->mGLTFScales[te_num][i];
+                        LLVector2 offsets = selectNode->mGLTFOffsets[te_num][i];
+                        F64 int_part = 0;
+                        offset_x = (F32)modf((offsets[VX] + (scales[VX] - scale_x)) / 2, &int_part);
+                        if (offset_x < 0)
+                        {
+                            offset_x++;
+                        }
+                        offset_y = (F32)modf((offsets[VY] + (scales[VY] - scale_y)) / 2, &int_part);
+                        if (offset_y < 0)
+                        {
+                            offset_y++;
+                        }
+                        material->mTextureTransform[i].mOffset.set(offset_x, offset_y);
                     }
 
                     const LLGLTFMaterial* base_material = tep->getGLTFMaterial();
@@ -6904,6 +6922,8 @@ void LLSelectNode::saveTextureScaleRatios(LLRender::eTexIndex index_to_query)
 {
     mTextureScaleRatios.clear();
     mGLTFScaleRatios.clear();
+    mGLTFScales.clear();
+    mGLTFOffsets.clear();
 
     if (mObject.notNull())
     {
@@ -6944,6 +6964,8 @@ void LLSelectNode::saveTextureScaleRatios(LLRender::eTexIndex index_to_query)
             F32 scale_x = 1;
             F32 scale_y = 1;
             std::vector<LLVector3> material_v_vec;
+            std::vector<LLVector2> material_scales_vec;
+            std::vector<LLVector2> material_offset_vec;
             for (U32 i = 0; i < LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT; ++i)
             {
                 if (material)
@@ -6951,12 +6973,16 @@ void LLSelectNode::saveTextureScaleRatios(LLRender::eTexIndex index_to_query)
                     LLGLTFMaterial::TextureTransform& transform = material->mTextureTransform[i];
                     scale_x = transform.mScale[VX];
                     scale_y = transform.mScale[VY];
+                    material_scales_vec.push_back(transform.mScale);
+                    material_offset_vec.push_back(transform.mOffset);
                 }
                 else
                 {
                     // Not having an override doesn't mean that there is no material
                     scale_x = 1;
                     scale_y = 1;
+                    material_scales_vec.emplace_back(scale_x, scale_y);
+                    material_offset_vec.emplace_back(0.f, 0.f);
                 }
 
                 if (tep->getTexGen() == LLTextureEntry::TEX_GEN_PLANAR)
@@ -6972,6 +6998,8 @@ void LLSelectNode::saveTextureScaleRatios(LLRender::eTexIndex index_to_query)
                 material_v_vec.push_back(material_v);
             }
             mGLTFScaleRatios.push_back(material_v_vec);
+            mGLTFScales.push_back(material_scales_vec);
+            mGLTFOffsets.push_back(material_offset_vec);
         }
     }
 }
@@ -7485,7 +7513,7 @@ void LLSelectMgr::updatePointAt()
             LLVector3 select_offset;
             const LLPickInfo& pick = gViewerWindow->getLastPick();
             LLViewerObject *click_object = pick.getObject();
-            bool was_hud = pick.mPickHUD && !click_object->isHUDAttachment();
+            bool was_hud = pick.mPickHUD && click_object && !click_object->isHUDAttachment();
             if (click_object && click_object->isSelected() && !was_hud)
             {
                 // clicked on another object in our selection group, use that as target
@@ -7724,6 +7752,14 @@ void LLSelectMgr::setAgentHUDZoom(F32 target_zoom, F32 current_zoom)
     gAgentCamera.mHUDCurZoom = current_zoom;
 }
 
+void LLSelectMgr::clearWaterExclusion()
+{
+    // reset texture to default plywood
+    LLSelectMgr::getInstance()->selectionSetImage(DEFAULT_OBJECT_TEXTURE);
+    // reset texture repeats, that might be altered by invisiprim script from wiki
+    LLSelectMgr::getInstance()->selectionTexScaleAutofit(2.f);
+}
+
 /////////////////////////////////////////////////////////////////////////////
 // Object selection iterator helpers
 /////////////////////////////////////////////////////////////////////////////
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index b70ec3dbea..792a37297f 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -242,6 +242,8 @@ public:
     gltf_materials_vec_t mSavedGLTFOverrideMaterials;
     std::vector<LLVector3>  mTextureScaleRatios;
     std::vector< std::vector<LLVector3> >  mGLTFScaleRatios;
+    std::vector< std::vector<LLVector2> >  mGLTFScales;
+    std::vector< std::vector<LLVector2> >  mGLTFOffsets;
     std::vector<LLVector3>  mSilhouetteVertices;    // array of vertices to render silhouette of object
     std::vector<LLVector3>  mSilhouetteNormals; // array of normals to render silhouette of object
     bool                    mSilhouetteExists;  // need to generate silhouette?
@@ -836,6 +838,7 @@ public:
     void getAgentHUDZoom(F32 &target_zoom, F32 &current_zoom) const;
 
     void updatePointAt();
+    void clearWaterExclusion();
 
     // Internal list maintenance functions. TODO: Make these private!
     void remove(std::vector<LLViewerObject*>& objects);
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index ea95d71b27..68b4ab381a 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -694,6 +694,7 @@ bool LLSnapshotLivePreview::onIdle( void* snapshot_preview )
     static LLCachedControl<bool> freeze_time(gSavedSettings, "FreezeTime", false);
     static LLCachedControl<bool> use_freeze_frame(gSavedSettings, "UseFreezeFrame", false);
     static LLCachedControl<bool> render_ui(gSavedSettings, "RenderUIInSnapshot", false);
+    static LLCachedControl<bool> render_balance(gSavedSettings, "RenderBalanceInSnapshot", false);
     static LLCachedControl<bool> render_hud(gSavedSettings, "RenderHUDInSnapshot", false);
     static LLCachedControl<bool> render_no_post(gSavedSettings, "RenderSnapshotNoPost", false);
 
@@ -750,6 +751,7 @@ bool LLSnapshotLivePreview::onIdle( void* snapshot_preview )
                 render_hud,
                 false,
                 render_no_post,
+                render_balance,
                 previewp->mSnapshotBufferType,
                 previewp->getMaxImageSize()))
         {
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index ecbbc4b2c5..8aa2058ae1 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -738,6 +738,10 @@ void LLStatusBar::updateBalancePanelPosition()
     balance_bg_view->setShape(balance_bg_rect);
 }
 
+void LLStatusBar::setBalanceVisible(bool visible)
+{
+    mBoxBalance->setVisible(visible);
+}
 
 // Implements secondlife:///app/balance/request to request a L$ balance
 // update via UDP message system. JC
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index 4c9d3e0c08..45cbda0ef1 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -93,6 +93,8 @@ public:
     S32 getSquareMetersCommitted() const;
     S32 getSquareMetersLeft() const;
 
+    void setBalanceVisible(bool visible);
+
     LLPanelNearByMedia* getNearbyMediaPanel() { return mPanelNearByMedia; }
 
 private:
diff --git a/indra/newview/llsurfacepatch.cpp b/indra/newview/llsurfacepatch.cpp
index 4315c4c6b0..6f99da5957 100644
--- a/indra/newview/llsurfacepatch.cpp
+++ b/indra/newview/llsurfacepatch.cpp
@@ -201,7 +201,7 @@ LLVector2 LLSurfacePatch::getTexCoords(const U32 x, const U32 y) const
 
 
 void LLSurfacePatch::eval(const U32 x, const U32 y, const U32 stride, LLVector3 *vertex, LLVector3 *normal,
-                          LLVector2 *tex1) const
+                          LLVector2* tex0, LLVector2 *tex1) const
 {
     if (!mSurfacep || !mSurfacep->getRegion() || !mSurfacep->getGridsPerEdge() || !mVObjp)
     {
@@ -210,6 +210,7 @@ void LLSurfacePatch::eval(const U32 x, const U32 y, const U32 stride, LLVector3
     llassert_always(vertex && normal && tex1);
 
     U32 surface_stride = mSurfacep->getGridsPerEdge();
+    U32 texture_stride = mSurfacep->getGridsPerEdge() - 1;
     U32 point_offset = x + y*surface_stride;
 
     *normal = getNormal(x, y);
@@ -220,6 +221,12 @@ void LLSurfacePatch::eval(const U32 x, const U32 y, const U32 stride, LLVector3
     pos_agent.mV[VZ]  = *(mDataZ + point_offset);
     *vertex     = pos_agent-mVObjp->getRegion()->getOriginAgent();
 
+    // tex0 is used for ownership overlay
+    LLVector3 rel_pos = pos_agent - mSurfacep->getOriginAgent();
+    LLVector3 tex_pos = rel_pos * (1.f / (texture_stride * mSurfacep->getMetersPerGrid()));
+    tex0->mV[0] = tex_pos.mV[0];
+    tex0->mV[1] = tex_pos.mV[1];
+
     tex1->mV[0] = mSurfacep->getRegion()->getCompositionXY(llfloor(mOriginRegion.mV[0])+x, llfloor(mOriginRegion.mV[1])+y);
 
     const F32 xyScale = 4.9215f*7.f; //0.93284f;
diff --git a/indra/newview/llsurfacepatch.h b/indra/newview/llsurfacepatch.h
index f4831487c1..505fc8c24c 100644
--- a/indra/newview/llsurfacepatch.h
+++ b/indra/newview/llsurfacepatch.h
@@ -116,7 +116,7 @@ public:
     void calcNormalFlat(LLVector3& normal_out, const U32 x, const U32 y, const U32 index /* 0 or 1 */);
 
     void eval(const U32 x, const U32 y, const U32 stride,
-                LLVector3 *vertex, LLVector3 *normal, LLVector2 *tex1) const;
+                LLVector3 *vertex, LLVector3 *normal, LLVector2* tex0, LLVector2 *tex1) const;
 
 
 
diff --git a/indra/newview/llterrainpaintmap.cpp b/indra/newview/llterrainpaintmap.cpp
index 8ccde74c93..c7a82013e4 100644
--- a/indra/newview/llterrainpaintmap.cpp
+++ b/indra/newview/llterrainpaintmap.cpp
@@ -204,8 +204,9 @@ bool LLTerrainPaintMap::bakeHeightNoiseIntoPBRPaintMapRGB(const LLViewerRegion&
                     {
                         LLVector3 scratch3;
                         LLVector3 pos3;
+                        LLVector2 tex0_temp;
                         LLVector2 tex1_temp;
-                        patch->eval(i, j, stride, &pos3, &scratch3, &tex1_temp);
+                        patch->eval(i, j, stride, &pos3, &scratch3, &tex0_temp, &tex1_temp);
                         (*pos++).set(pos3.mV[VX], pos3.mV[VY], pos3.mV[VZ]);
                         *tex1++ = tex1_temp;
                         vertex_total++;
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp
index 78d930c05c..8560a01c4b 100644
--- a/indra/newview/lltextureview.cpp
+++ b/indra/newview/lltextureview.cpp
@@ -559,10 +559,12 @@ void LLGLTexMemBar::draw()
     gGL.color4f(0.f, 0.f, 0.f, 0.25f);
     gl_rect_2d(-10, getRect().getHeight() + line_height*2 + 1, getRect().getWidth()+2, getRect().getHeight()+2);
 
-    text = llformat("Est. Free: %d MB Sys Free: %d MB FBO: %d MB Bias: %.2f Cache: %.1f/%.1f MB",
+    text = llformat("Est. Free: %d MB Sys Free: %d MB FBO: %d MB Probe#: %d Probe Mem: %d MB Bias: %.2f Cache: %.1f/%.1f MB",
                     (S32)LLViewerTexture::sFreeVRAMMegabytes,
                     LLMemory::getAvailableMemKB()/1024,
                     LLRenderTarget::sBytesAllocated/(1024*1024),
+                    gPipeline.mReflectionMapManager.probeCount(),
+                    gPipeline.mReflectionMapManager.probeMemory(),
                     discard_bias,
                     cache_usage,
                     cache_max_usage);
diff --git a/indra/newview/lltoast.cpp b/indra/newview/lltoast.cpp
index 84503e66a5..84854a79d4 100644
--- a/indra/newview/lltoast.cpp
+++ b/indra/newview/lltoast.cpp
@@ -436,6 +436,14 @@ void LLToast::setVisible(bool show)
 
 void LLToast::updateHoveredState()
 {
+    if (!mWrapperPanel)
+    {
+        // Shouldn't be happening.
+        // mWrapperPanel should have been inited in the constructor
+        // This needs to be figured out and fixed
+        llassert(false);
+        return;
+    }
     S32 x, y;
     LLUI::getInstance()->getMousePositionScreen(&x, &y);
 
diff --git a/indra/newview/llviewerassetstorage.cpp b/indra/newview/llviewerassetstorage.cpp
index 5ab9f76e47..255cfc998a 100644
--- a/indra/newview/llviewerassetstorage.cpp
+++ b/indra/newview/llviewerassetstorage.cpp
@@ -402,10 +402,10 @@ void LLViewerAssetStorage::queueRequestHttp(
         manager->enqueueCoprocedure(
             VIEWER_ASSET_STORAGE_CORO_POOL,
             "LLViewerAssetStorage::assetRequestCoro",
-            [this, req, uuid, atype, callback, user_data]
+            [this, uuid, atype, callback, user_data]
             (LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t&, const LLUUID&)
             {
-                assetRequestCoro(req, uuid, atype, callback, user_data);
+                assetRequestCoro(uuid, atype, callback, user_data);
             });
     }
 }
@@ -440,7 +440,6 @@ struct LLScopedIncrement
 };
 
 void LLViewerAssetStorage::assetRequestCoro(
-    LLViewerAssetRequest *req,
     const LLUUID uuid,
     LLAssetType::EType atype,
     LLGetAssetCallback callback,
@@ -464,7 +463,7 @@ void LLViewerAssetStorage::assetRequestCoro(
         LL_WARNS_ONCE("ViewerAsset") << "Asset request fails: no region set" << LL_ENDL;
         result_code = LL_ERR_ASSET_REQUEST_FAILED;
         ext_status = LLExtStat::NONE;
-        removeAndCallbackPendingDownloads(uuid, atype, uuid, atype, result_code, ext_status);
+        removeAndCallbackPendingDownloads(uuid, atype, uuid, atype, result_code, ext_status, 0);
         return;
     }
     else if (!gAgent.getRegion()->capabilitiesReceived())
@@ -495,7 +494,7 @@ void LLViewerAssetStorage::assetRequestCoro(
         LL_WARNS_ONCE("ViewerAsset") << "asset request fails: caps received but no viewer asset cap found" << LL_ENDL;
         result_code = LL_ERR_ASSET_REQUEST_FAILED;
         ext_status = LLExtStat::NONE;
-        removeAndCallbackPendingDownloads(uuid, atype, uuid, atype, result_code, ext_status);
+        removeAndCallbackPendingDownloads(uuid, atype, uuid, atype, result_code, ext_status, 0);
         return;
     }
     std::string url = getAssetURL(mViewerAssetUrl, uuid,atype);
@@ -517,6 +516,7 @@ void LLViewerAssetStorage::assetRequestCoro(
 
     mCountCompleted++;
 
+    S32 bytes_fetched = 0;
     LLSD httpResults = result[LLCoreHttpUtil::HttpCoroutineAdapter::HTTP_RESULTS];
     LLCore::HttpStatus status = LLCoreHttpUtil::HttpCoroutineAdapter::getStatusFromLLSD(httpResults);
     if (!status)
@@ -554,7 +554,7 @@ void LLViewerAssetStorage::assetRequestCoro(
             LLUUID temp_id;
             temp_id.generate();
             LLFileSystem vf(temp_id, atype, LLFileSystem::WRITE);
-            req->mBytesFetched = size;
+            bytes_fetched = size;
             if (!vf.write(raw.data(),size))
             {
                 // TODO asset-http: handle error
@@ -583,7 +583,7 @@ void LLViewerAssetStorage::assetRequestCoro(
     }
 
     // Clean up pending downloads and trigger callbacks
-    removeAndCallbackPendingDownloads(uuid, atype, uuid, atype, result_code, ext_status);
+    removeAndCallbackPendingDownloads(uuid, atype, uuid, atype, result_code, ext_status, bytes_fetched);
 }
 
 std::string LLViewerAssetStorage::getAssetURL(const std::string& cap_url, const LLUUID& uuid, LLAssetType::EType atype)
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h
index fdb8af7457..42dd9d1dd8 100644
--- a/indra/newview/llviewerassetstorage.h
+++ b/indra/newview/llviewerassetstorage.h
@@ -82,8 +82,7 @@ protected:
 
     void capsRecvForRegion(const LLUUID& region_id, std::string pumpname);
 
-    void assetRequestCoro(LLViewerAssetRequest *req,
-                          const LLUUID uuid,
+    void assetRequestCoro(const LLUUID uuid,
                           LLAssetType::EType atype,
                           LLGetAssetCallback callback,
                           void *user_data);
diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp
index b3b4f43e57..404297c58f 100644
--- a/indra/newview/llvieweraudio.cpp
+++ b/indra/newview/llvieweraudio.cpp
@@ -541,8 +541,8 @@ void audio_update_wind(bool force_update)
         // whereas steady-state avatar walk velocity is only 3.2 m/s.
         // Without this the world feels desolate on first login when you are
         // standing still.
-        const F32 WIND_LEVEL = 0.5f;
-        LLVector3 scaled_wind_vec = gWindVec * WIND_LEVEL;
+        static LLUICachedControl<F32> wind_level("AudioLevelWind", 0.5f);
+        LLVector3 scaled_wind_vec = gWindVec * wind_level;
 
         // Mix in the avatar's motion, subtract because when you walk north,
         // the apparent wind moves south.
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index b34c8600f7..1333c2cd2f 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -215,11 +215,15 @@ void display_update_camera()
         final_far = gSavedSettings.getF32("RenderReflectionProbeDrawDistance");
     }
     else if (CAMERA_MODE_CUSTOMIZE_AVATAR == gAgentCamera.getCameraMode())
-
     {
         final_far *= 0.5f;
     }
+    else if (LLViewerTexture::sDesiredDiscardBias > 2.f)
+    {
+        final_far = llmax(32.f, final_far / (LLViewerTexture::sDesiredDiscardBias - 1.f));
+    }
     LLViewerCamera::getInstance()->setFar(final_far);
+    LLVOAvatar::sRenderDistance = llclamp(final_far, 16.f, 256.f);
     gViewerWindow->setup3DRender();
 
     if (!gCubeSnapshot)
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index ef68609182..95c2a77ba8 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -137,6 +137,7 @@
 #include "llfloatersettingscolor.h"
 #include "llfloatersettingsdebug.h"
 #include "llfloatersidepanelcontainer.h"
+#include "llfloaterslapptest.h"
 #include "llfloatersnapshot.h"
 #include "llfloatersounddevices.h"
 #include "llfloaterspellchecksettings.h"
@@ -278,7 +279,8 @@ public:
                 "upload_model",
                 "upload_script",
                 "upload_sound",
-                "bulk_upload"
+                "bulk_upload",
+                "slapp_test"
             };
             return std::find(blacklist_untrusted.begin(), blacklist_untrusted.end(), fl_name) == blacklist_untrusted.end();
         }
@@ -499,6 +501,7 @@ void LLViewerFloaterReg::registerFloaters()
     LLFloaterReg::add("search", "floater_search.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSearch>);
     LLFloaterReg::add("profile", "floater_profile.xml",(LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterProfile>);
     LLFloaterReg::add("guidebook", "floater_how_to.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterHowTo>);
+    LLFloaterReg::add("slapp_test", "floater_test_slapp.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSLappTest>);
 
     LLFloaterReg::add("big_preview", "floater_big_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBigPreview>);
 
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index ce66dbc03f..9743ec0c59 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -932,6 +932,7 @@ class LLFileTakeSnapshotToDisk : public view_listener_t
         bool render_ui = gSavedSettings.getBOOL("RenderUIInSnapshot");
         bool render_hud = gSavedSettings.getBOOL("RenderHUDInSnapshot");
         bool render_no_post = gSavedSettings.getBOOL("RenderSnapshotNoPost");
+        bool render_balance = gSavedSettings.getBOOL("RenderBalanceInSnapshot");
 
         bool high_res = gSavedSettings.getBOOL("HighResSnapshot");
         if (high_res)
@@ -952,6 +953,7 @@ class LLFileTakeSnapshotToDisk : public view_listener_t
                                        render_hud,
                                        false,
                                        render_no_post,
+                                       render_balance,
                                        LLSnapshotModel::SNAPSHOT_TYPE_COLOR,
                                        high_res ? S32_MAX : MAX_SNAPSHOT_IMAGE_SIZE)) //per side
         {
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 5fd820f91d..b274ba5abb 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5039,6 +5039,7 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
                                         false, //UI
                                         gSavedSettings.getBOOL("RenderHUDInSnapshot"),
                                         false,
+                                        false,
                                         LLSnapshotModel::SNAPSHOT_TYPE_COLOR,
                                         LLSnapshotModel::SNAPSHOT_FORMAT_PNG);
         }
@@ -5144,6 +5145,7 @@ static void process_special_alert_messages(const std::string & message)
                                     false,
                                     gSavedSettings.getBOOL("RenderHUDInSnapshot"),
                                     false,
+                                    false,
                                     LLSnapshotModel::SNAPSHOT_TYPE_COLOR,
                                     LLSnapshotModel::SNAPSHOT_FORMAT_PNG);
     }
@@ -6641,7 +6643,6 @@ void process_initiate_download(LLMessageSystem* msg, void**)
         (void**)new std::string(viewer_filename));
 }
 
-
 void process_script_teleport_request(LLMessageSystem* msg, void**)
 {
     if (!gSavedSettings.getBOOL("ScriptsCanShowUI")) return;
@@ -6655,6 +6656,11 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
     msg->getString("Data", "SimName", sim_name);
     msg->getVector3("Data", "SimPosition", pos);
     msg->getVector3("Data", "LookAt", look_at);
+    U32 flags = (BEACON_SHOW_MAP | BEACON_FOCUS_MAP);
+    if (msg->has("Options"))
+    {
+        msg->getU32("Options", "Flags", flags);
+    }
 
     LLFloaterWorldMap* instance = LLFloaterWorldMap::getInstance();
     if(instance)
@@ -6665,7 +6671,13 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
             << LL_ENDL;
 
         instance->trackURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]);
-        LLFloaterReg::showInstance("world_map", "center");
+        if (flags & BEACON_SHOW_MAP)
+        {
+            bool old_auto_focus = instance->getAutoFocus();
+            instance->setAutoFocus(flags & BEACON_FOCUS_MAP);
+            instance->openFloater("center");
+            instance->setAutoFocus(old_auto_focus);
+        }
     }
 
     // remove above two lines and replace with below line
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 030dfeaa6f..8d90187e91 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2325,6 +2325,12 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 
         // Set the rotation of the object followed by adjusting for the accumulated angular velocity (llSetTargetOmega)
         setRotation(new_rot * mAngularVelocityRot);
+        if ((mFlags & FLAGS_SERVER_AUTOPILOT) && asAvatar() && asAvatar()->isSelf())
+        {
+            gAgent.resetAxes();
+            gAgent.rotate(new_rot);
+            gAgentCamera.resetView();
+        }
         setChanged(ROTATED | SILHOUETTE);
     }
 
@@ -4820,6 +4826,18 @@ void LLViewerObject::setPositionParent(const LLVector3 &pos_parent, bool damped)
     else
     {
         setPositionRegion(pos_parent, damped);
+
+        // #1964 mark reflection probe in the linkset to update position after moving via script
+        for (LLViewerObject* child : mChildList)
+        {
+            if (child && child->isReflectionProbe())
+            {
+                if (LLDrawable* drawablep = child->mDrawable)
+                {
+                    gPipeline.markMoved(drawablep);
+                }
+            }
+        }
     }
 }
 
@@ -7670,6 +7688,31 @@ void LLViewerObject::setGLTFAsset(const LLUUID& id)
     updateVolume(volume_params);
 }
 
+void LLViewerObject::clearTEWaterExclusion(const U8 te)
+{
+    if (permModify())
+    {
+        LLViewerTexture* image = getTEImage(te);
+        if (image && (IMG_ALPHA_GRAD == image->getID()))
+        {
+            // reset texture to default plywood
+            setTEImage(te, LLViewerTextureManager::getFetchedTexture(DEFAULT_OBJECT_TEXTURE, FTT_DEFAULT, true, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE));
+
+            // reset texture repeats, that might be altered by invisiprim script from wiki
+            U32 s_axis, t_axis;
+            if (!LLPrimitive::getTESTAxes(te, &s_axis, &t_axis))
+            {
+                return;
+            }
+            F32 DEFAULT_REPEATS = 2.f;
+            F32 new_s = getScale().mV[s_axis] * DEFAULT_REPEATS;
+            F32 new_t = getScale().mV[t_axis] * DEFAULT_REPEATS;
+
+            setTEScale(te, new_s, new_t);
+            sendTEUpdate();
+        }
+    }
+}
 
 class ObjectPhysicsProperties : public LLHTTPNode
 {
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 63458e60ea..2b52ea2076 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -405,6 +405,8 @@ public:
     LLViewerTexture     *getTENormalMap(const U8 te) const;
     LLViewerTexture     *getTESpecularMap(const U8 te) const;
 
+    void clearTEWaterExclusion(const U8 te);
+
     bool                        isImageAlphaBlended(const U8 te) const;
 
     void fitFaceTexture(const U8 face);
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 8e6657b4b9..66a19d3601 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -42,6 +42,7 @@
 // Viewer includes
 #include "llagent.h"
 #include "llagentaccess.h"
+#include "llcallbacklist.h"
 #include "llviewerparcelaskplay.h"
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
@@ -1750,6 +1751,8 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
                 {
                     instance->mTeleportFinishedSignal(instance->mTeleportInProgressPosition, false);
                 }
+                instance->postTeleportFinished(instance->mTeleportWithinRegion);
+                instance->mTeleportWithinRegion = false;
             }
             parcel->setParcelEnvironmentVersion(parcel_environment_version);
             LL_DEBUGS("ENVIRONMENT") << "Parcel environment version is " << parcel->getParcelEnvironmentVersion() << LL_ENDL;
@@ -2719,6 +2722,8 @@ void LLViewerParcelMgr::onTeleportFinished(bool local, const LLVector3d& new_pos
         // Local teleport. We already have the agent parcel data.
         // Emit the signal immediately.
         getInstance()->mTeleportFinishedSignal(new_pos, local);
+
+        postTeleportFinished(true);
     }
     else
     {
@@ -2727,12 +2732,14 @@ void LLViewerParcelMgr::onTeleportFinished(bool local, const LLVector3d& new_pos
         // Let's wait for the update and then emit the signal.
         mTeleportInProgressPosition = new_pos;
         mTeleportInProgress = true;
+        mTeleportWithinRegion = local;
     }
 }
 
 void LLViewerParcelMgr::onTeleportFailed()
 {
     mTeleportFailedSignal();
+    LLEventPumps::instance().obtain("LLTeleport").post(llsd::map("success", false));
 }
 
 bool  LLViewerParcelMgr::getTeleportInProgress()
@@ -2740,3 +2747,20 @@ bool  LLViewerParcelMgr::getTeleportInProgress()
     return mTeleportInProgress // case where parcel data arrives after teleport
         || gAgent.getTeleportState() > LLAgent::TELEPORT_NONE; // For LOCAL, no mTeleportInProgress
 }
+
+void LLViewerParcelMgr::postTeleportFinished(bool local)
+{
+    auto post = []()
+    {
+        LLEventPumps::instance().obtain("LLTeleport").post(llsd::map("success", true));
+    };
+    if (local)
+    {
+        static LLCachedControl<F32> teleport_local_delay(gSavedSettings, "TeleportLocalDelay");
+        doAfterInterval(post, teleport_local_delay + 0.5f);
+    }
+    else
+    {
+        post();
+    }
+}
diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h
index 974ea39359..95d693662e 100644
--- a/indra/newview/llviewerparcelmgr.h
+++ b/indra/newview/llviewerparcelmgr.h
@@ -295,6 +295,8 @@ public:
     void onTeleportFailed();
     bool getTeleportInProgress();
 
+    void postTeleportFinished(bool local);
+
     static bool isParcelOwnedByAgent(const LLParcel* parcelp, U64 group_proxy_power);
     static bool isParcelModifiableByAgent(const LLParcel* parcelp, U64 group_proxy_power);
 
@@ -344,7 +346,9 @@ private:
 
     std::vector<LLParcelObserver*> mObservers;
 
+    // Used to communicate between onTeleportFinished() and processParcelProperties()
     bool                        mTeleportInProgress;
+    bool                        mTeleportWithinRegion{ false };
     LLVector3d                  mTeleportInProgressPosition;
     teleport_finished_signal_t  mTeleportFinishedSignal;
     teleport_failed_signal_t    mTeleportFailedSignal;
diff --git a/indra/newview/llviewerparceloverlay.cpp b/indra/newview/llviewerparceloverlay.cpp
index 2e9b5de72b..da03d3b015 100755
--- a/indra/newview/llviewerparceloverlay.cpp
+++ b/indra/newview/llviewerparceloverlay.cpp
@@ -581,7 +581,7 @@ void LLViewerParcelOverlay::addPropertyLine(F32 start_x, F32 start_y, F32 dx, F3
     outside_y += dy * (dy - LINE_WIDTH);
 
     // Middle part, full width
-    const S32 GRID_STEP = S32( PARCEL_GRID_STEP_METERS );
+    const S32 GRID_STEP = (S32)PARCEL_GRID_STEP_METERS;
     for (S32 i = 1; i < GRID_STEP; i++)
     {
         inside_z = land.resolveHeightRegion( inside_x, inside_y );
@@ -666,7 +666,9 @@ void LLViewerParcelOverlay::renderPropertyLines()
         return;
 
     LLSurface& land = mRegion->getLand();
-    F32 water_z = land.getWaterHeight() + 0.01f;
+
+    bool render_water = gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_WATER);
+    F32 water_z = render_water ? land.getWaterHeight() + 0.01f : 0;
 
     LLGLSUIDefault gls_ui; // called from pipeline
     gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index a0723db479..4a9dd1c1b6 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -504,8 +504,11 @@ void LLViewerTexture::updateClass()
     // NOTE: our metrics miss about half the vram we use, so this biases high but turns out to typically be within 5% of the real number
     F32 used = (F32)ll_round(texture_bytes_alloc + vertex_bytes_alloc);
 
-    F32 budget = max_vram_budget == 0 ? (F32)gGLManager.mVRAM : (F32)max_vram_budget;
-    budget /= tex_vram_divisor;
+    // For debugging purposes, it's useful to be able to set the VRAM budget manually.
+    // But when manual control is not enabled, use the VRAM divisor.
+    // While we're at it, assume we have 1024 to play with at minimum when the divisor is in use.  Works more elegantly with the logic below this.
+    // -Geenz 2025-03-21
+    F32 budget = max_vram_budget == 0 ? llmax(1024, (F32)gGLManager.mVRAM / tex_vram_divisor) : (F32)max_vram_budget;
 
     // Try to leave at least half a GB for everyone else and for bias,
     // but keep at least 768MB for ourselves
@@ -519,7 +522,6 @@ void LLViewerTexture::updateClass()
 
     bool is_sys_low = isSystemMemoryLow();
     bool is_low = is_sys_low || over_pct > 0.f;
-    F32 discard_bias = sDesiredDiscardBias;
 
     static bool was_low = false;
     static bool was_sys_low = false;
@@ -571,6 +573,7 @@ void LLViewerTexture::updateClass()
 
     // set to max discard bias if the window has been backgrounded for a while
     static F32 last_desired_discard_bias = 1.f;
+    static F32 last_texture_update_count_bias = 1.f;
     static bool was_backgrounded = false;
     static LLFrameTimer backgrounded_timer;
     static LLCachedControl<F32> minimized_discard_time(gSavedSettings, "TextureDiscardMinimizedTime", 1.f);
@@ -606,12 +609,21 @@ void LLViewerTexture::updateClass()
     }
 
     sDesiredDiscardBias = llclamp(sDesiredDiscardBias, 1.f, 4.f);
-    if (discard_bias != sDesiredDiscardBias)
+    if (last_texture_update_count_bias < sDesiredDiscardBias)
     {
-        // bias changed, reset texture update counter to
+        // bias increased, reset texture update counter to
         // let updates happen at an increased rate.
+        last_texture_update_count_bias = sDesiredDiscardBias;
         sBiasTexturesUpdated = 0;
     }
+    else if (last_texture_update_count_bias > sDesiredDiscardBias + 0.1f)
+    {
+        // bias decreased, 0.1f is there to filter out small fluctuations
+        // and not reset sBiasTexturesUpdated too often.
+        // Bias jumps to 1.5 at low memory, so getting stuck at 1.1 is not
+        // a problem.
+        last_texture_update_count_bias = sDesiredDiscardBias;
+    }
 
     LLViewerTexture::sFreezeImageUpdates = false;
 }
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index ae723b4068..0d02dc034e 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -899,6 +899,9 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag
 {
     llassert(!gCubeSnapshot);
 
+    constexpr F32 BIAS_TRS_OUT_OF_SCREEN = 1.5f;
+    constexpr F32 BIAS_TRS_ON_SCREEN = 1.f;
+
     if (imagep->getBoostLevel() < LLViewerFetchedTexture::BOOST_HIGH)  // don't bother checking face list for boosted textures
     {
         static LLCachedControl<F32> texture_scale_min(gSavedSettings, "TextureScaleMinAreaFactor", 0.0095f);
@@ -940,7 +943,7 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag
 
                     F32 vsize = face->getPixelArea();
 
-                    on_screen = face->mInFrustum;
+                    on_screen |= face->mInFrustum;
 
                     // Scale desired texture resolution higher or lower depending on texture scale
                     //
@@ -958,7 +961,8 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag
                     vsize /= min_scale;
 
                     // apply bias to offscreen faces all the time, but only to onscreen faces when bias is large
-                    if (!face->mInFrustum || LLViewerTexture::sDesiredDiscardBias > 2.f)
+                    // use mImportanceToCamera to make bias switch a bit more gradual
+                    if (!face->mInFrustum || LLViewerTexture::sDesiredDiscardBias > 1.9f + face->mImportanceToCamera / 2.f)
                     {
                         vsize /= bias;
                     }
@@ -971,14 +975,28 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag
                     }
 
                     max_vsize = llmax(max_vsize, vsize);
+
+                    // addTextureStats limits size to sMaxVirtualSize
+                    if (max_vsize >= LLViewerFetchedTexture::sMaxVirtualSize
+                        && (on_screen || LLViewerTexture::sDesiredDiscardBias <= BIAS_TRS_ON_SCREEN))
+                    {
+                        break;
+                    }
                 }
             }
+
+            if (max_vsize >= LLViewerFetchedTexture::sMaxVirtualSize
+                && (on_screen || LLViewerTexture::sDesiredDiscardBias <= BIAS_TRS_ON_SCREEN))
+            {
+                break;
+            }
         }
 
         if (face_count > 1024)
         { // this texture is used in so many places we should just boost it and not bother checking its vsize
             // this is especially important because the above is not time sliced and can hit multiple ms for a single texture
             imagep->setBoostLevel(LLViewerFetchedTexture::BOOST_HIGH);
+            // Do we ever remove it? This also sets texture nodelete!
         }
 
         if (imagep->getType() == LLViewerTexture::LOD_TEXTURE && imagep->getBoostLevel() == LLViewerTexture::BOOST_NONE)
@@ -986,8 +1004,8 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag
           // this is an alternative to decaying mMaxVirtualSize over time
           // that keeps textures from continously downrezzing and uprezzing in the background
 
-        if (LLViewerTexture::sDesiredDiscardBias > 1.5f ||
-                (!on_screen && LLViewerTexture::sDesiredDiscardBias > 1.f))
+            if (LLViewerTexture::sDesiredDiscardBias > BIAS_TRS_OUT_OF_SCREEN ||
+                (!on_screen && LLViewerTexture::sDesiredDiscardBias > BIAS_TRS_ON_SCREEN))
             {
                 imagep->mMaxVirtualSize = 0.f;
             }
@@ -1419,6 +1437,15 @@ bool LLViewerTextureList::createUploadFile(const std::string& filename,
         image->setLastError("Couldn't load the image to be uploaded.");
         return false;
     }
+
+    // calcDataSizeJ2C assumes maximum size is 2048 and for bigger images can
+    // assign discard to bring imige to needed size, but upload does the scaling
+    // as needed, so just reset discard.
+    // Assume file is full and has 'discard' 0 data.
+    // Todo: probably a better idea to have some setMaxDimentions in J2C
+    // called when loading from a local file
+    image->setDiscardLevel(0);
+
     // Decompress or expand it in a raw image structure
     LLPointer<LLImageRaw> raw_image = new LLImageRaw;
     if (!image->decode(raw_image, 0.0f))
diff --git a/indra/newview/llviewerthrottle.cpp b/indra/newview/llviewerthrottle.cpp
index b0a00c29a4..8d935e4243 100644
--- a/indra/newview/llviewerthrottle.cpp
+++ b/indra/newview/llviewerthrottle.cpp
@@ -48,6 +48,8 @@ const F32 MIN_FRACTIONAL = 0.2f;
 const F32 MIN_BANDWIDTH = 50.f;
 const F32 MAX_BANDWIDTH = 6000.f;
 const F32 STEP_FRACTIONAL = 0.1f;
+const F32 HIGH_BUFFER_LOAD_TRESHOLD = 1.f;
+const F32 LOW_BUFFER_LOAD_TRESHOLD = 0.8f;
 const LLUnit<F32, LLUnits::Percent> TIGHTEN_THROTTLE_THRESHOLD(3.0f); // packet loss % per s
 const LLUnit<F32, LLUnits::Percent> EASE_THROTTLE_THRESHOLD(0.5f); // packet loss % per s
 const F32 DYNAMIC_UPDATE_DURATION = 5.0f; // seconds
@@ -146,7 +148,7 @@ LLViewerThrottleGroup LLViewerThrottleGroup::operator-(const LLViewerThrottleGro
 
 void LLViewerThrottleGroup::sendToSim() const
 {
-    LL_INFOS() << "Sending throttle settings, total BW " << mThrottleTotal << LL_ENDL;
+    LL_DEBUGS("Throttle") << "Sending throttle settings, total BW " << mThrottleTotal << LL_ENDL;
     LLMessageSystem* msg = gMessageSystem;
 
     msg->newMessageFast(_PREHASH_AgentThrottle);
@@ -305,7 +307,10 @@ void LLViewerThrottle::updateDynamicThrottle()
     mUpdateTimer.reset();
 
     LLUnit<F32, LLUnits::Percent> mean_packets_lost = LLViewerStats::instance().getRecording().getMean(LLStatViewer::PACKETS_LOST_PERCENT);
-    if (mean_packets_lost > TIGHTEN_THROTTLE_THRESHOLD)
+    if (
+        mean_packets_lost > TIGHTEN_THROTTLE_THRESHOLD // already losing packets
+        || mBufferLoadRate >= HIGH_BUFFER_LOAD_TRESHOLD // let viewer sort through the backlog before it starts dropping packets
+        )
     {
         if (mThrottleFrac <= MIN_FRACTIONAL || mCurrentBandwidth / 1024.0f <= MIN_BANDWIDTH)
         {
@@ -318,7 +323,8 @@ void LLViewerThrottle::updateDynamicThrottle()
         mCurrent.sendToSim();
         LL_INFOS() << "Tightening network throttle to " << mCurrentBandwidth << LL_ENDL;
     }
-    else if (mean_packets_lost <= EASE_THROTTLE_THRESHOLD)
+    else if (mean_packets_lost <= EASE_THROTTLE_THRESHOLD
+             && mBufferLoadRate < LOW_BUFFER_LOAD_TRESHOLD)
     {
         if (mThrottleFrac >= MAX_FRACTIONAL || mCurrentBandwidth / 1024.0f >= MAX_BANDWIDTH)
         {
@@ -331,4 +337,6 @@ void LLViewerThrottle::updateDynamicThrottle()
         mCurrent.sendToSim();
         LL_INFOS() << "Easing network throttle to " << mCurrentBandwidth << LL_ENDL;
     }
+
+    mBufferLoadRate = 0;
 }
diff --git a/indra/newview/llviewerthrottle.h b/indra/newview/llviewerthrottle.h
index 28a24d04fc..9973c88549 100644
--- a/indra/newview/llviewerthrottle.h
+++ b/indra/newview/llviewerthrottle.h
@@ -70,12 +70,15 @@ public:
     void updateDynamicThrottle();
     void resetDynamicThrottle();
 
+    void setBufferLoadRate(F32 rate) { mBufferLoadRate = llmax(mBufferLoadRate, rate); }
+
     LLViewerThrottleGroup getThrottleGroup(const F32 bandwidth_kbps);
 
     static const std::string sNames[TC_EOF];
 protected:
     F32 mMaxBandwidth;
     F32 mCurrentBandwidth;
+    F32 mBufferLoadRate = 0;
 
     LLViewerThrottleGroup mCurrent;
 
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index bae7518e66..f8017bb4ed 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -489,7 +489,8 @@ public:
 
         clearText();
 
-        if (gSavedSettings.getBOOL("DebugShowTime"))
+        static LLCachedControl<bool> debug_show_time(gSavedSettings, "DebugShowTime", false);
+        if (debug_show_time())
         {
             F32 time = gFrameTimeSeconds;
             S32 hours = (S32)(time / (60*60));
@@ -498,7 +499,8 @@ public:
             addText(xpos, ypos, llformat("Time: %d:%02d:%02d", hours,mins,secs)); ypos += y_inc;
         }
 
-        if (gSavedSettings.getBOOL("DebugShowMemory"))
+        static LLCachedControl<bool> debug_show_memory(gSavedSettings, "DebugShowMemory", false);
+        if (debug_show_memory())
         {
             addText(xpos, ypos,
                     STRINGIZE("Memory: " << (LLMemory::getCurrentRSS() / 1024) << " (KB)"));
@@ -591,7 +593,8 @@ public:
             ypos += y_inc;
         }*/
 
-        if (gSavedSettings.getBOOL("DebugShowRenderInfo"))
+        static LLCachedControl<bool> debug_show_render_info(gSavedSettings, "DebugShowRenderInfo", false);
+        if (debug_show_render_info())
         {
             LLTrace::Recording& last_frame_recording = LLTrace::get_frame_recording().getLastRecording();
 
@@ -730,7 +733,8 @@ public:
 
             gPipeline.mNumVisibleNodes = LLPipeline::sVisibleLightCount = 0;
         }
-        if (gSavedSettings.getBOOL("DebugShowAvatarRenderInfo"))
+        static LLCachedControl<bool> debug_show_avatar_render_info(gSavedSettings, "DebugShowAvatarRenderInfo", false);
+        if (debug_show_avatar_render_info())
         {
             std::map<std::string, LLVOAvatar*> sorted_avs;
             {
@@ -763,7 +767,8 @@ public:
                 av_iter++;
             }
         }
-        if (gSavedSettings.getBOOL("DebugShowRenderMatrices"))
+        static LLCachedControl<bool> debug_show_render_matrices(gSavedSettings, "DebugShowRenderMatrices", false);
+        if (debug_show_render_matrices())
         {
             char camera_lines[8][32];
             memset(camera_lines, ' ', sizeof(camera_lines));
@@ -789,7 +794,8 @@ public:
             ypos += y_inc;
         }
         // disable use of glReadPixels which messes up nVidia nSight graphics debugging
-        if (gSavedSettings.getBOOL("DebugShowColor") && !LLRender::sNsightDebugSupport)
+        static LLCachedControl<bool> debug_show_color(gSavedSettings, "DebugShowColor", false);
+        if (debug_show_color() && !LLRender::sNsightDebugSupport)
         {
             U8 color[4];
             LLCoordGL coord = gViewerWindow->getCurrentMouse();
@@ -881,7 +887,8 @@ public:
             }
         }
 
-        if (gSavedSettings.getBOOL("DebugShowTextureInfo"))
+        static LLCachedControl<bool> debug_show_texture_info(gSavedSettings, "DebugShowTextureInfo", false);
+        if (debug_show_texture_info())
         {
             LLViewerObject* objectp = NULL ;
 
@@ -1450,10 +1457,13 @@ void LLViewerWindow::handleMouseLeave(LLWindow *window)
 
 bool LLViewerWindow::handleCloseRequest(LLWindow *window)
 {
-    // User has indicated they want to close, but we may need to ask
-    // about modified documents.
-    LLAppViewer::instance()->userQuit();
-    // Don't quit immediately
+    if (!LLApp::isExiting() && !LLApp::isStopped())
+    {
+        // User has indicated they want to close, but we may need to ask
+        // about modified documents.
+        LLAppViewer::instance()->userQuit();
+        // Don't quit immediately
+    }
     return false;
 }
 
@@ -1597,7 +1607,8 @@ bool LLViewerWindow::handleActivate(LLWindow *window, bool activated)
         mActive = false;
 
         // if the user has chosen to go Away automatically after some time, then go Away when minimizing
-        if (gSavedSettings.getS32("AFKTimeout"))
+        static LLCachedControl<S32> afk_time(gSavedSettings, "AFKTimeout", 300);
+        if (afk_time())
         {
             gAgent.setAFK();
         }
@@ -4849,12 +4860,12 @@ void LLViewerWindow::movieSize(S32 new_width, S32 new_height)
     }
 }
 
-bool LLViewerWindow::saveSnapshot(const std::string& filepath, S32 image_width, S32 image_height, bool show_ui, bool show_hud, bool do_rebuild, LLSnapshotModel::ESnapshotLayerType type, LLSnapshotModel::ESnapshotFormat format)
+bool LLViewerWindow::saveSnapshot(const std::string& filepath, S32 image_width, S32 image_height, bool show_ui, bool show_hud, bool do_rebuild, bool show_balance, LLSnapshotModel::ESnapshotLayerType type, LLSnapshotModel::ESnapshotFormat format)
 {
     LL_INFOS() << "Saving snapshot to: " << filepath << LL_ENDL;
 
     LLPointer<LLImageRaw> raw = new LLImageRaw;
-    bool success = rawSnapshot(raw, image_width, image_height, true, false, show_ui, show_hud, do_rebuild);
+    bool success = rawSnapshot(raw, image_width, image_height, true, false, show_ui, show_hud, do_rebuild, show_balance);
 
     if (success)
     {
@@ -4915,14 +4926,14 @@ void LLViewerWindow::resetSnapshotLoc() const
 
 bool LLViewerWindow::thumbnailSnapshot(LLImageRaw *raw, S32 preview_width, S32 preview_height, bool show_ui, bool show_hud, bool do_rebuild, bool no_post, LLSnapshotModel::ESnapshotLayerType type)
 {
-    return rawSnapshot(raw, preview_width, preview_height, false, false, show_ui, show_hud, do_rebuild, no_post, type);
+    return rawSnapshot(raw, preview_width, preview_height, false, false, show_ui, show_hud, do_rebuild, no_post, gSavedSettings.getBOOL("RenderBalanceInSnapshot"), type);
 }
 
 // Saves the image from the screen to a raw image
 // Since the required size might be bigger than the available screen, this method rerenders the scene in parts (called subimages) and copy
 // the results over to the final raw image.
 bool LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height,
-    bool keep_window_aspect, bool is_texture, bool show_ui, bool show_hud, bool do_rebuild, bool no_post, LLSnapshotModel::ESnapshotLayerType type, S32 max_size)
+    bool keep_window_aspect, bool is_texture, bool show_ui, bool show_hud, bool do_rebuild, bool no_post, bool show_balance, LLSnapshotModel::ESnapshotLayerType type, S32 max_size)
 {
     if (!raw)
     {
@@ -4980,6 +4991,8 @@ bool LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
         // If the user wants the UI, limit the output size to the available screen size
         image_width  = llmin(image_width, window_width);
         image_height = llmin(image_height, window_height);
+
+        setBalanceVisible(show_balance);
     }
 
     S32 original_width = 0;
@@ -5057,11 +5070,13 @@ bool LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
     }
     else
     {
+        setBalanceVisible(true);
         return false;
     }
 
     if (raw->isBufferInvalid())
     {
+        setBalanceVisible(true);
         return false;
     }
 
@@ -5237,6 +5252,7 @@ bool LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei
     {
         send_agent_resume();
     }
+    setBalanceVisible(true);
 
     return ret;
 }
@@ -5702,6 +5718,14 @@ void LLViewerWindow::setProgressCancelButtonVisible( bool b, const std::string&
     }
 }
 
+void LLViewerWindow::setBalanceVisible(bool visible)
+{
+    if (gStatusBar)
+    {
+        gStatusBar->setBalanceVisible(visible);
+    }
+}
+
 LLProgressView *LLViewerWindow::getProgressView() const
 {
     return mProgressView;
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index ac0dfa3fe4..d55c2d3817 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -364,9 +364,11 @@ public:
     // snapshot functionality.
     // perhaps some of this should move to llfloatershapshot?  -MG
 
-    bool            saveSnapshot(const std::string&  filename, S32 image_width, S32 image_height, bool show_ui = true, bool show_hud = true, bool do_rebuild = false, LLSnapshotModel::ESnapshotLayerType type = LLSnapshotModel::SNAPSHOT_TYPE_COLOR, LLSnapshotModel::ESnapshotFormat format = LLSnapshotModel::SNAPSHOT_FORMAT_BMP);
-    bool            rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, bool keep_window_aspect = true, bool is_texture = false,
-        bool show_ui = true, bool show_hud = true, bool do_rebuild = false, bool no_post = false, LLSnapshotModel::ESnapshotLayerType type = LLSnapshotModel::SNAPSHOT_TYPE_COLOR, S32 max_size = MAX_SNAPSHOT_IMAGE_SIZE);
+    bool saveSnapshot(const std::string&  filename, S32 image_width, S32 image_height, bool show_ui = true, bool show_hud = true, bool do_rebuild = false, bool show_balance = true,
+                     LLSnapshotModel::ESnapshotLayerType type = LLSnapshotModel::SNAPSHOT_TYPE_COLOR, LLSnapshotModel::ESnapshotFormat format = LLSnapshotModel::SNAPSHOT_FORMAT_BMP);
+    bool rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, bool keep_window_aspect = true, bool is_texture = false,
+                     bool show_ui = true, bool show_hud = true, bool do_rebuild = false, bool no_post = false, bool show_balance = true,
+                     LLSnapshotModel::ESnapshotLayerType type = LLSnapshotModel::SNAPSHOT_TYPE_COLOR, S32 max_size = MAX_SNAPSHOT_IMAGE_SIZE);
 
     bool            simpleSnapshot(LLImageRaw *raw, S32 image_width, S32 image_height, const int num_render_passes);
 
@@ -462,6 +464,8 @@ public:
     void            calcDisplayScale();
     static LLRect   calcScaledRect(const LLRect & rect, const LLVector2& display_scale);
 
+    void setBalanceVisible(bool visible);
+
     static std::string getLastSnapshotDir();
 
     LLView* getFloaterSnapRegion() { return mFloaterSnapRegion; }
diff --git a/indra/newview/llviewerwindowlistener.cpp b/indra/newview/llviewerwindowlistener.cpp
index da7e18af5c..3119c31613 100644
--- a/indra/newview/llviewerwindowlistener.cpp
+++ b/indra/newview/llviewerwindowlistener.cpp
@@ -100,7 +100,7 @@ void LLViewerWindowListener::saveSnapshot(const LLSD& event) const
         }
         type = found->second;
     }
-    bool ok = mViewerWindow->saveSnapshot(event["filename"], width, height, showui, showhud, rebuild, type);
+    bool ok = mViewerWindow->saveSnapshot(event["filename"], width, height, showui, showhud, rebuild, true /*L$ Balance*/, type);
     sendReply(LLSDMap("ok", ok), event);
 }
 
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 40312b7f4e..3306289f51 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -122,8 +122,8 @@ extern F32 ANIM_SPEED_MAX;
 extern F32 ANIM_SPEED_MIN;
 extern U32 JOINT_COUNT_REQUIRED_FOR_FULLRIG;
 
-const F32 MAX_HOVER_Z = 2.0;
-const F32 MIN_HOVER_Z = -2.0;
+const F32 MAX_HOVER_Z = 3.0;
+const F32 MIN_HOVER_Z = -3.0;
 
 const F32 MIN_ATTACHMENT_COMPLEXITY = 0.f;
 const F32 DEFAULT_MAX_ATTACHMENT_COMPLEXITY = 1.0e6f;
@@ -10963,8 +10963,7 @@ void LLVOAvatar::idleUpdateRenderComplexity()
     bool autotune = LLPerfStats::tunables.userAutoTuneEnabled && !mIsControlAvatar && !isSelf();
     if (autotune && !isDead())
     {
-        static LLCachedControl<F32> render_far_clip(gSavedSettings, "RenderFarClip", 64);
-        F32 radius = render_far_clip * render_far_clip;
+        F32 radius = sRenderDistance * sRenderDistance;
 
         bool is_nearby = true;
         if ((dist_vec_squared(getPositionGlobal(), gAgent.getPositionGlobal()) > radius) &&
@@ -10996,8 +10995,7 @@ void LLVOAvatar::updateNearbyAvatarCount()
     if (agent_update_timer.getElapsedTimeF32() > 1.0f)
     {
         S32 avs_nearby = 0;
-        static LLCachedControl<F32> render_far_clip(gSavedSettings, "RenderFarClip", 64);
-        F32 radius = render_far_clip * render_far_clip;
+        F32 radius = sRenderDistance * sRenderDistance;
         for (LLCharacter* character : LLCharacter::sInstances)
         {
             LLVOAvatar* avatar = (LLVOAvatar*)character;
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index 263c3dadf6..a2232d21a2 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -547,7 +547,7 @@ public:
     U32         renderTransparent(bool first_pass);
     void        renderCollisionVolumes();
     void        renderBones(const std::string &selected_joint = std::string());
-    void        renderJoints();
+    virtual void renderJoints();
     static void deleteCachedImages(bool clearAll=true);
     static void destroyGL();
     static void restoreGL();
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index 746ef7cacb..f23af5afa4 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -697,6 +697,7 @@ void LLVOAvatarSelf::idleUpdate(LLAgent &agent, const F64 &time)
 // virtual
 LLJoint *LLVOAvatarSelf::getJoint(const std::string &name)
 {
+    std::lock_guard lock(mJointMapMutex);
     LLJoint *jointp = NULL;
     jointp = LLVOAvatar::getJoint(name);
     if (!jointp && mScreenp)
@@ -714,6 +715,14 @@ LLJoint *LLVOAvatarSelf::getJoint(const std::string &name)
     return jointp;
 }
 
+
+//virtual
+void LLVOAvatarSelf::renderJoints()
+{
+    std::lock_guard lock(mJointMapMutex);
+    LLVOAvatar::renderJoints();
+}
+
 // virtual
 bool LLVOAvatarSelf::setVisualParamWeight(const LLVisualParam *which_param, F32 weight)
 {
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index 051ac791c0..f9bea41b1d 100644
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -92,6 +92,8 @@ public:
     /*virtual*/ void        requestStopMotion(LLMotion* motion);
     /*virtual*/ LLJoint*    getJoint(const std::string &name);
 
+    /*virtual*/ void renderJoints();
+
     /*virtual*/ bool setVisualParamWeight(const LLVisualParam *which_param, F32 weight);
     /*virtual*/ bool setVisualParamWeight(const char* param_name, F32 weight);
     /*virtual*/ bool setVisualParamWeight(S32 index, F32 weight);
@@ -103,6 +105,8 @@ private:
     // helper function. Passed in param is assumed to be in avatar's parameter list.
     bool setParamWeight(const LLViewerVisualParam *param, F32 weight);
 
+    std::mutex          mJointMapMutex; // getJoint gets used from mesh thread
+
 /********************************************************************************
  **                                                                            **
  **                    STATE
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
index 3dc3a74062..264c15dc05 100644
--- a/indra/newview/llvoicewebrtc.cpp
+++ b/indra/newview/llvoicewebrtc.cpp
@@ -3028,7 +3028,7 @@ void LLVoiceWebRTCConnection::OnDataReceivedImpl(const std::string &data, bool b
         {
             root["ug"] = user_gain;
         }
-        if (root.size() > 0)
+        if (root.size() > 0 && mWebRTCDataInterface)
         {
             std::string json_data = boost::json::serialize(root);
             mWebRTCDataInterface->sendData(json_data, false);
@@ -3071,7 +3071,10 @@ void LLVoiceWebRTCConnection::OnDataChannelReady(llwebrtc::LLWebRTCDataInterface
 void LLVoiceWebRTCConnection::sendJoin()
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_VOICE;
-
+    if (!mWebRTCDataInterface)
+    {
+        return;
+    }
 
     boost::json::object root;
     boost::json::object join_obj;
diff --git a/indra/newview/llvosurfacepatch.cpp b/indra/newview/llvosurfacepatch.cpp
index 294d36b0a9..bc326a74a8 100644
--- a/indra/newview/llvosurfacepatch.cpp
+++ b/indra/newview/llvosurfacepatch.cpp
@@ -245,6 +245,7 @@ bool LLVOSurfacePatch::updateLOD()
 
 void LLVOSurfacePatch::getTerrainGeometry(LLStrider<LLVector3> &verticesp,
                                               LLStrider<LLVector3> &normalsp,
+                                              LLStrider<LLVector2> &texCoords0p,
                                               LLStrider<LLVector2> &texCoords1p,
                                               LLStrider<U16> &indicesp)
 {
@@ -259,18 +260,21 @@ void LLVOSurfacePatch::getTerrainGeometry(LLStrider<LLVector3> &verticesp,
     updateMainGeometry(facep,
                     verticesp,
                     normalsp,
+                    texCoords0p,
                     texCoords1p,
                     indicesp,
                     index_offset);
     updateNorthGeometry(facep,
                         verticesp,
                         normalsp,
+                        texCoords0p,
                         texCoords1p,
                         indicesp,
                         index_offset);
     updateEastGeometry(facep,
                         verticesp,
                         normalsp,
+                        texCoords0p,
                         texCoords1p,
                         indicesp,
                         index_offset);
@@ -279,6 +283,7 @@ void LLVOSurfacePatch::getTerrainGeometry(LLStrider<LLVector3> &verticesp,
 void LLVOSurfacePatch::updateMainGeometry(LLFace *facep,
                                         LLStrider<LLVector3> &verticesp,
                                         LLStrider<LLVector3> &normalsp,
+                                        LLStrider<LLVector2> &texCoords0p,
                                         LLStrider<LLVector2> &texCoords1p,
                                         LLStrider<U16> &indicesp,
                                         U32 &index_offset)
@@ -317,9 +322,10 @@ void LLVOSurfacePatch::updateMainGeometry(LLFace *facep,
             {
                 x = i * render_stride;
                 y = j * render_stride;
-                mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords1p.get());
+                mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
                 verticesp++;
                 normalsp++;
+                texCoords0p++;
                 texCoords1p++;
             }
         }
@@ -381,6 +387,7 @@ void LLVOSurfacePatch::updateMainGeometry(LLFace *facep,
 void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
                                         LLStrider<LLVector3> &verticesp,
                                         LLStrider<LLVector3> &normalsp,
+                                        LLStrider<LLVector2> &texCoords0p,
                                         LLStrider<LLVector2> &texCoords1p,
                                         LLStrider<U16> &indicesp,
                                         U32 &index_offset)
@@ -414,9 +421,10 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
             x = i * render_stride;
             y = 16 - render_stride;
 
-            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords1p.get());
+            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
             verticesp++;
             normalsp++;
+            texCoords0p++;
             texCoords1p++;
         }
 
@@ -425,9 +433,10 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
         {
             x = i * render_stride;
             y = 16;
-            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords1p.get());
+            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
             verticesp++;
             normalsp++;
+            texCoords0p++;
             texCoords1p++;
         }
 
@@ -460,9 +469,10 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
             x = i * render_stride;
             y = 16 - render_stride;
 
-            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords1p.get());
+            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
             verticesp++;
             normalsp++;
+            texCoords0p++;
             texCoords1p++;
         }
 
@@ -472,9 +482,10 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
             x = i * render_stride;
             y = 16;
 
-            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords1p.get());
+            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
             verticesp++;
             normalsp++;
+            texCoords0p++;
             texCoords1p++;
         }
 
@@ -514,9 +525,10 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
             x = i * north_stride;
             y = 16 - render_stride;
 
-            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords1p.get());
+            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
             verticesp++;
             normalsp++;
+            texCoords0p++;
             texCoords1p++;
         }
 
@@ -526,9 +538,10 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
             x = i * north_stride;
             y = 16;
 
-            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords1p.get());
+            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
             verticesp++;
             normalsp++;
+            texCoords0p++;
             texCoords1p++;
         }
 
@@ -564,6 +577,7 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
                                           LLStrider<LLVector3> &verticesp,
                                           LLStrider<LLVector3> &normalsp,
+                                          LLStrider<LLVector2> &texCoords0p,
                                           LLStrider<LLVector2> &texCoords1p,
                                           LLStrider<U16> &indicesp,
                                           U32 &index_offset)
@@ -592,9 +606,10 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
             x = 16 - render_stride;
             y = i * render_stride;
 
-            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords1p.get());
+            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
             verticesp++;
             normalsp++;
+            texCoords0p++;
             texCoords1p++;
         }
 
@@ -603,9 +618,10 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
         {
             x = 16;
             y = i * render_stride;
-            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords1p.get());
+            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
             verticesp++;
             normalsp++;
+            texCoords0p++;
             texCoords1p++;
         }
 
@@ -638,9 +654,10 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
             x = 16 - render_stride;
             y = i * render_stride;
 
-            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords1p.get());
+            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
             verticesp++;
             normalsp++;
+            texCoords0p++;
             texCoords1p++;
         }
         // Iterate through the east patch's points
@@ -649,9 +666,10 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
             x = 16;
             y = i * render_stride;
 
-            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords1p.get());
+            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
             verticesp++;
             normalsp++;
+            texCoords0p++;
             texCoords1p++;
         }
 
@@ -690,9 +708,10 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
             x = 16 - render_stride;
             y = i * east_stride;
 
-            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords1p.get());
+            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
             verticesp++;
             normalsp++;
+            texCoords0p++;
             texCoords1p++;
         }
         // Iterate through the east patch's points
@@ -701,9 +720,10 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
             x = 16;
             y = i * east_stride;
 
-            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords1p.get());
+            mPatchp->eval(x, y, render_stride, verticesp.get(), normalsp.get(), texCoords0p.get(), texCoords1p.get());
             verticesp++;
             normalsp++;
+            texCoords0p++;
             texCoords1p++;
         }
 
@@ -1022,12 +1042,14 @@ void LLTerrainPartition::getGeometry(LLSpatialGroup* group)
     LLStrider<LLVector3> vertices_start;
     LLStrider<LLVector3> normals_start;
     LLStrider<LLVector4a> tangents_start;
+    LLStrider<LLVector2> texcoords0_start; // ownership overlay
     LLStrider<LLVector2> texcoords2_start;
     LLStrider<U16> indices_start;
 
     llassert_always(buffer->getVertexStrider(vertices_start));
     llassert_always(buffer->getNormalStrider(normals_start));
     llassert_always(buffer->getTangentStrider(tangents_start));
+    llassert_always(buffer->getTexCoord0Strider(texcoords0_start));
     llassert_always(buffer->getTexCoord1Strider(texcoords2_start));
     llassert_always(buffer->getIndexStrider(indices_start));
 
@@ -1037,6 +1059,7 @@ void LLTerrainPartition::getGeometry(LLSpatialGroup* group)
     {
         LLStrider<LLVector3> vertices = vertices_start;
         LLStrider<LLVector3> normals = normals_start;
+        LLStrider<LLVector2> texcoords0 = texcoords0_start;
         LLStrider<LLVector2> texcoords2 = texcoords2_start;
         LLStrider<U16> indices = indices_start;
 
@@ -1049,7 +1072,7 @@ void LLTerrainPartition::getGeometry(LLSpatialGroup* group)
             facep->setVertexBuffer(buffer);
 
             LLVOSurfacePatch* patchp = (LLVOSurfacePatch*) facep->getViewerObject();
-            patchp->getTerrainGeometry(vertices, normals, texcoords2, indices);
+            patchp->getTerrainGeometry(vertices, normals, texcoords0, texcoords2, indices);
 
             indices_index += facep->getIndicesCount();
             index_offset += facep->getGeomCount();
diff --git a/indra/newview/llvosurfacepatch.h b/indra/newview/llvosurfacepatch.h
index af5f05774b..c93a58d2d9 100644
--- a/indra/newview/llvosurfacepatch.h
+++ b/indra/newview/llvosurfacepatch.h
@@ -57,6 +57,7 @@ public:
     /*virtual*/ void        updateFaceSize(S32 idx);
     void getTerrainGeometry(LLStrider<LLVector3> &verticesp,
                                 LLStrider<LLVector3> &normalsp,
+                                LLStrider<LLVector2> &texCoords0p,
                                 LLStrider<LLVector2> &texCoords1p,
                                 LLStrider<U16> &indicesp);
 
@@ -109,18 +110,21 @@ protected:
     void updateMainGeometry(LLFace *facep,
                        LLStrider<LLVector3> &verticesp,
                        LLStrider<LLVector3> &normalsp,
+                       LLStrider<LLVector2> &texCoords0p,
                        LLStrider<LLVector2> &texCoords1p,
                        LLStrider<U16> &indicesp,
                        U32 &index_offset);
     void updateNorthGeometry(LLFace *facep,
                        LLStrider<LLVector3> &verticesp,
                        LLStrider<LLVector3> &normalsp,
+                       LLStrider<LLVector2> &texCoords0p,
                        LLStrider<LLVector2> &texCoords1p,
                        LLStrider<U16> &indicesp,
                        U32 &index_offset);
     void updateEastGeometry(LLFace *facep,
                        LLStrider<LLVector3> &verticesp,
                        LLStrider<LLVector3> &normalsp,
+                       LLStrider<LLVector2> &texCoords0p,
                        LLStrider<LLVector2> &texCoords1p,
                        LLStrider<U16> &indicesp,
                        U32 &index_offset);
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index 8ce1a745c3..c708e804b2 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -33,7 +33,6 @@
 
 #include "llagentwearables.h"
 #include "llappearancemgr.h"
-#include "llinventoryfunctions.h"
 #include "llinventoryicon.h"
 #include "llgesturemgr.h"
 #include "lltransutil.h"
@@ -41,15 +40,6 @@
 #include "llviewermenu.h"
 #include "llvoavatarself.h"
 
-class LLFindOutfitItems : public LLInventoryCollectFunctor
-{
-public:
-    LLFindOutfitItems() {}
-    virtual ~LLFindOutfitItems() {}
-    virtual bool operator()(LLInventoryCategory* cat,
-                            LLInventoryItem* item);
-};
-
 bool LLFindOutfitItems::operator()(LLInventoryCategory* cat,
                                    LLInventoryItem* item)
 {
diff --git a/indra/newview/llwearableitemslist.h b/indra/newview/llwearableitemslist.h
index 3fe1059176..7a5f29020e 100644
--- a/indra/newview/llwearableitemslist.h
+++ b/indra/newview/llwearableitemslist.h
@@ -32,6 +32,7 @@
 #include "llsingleton.h"
 
 // newview
+#include "llinventoryfunctions.h"
 #include "llinventoryitemslist.h"
 #include "llinventorylistitem.h"
 #include "lllistcontextmenu.h"
@@ -507,4 +508,12 @@ protected:
     LLWearableType::EType mMenuWearableType;
 };
 
+class LLFindOutfitItems : public LLInventoryCollectFunctor
+{
+public:
+    LLFindOutfitItems() {}
+    virtual ~LLFindOutfitItems() {}
+    virtual bool operator()(LLInventoryCategory* cat, LLInventoryItem* item);
+};
+
 #endif //LL_LLWEARABLEITEMSLIST_H
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 899733ccc3..47e1815bc2 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -1372,10 +1372,8 @@ void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positi
 
 F32 LLWorld::getNearbyAvatarsAndMaxGPUTime(std::vector<LLVOAvatar*> &valid_nearby_avs)
 {
-    static LLCachedControl<F32> render_far_clip(gSavedSettings, "RenderFarClip", 64);
-
     F32 nearby_max_complexity = 0;
-    F32 radius = render_far_clip * render_far_clip;
+    F32 radius = LLVOAvatar::sRenderDistance * LLVOAvatar::sRenderDistance;
 
     for (LLCharacter* character : LLCharacter::sInstances)
     {
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index e17321e698..f0af4acf20 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -759,7 +759,10 @@
      name="SelectedOutfitTextColor"
      reference="EmphasisColor" />
     <color
-     name="SearchableControlHighlightColor"
+     name="SearchableControlHighlightFontColor"
+     value="1 0 0 1" />
+    <color
+     name="SearchableControlHighlightBgColor"
      value="0.5 0.1 0.1 1" />
     <color
      name="SilhouetteChildColor"
diff --git a/indra/newview/skins/default/xui/da/floater_about.xml b/indra/newview/skins/default/xui/da/floater_about.xml
index 604eb7c58f..4ea34975e1 100644
--- a/indra/newview/skins/default/xui/da/floater_about.xml
+++ b/indra/newview/skins/default/xui/da/floater_about.xml
@@ -5,7 +5,7 @@
 [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]
 	</floater.string>
 	<floater.string name="AboutPosition">
-		Du er ved [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] i regionen [REGION] lokaliseret ved &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		Du er ved [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] i regionen [REGION] lokaliseret ved &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt;
 [SERVER_VERSION]
 [SERVER_RELEASE_NOTES_URL]
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
index 602424821f..09447cbbaf 100644
--- a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		<combo_box.item label="Klein (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Mittel (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Groß (512x512)" name="Large(512x512)"/>
-		<combo_box.item label="Aktuelles Fenster (512x512)" name="CurrentWindow"/>
+		<combo_box.item label="Aktuelles Fenster" name="CurrentWindow"/>
 		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
 	<spinner label="Breite x Höhe" name="inventory_snapshot_width"/>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 486d604e9f..3f5fccf57f 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -12,7 +12,7 @@
 	<string name="StartupRequireDriverUpdate">Grafikinitialisierung fehlgeschlagen. Bitte aktualisieren Sie Ihren Grafiktreiber.</string>
 	<string name="AboutHeader">[CHANNEL] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([ADDRESS_SIZE]Bit) [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]</string>
 	<string name="BuildConfig">Build-Konfiguration [BUILD_CONFIG]</string>
-	<string name="AboutPosition">Sie befinden sich an [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] auf &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+	<string name="AboutPosition">Sie befinden sich an [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] auf &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt;
 SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 (globale Koordinaten [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
diff --git a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
index 34ed3fa80d..6877ce6411 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
@@ -858,22 +858,50 @@
       value="3"/>
   </combo_box>
 
-  <slider
-    control_name="RenderReflectionProbeCount"
-    decimal_digits="0"
-    follows="left|top"
-    height="16"
-    increment="1"
-    initial_value="256"
-    label="Max. Reflection Probes:"
-    label_width="145"
-    layout="topleft"
-    left="420"
-    min_val="1"
-    max_val="256"
-    name="MaxProbes"
-    top_delta="24"
-    width="260" />
+    <text
+      type="string"
+      length="1"
+      follows="left|top"
+      height="16"
+      layout="topleft"
+      left="420"
+      name="ReflectionProbeCount"
+      text_readonly_color="LabelDisabledColor"
+      top_delta="22"
+      width="128">
+        Max Reflection Probes:
+    </text>
+
+    <combo_box
+     control_name="RenderReflectionProbeCount"
+     height="18"
+     layout="topleft"
+     label="Max. Reflection Probes:"
+     left_delta="130"
+     top_delta="0"
+     name="ProbeCount"
+     width="150">
+        <combo_box.item
+          label="None"
+          name="1"
+          value="1"/>
+        <combo_box.item
+          label="Low"
+          name="32"
+          value="32"/>
+        <combo_box.item
+          label="Medium"
+          name="64"
+          value="64"/>
+        <combo_box.item
+          label="High"
+          name="128"
+          value="128"/>
+        <combo_box.item
+          label="Ultra"
+          name="256"
+          value="256"/>
+    </combo_box>
 
   <slider
     control_name="RenderExposure"
diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml
index e6b780728c..acdccdc03a 100644
--- a/indra/newview/skins/default/xui/en/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml
@@ -167,8 +167,19 @@
          left="30"
 		 height="16"
          top_pad="8"
-         width="180"
+         width="80"
+         control_name="RenderUIInSnapshot"
          name="ui_check" />
+       <check_box
+         label="L$ Balance"
+         layout="topleft"
+         left_pad="16"
+         height="16"
+         top_delta="0"
+         width="80"
+         control_name="RenderBalanceInSnapshot"
+         enabled_control="RenderUIInSnapshot"
+         name="balance_check" />
         <check_box
          label="HUDs"
          layout="topleft"
@@ -176,6 +187,7 @@
          left="30"
          top_pad="1"
          width="180"
+         control_name="RenderHUDInSnapshot"
          name="hud_check" />
         <check_box
          label="Freeze frame (fullscreen)"
diff --git a/indra/newview/skins/default/xui/en/floater_test_slapp.xml b/indra/newview/skins/default/xui/en/floater_test_slapp.xml
new file mode 100644
index 0000000000..dd2720816a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_test_slapp.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater
+ legacy_header_height="18"
+ height="300"
+ layout="topleft"
+ name="slapp_test"
+ title="SLAPP TEST"
+ width="500">
+   <floater.string
+    name="remove_folder_slapp">
+    secondlife://app/remove_folder/?folder_id=
+   </floater.string>
+   <text
+    type="string"
+    length="1"
+    top="20"
+    follows="left|top|right"
+    height="16"
+    name="trusted_txt"
+    font="SansSerifMedium"
+    text_color="white"
+    layout="topleft"
+    left="16">
+        Trusted source
+   </text>
+   <text
+    type="string"
+    length="1"
+    top_pad="8"
+    follows="left|top|right"
+    height="16"
+    layout="topleft"
+    left="16">
+    /wear_folder
+   </text>
+   <text
+    type="string"
+    length="1"
+    top_pad="5"
+    follows="left|top|right"
+    height="16"
+    width="450"
+    layout="topleft"
+    left="16">
+        secondlife://app/wear_folder/?folder_name=Daisy
+   </text>
+   <text
+    type="string"
+    length="1"
+    top_pad="8  "
+    follows="left|top|right"
+    height="16"
+    layout="topleft"
+    left="16">
+    /add_folder
+   </text>
+   <text
+    type="string"
+    length="1"
+    top_pad="5"
+    follows="left|top|right"
+    height="16"
+    width="450"
+    layout="topleft"
+    left="16">
+        secondlife://app/add_folder/?folder_name=Cardboard%20Boxbot
+   </text>
+   <text
+    type="string"
+    length="1"
+    top_pad="5"
+    follows="left|top|right"
+    height="16"
+    width="450"
+    layout="topleft">
+        secondlife://app/add_folder/?folder_id=59219db2-c260-87d3-213d-bb3bc298a3d8
+   </text>
+   <text
+    type="string"
+    length="1"
+    top_pad="8  "
+    follows="left|top|right"
+    height="16"
+    layout="topleft"
+    left="16">
+    /remove_folder
+   </text>
+   <text
+    type="string"
+    length="1"
+    top_pad="5"
+    follows="left|top|right"
+    height="16"
+    layout="topleft"
+    left="16">
+    Folder ID:
+   </text>
+   <line_editor
+    border_style="line"
+    border_thickness="1"
+    follows="left|top"
+    font="SansSerif"
+    height="18"
+    layout="topleft"
+    left="75"
+    max_length_bytes="50"
+    prevalidate_callback="ascii"
+    name="remove_folder_id"
+    top_delta="-2"
+    width="270" />
+   <text
+    type="string"
+    length="1"
+    top_pad="5"
+    follows="left|top|right"
+    height="16"
+    width="450"
+    name="remove_folder_txt"
+    layout="topleft"
+    left="16">
+        secondlife://app/remove_folder/?folder_id=
+   </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index d8aac71dd5..d8c7de0e55 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -152,6 +152,14 @@
          parameter="category" />
     </menu_item_call>
     <menu_item_call
+     label="New Folder"
+     layout="topleft"
+     name="New Outfit Folder">
+        <menu_item_call.on_click
+         function="Inventory.DoCreate"
+         parameter="category" />
+    </menu_item_call>
+    <menu_item_call
      label="New Outfit"
      layout="topleft"
      name="New Outfit">
@@ -371,6 +379,14 @@
          parameter="copy_uuid" />
     </menu_item_call>
     <menu_item_call
+     label="Copy UUID"
+     layout="topleft"
+     name="Copy UUID">
+        <menu_item_call.on_click
+         function="Inventory.DoToSelected"
+         parameter="copy_folder_uuid" />
+    </menu_item_call>
+    <menu_item_call
      label="Show in Main Panel"
      layout="topleft"
      name="Show in Main Panel">
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 6fb92f7b99..343f0c0059 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -3889,6 +3889,13 @@ function="World.EnvPreset"
                  function="Floater.Show"
                  parameter="font_test" />
             </menu_item_call>
+            <menu_item_call
+             label="Show SLapps Test"
+             name="Show SLapps Test">
+                <menu_item_call.on_click
+                 function="Floater.Show"
+                 parameter="slapp_test" />
+            </menu_item_call>
             <menu_item_check
              label="Show XUI Names"
              name="Show XUI Names">
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index dba48012ac..1a56d7e3a3 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2408,6 +2408,16 @@ Unable to upload snapshot.
 File might be too big, try reducing resolution or try again later.
   <tag>fail</tag>
   </notification>
+    
+  <notification
+   icon="alertmodal.tga"
+   name="CannotOpenFileTooBig"
+   type="alertmodal">
+Unable to open file.
+
+Viewer run out of memory while opening file. File might be too big.
+  <tag>fail</tag>
+  </notification>
 
   <notification
    icon="notifytip.tga"
@@ -10326,6 +10336,14 @@ You are now the owner of object [OBJECT_NAME]
 
   <notification
    icon="alertmodal.tga"
+   name="NowOwnObjectInv"
+   type="notify">
+   <tag>fail</tag>
+You are now the owner of object [OBJECT_NAME] and it has been placed in your inventory.
+  </notification>
+
+    <notification
+   icon="alertmodal.tga"
    name="CantRezOnLand"
    type="notify">
    <tag>fail</tag>
diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml
index c906e2f96c..d6ac71db94 100644
--- a/indra/newview/skins/default/xui/en/panel_login_first.xml
+++ b/indra/newview/skins/default/xui/en/panel_login_first.xml
@@ -179,7 +179,6 @@
             control_name="RememberPassword"
             follows="left|top"
             font="SansSerifLarge"
-            text_color="EmphasisColor"
             height="24"
             left="262"
             bottom_delta="0"
diff --git a/indra/newview/skins/default/xui/en/panel_settings_water.xml b/indra/newview/skins/default/xui/en/panel_settings_water.xml
index 5e65b0e8a2..e062f1710b 100644
--- a/indra/newview/skins/default/xui/en/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/en/panel_settings_water.xml
@@ -378,7 +378,7 @@
                             initial_value="0"
                             layout="topleft"
                             left_delta="5"
-                            min_val="-0.5"
+                            min_val="0"
                             max_val="0.5"
                             name="water_blur_multip"
                             top_pad="5"
diff --git a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
index f8040b9a65..68878baa0d 100644
--- a/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
@@ -60,7 +60,7 @@
          name="Large(512x512)"
          value="[i512,i512]" />
         <combo_box.item
-         label="Current Window(512x512)"
+         label="Current Window"
          name="CurrentWindow"
          value="[i0,i0]" />
         <combo_box.item
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 9a19d06432..af6a9b94d9 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -729,8 +729,8 @@
              label_width="205"
              layout="topleft"
              left="10"
-             min_val="-100"
-             max_val="100"
+             min_val="-10000"
+             max_val="10000"
              name="TexScaleU"
              top_pad="5"
              width="265" />
@@ -742,8 +742,8 @@
              label_width="205"
              layout="topleft"
              left="10"
-             min_val="-100"
-             max_val="100"
+             min_val="-10000"
+             max_val="10000"
              name="TexScaleV"
              width="265" />
             <spinner
@@ -805,8 +805,8 @@
              label_width="205"
              layout="topleft"
              left="10"
-             min_val="-100"
-             max_val="100"
+             min_val="-10000"
+             max_val="10000"
              name="bumpyScaleU"
              top_delta="-115"
              width="265" />
@@ -818,8 +818,8 @@
              label_width="205"
              layout="topleft"
              left="10"
-             min_val="-100"
-             max_val="100"
+             min_val="-10000"
+             max_val="10000"
              name="bumpyScaleV"
              width="265" />
            <spinner
@@ -869,8 +869,8 @@
              label_width="205"
              layout="topleft"
              left="10"
-             min_val="-100"
-             max_val="100"
+             min_val="-10000"
+             max_val="10000"
              name="shinyScaleU"
              top_delta="-115"
              width="265" />
@@ -882,8 +882,8 @@
              label_width="205"
              layout="topleft"
              left="10"
-             min_val="-100"
-             max_val="100"
+             min_val="-10000"
+             max_val="10000"
              name="shinyScaleV"
              width="265" />
            <spinner
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f0a26f9c56..7361ad5245 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -13,7 +13,6 @@
 	<string name="SUPPORT_SITE">Second Life Support Portal</string>
 
 	<!-- starting up -->
-	<string name="StartupDetectingHardware">Detecting hardware...</string>
 	<string name="StartupLoading">Loading [APP_NAME]...</string>
 	<string name="StartupClearingCache">Clearing cache...</string>
 	<string name="StartupInitializingTextureCache">Initializing texture cache...</string>
@@ -259,6 +258,7 @@ If you feel this is an error, please contact support@secondlife.com</string>
 	<string name="TooltipOutboxMixedStock">All items in a stock folder must have the same type and permission</string>
 	<string name="TooltipOutfitNotInInventory">You can only put items or outfits from your personal inventory into "My outfits"</string>
 	<string name="TooltipCantCreateOutfit">One or more items can't be used inside "My outfits"</string>
+    <string name="TooltipCantMoveOutfitIntoOutfit">Can not move an outfit into another outfit</string>
 	
 	<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
 	<string name="TooltipDragOntoSelf">You can't move a folder into itself</string>
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
index b5cf57ade7..c9eea9a58e 100644
--- a/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		Guardar una imagen en el inventario cuesta [UPLOAD_COST] L$. Para guardar una imagen como una textura, selecciona uno de los formatos cuadrados.
 	</text>
 	<combo_box label="Resolución" name="texture_size_combo">
-		<combo_box.item label="Ventana actual (512 × 512)" name="CurrentWindow"/>
+		<combo_box.item label="Ventana actual" name="CurrentWindow"/>
 		<combo_box.item label="Pequeña (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Mediana (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 9fcfc2daa5..ff1200e2b3 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -10,7 +10,7 @@
 	<string name="AboutHeader">[CHANNEL] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([ADDRESS_SIZE]bit) 
 [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]</string>
 	<string name="BuildConfig">Configuración de constitución [BUILD_CONFIG]</string>
-	<string name="AboutPosition">Estás en la posición [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1], de [REGION], alojada en &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+	<string name="AboutPosition">Estás en la posición [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1], de [REGION], alojada en &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt;
 SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 (coordenadas globales [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
index 3cf64583d2..a560ff8d5e 100644
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		L&apos;enregistrement d&apos;une image dans l&apos;inventaire coûte [UPLOAD_COST] L$. Pour enregistrer votre image sous forme de texture, sélectionnez un format carré.
 	</text>
 	<combo_box label="Résolution" name="texture_size_combo">
-		<combo_box.item label="Fenêtre actuelle (512x512)" name="CurrentWindow"/>
+		<combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
 		<combo_box.item label="Petite (128 x 128)" name="Small(128x128)"/>
 		<combo_box.item label="Moyenne (256 x 256)" name="Medium(256x256)"/>
 		<combo_box.item label="Grande (512 x 512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 55f6209fe1..5307c8d561 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -13,7 +13,7 @@
 	<string name="AboutHeader">[CHANNEL] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([ADDRESS_SIZE]bit) 
 [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]</string>
 	<string name="BuildConfig">Configuration de la construction [BUILD_CONFIG]</string>
-	<string name="AboutPosition">Vous êtes à [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] dans [REGION], se trouvant à &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+	<string name="AboutPosition">Vous êtes à [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] dans [REGION], se trouvant à &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt;
 SLURL : &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 (coordonnées globales [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
index 75b5d64660..21b65e8e69 100644
--- a/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		Salvare un&apos;immagine nell&apos;inventario costa L$[UPLOAD_COST]. Per salvare l&apos;immagine come texture, selezionare uno dei formati quadrati.
 	</text>
 	<combo_box label="Risoluzione" name="texture_size_combo">
-		<combo_box.item label="Finestra corrente (512x512)" name="CurrentWindow"/>
+		<combo_box.item label="Finestra corrente" name="CurrentWindow"/>
 		<combo_box.item label="Piccola (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Media (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index f77ab1062a..bb22ff788e 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -12,7 +12,7 @@
 	<string name="AboutHeader">[CHANNEL] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([ADDRESS_SIZE]bit) 
 [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]</string>
 	<string name="BuildConfig">Configurazione struttura [BUILD_CONFIG]</string>
-	<string name="AboutPosition">Tu sei a [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] che si trova a &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+	<string name="AboutPosition">Tu sei a [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] che si trova a &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt;
 SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 (coordinate globali [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
diff --git a/indra/newview/skins/default/xui/ja/panel_settings_water.xml b/indra/newview/skins/default/xui/ja/panel_settings_water.xml
index ead1ca9b2f..2510523897 100644
--- a/indra/newview/skins/default/xui/ja/panel_settings_water.xml
+++ b/indra/newview/skins/default/xui/ja/panel_settings_water.xml
@@ -63,7 +63,7 @@
 					<text follows="left|top|right" font="SansSerif" height="16" layout="topleft" left_delta="-5" top_pad="5" width="215">
 						ブラー乗数
 					</text>
-					<slider control_name="water_blur_multip" follows="left|top" height="16" increment="0.001" initial_value="0" layout="topleft" left_delta="5" min_val="-0.5" max_val="0.5" name="water_blur_multip" top_pad="5" width="200" can_edit_text="true"/>
+					<slider control_name="water_blur_multip" follows="left|top" height="16" increment="0.001" initial_value="0" layout="topleft" left_delta="5" min_val="0" max_val="0.5" name="water_blur_multip" top_pad="5" width="200" can_edit_text="true"/>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
index c55c11e928..30542378cc 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
@@ -6,7 +6,7 @@
 	</text>
 	<view_border name="hr"/>
 	<combo_box label="解像度" name="texture_size_combo">
-		<combo_box.item label="現在のウィンドウ (512✕512)" name="CurrentWindow"/>
+		<combo_box.item label="現在のウィンドウ" name="CurrentWindow"/>
 		<combo_box.item label="小（128✕128）" name="Small(128x128)"/>
 		<combo_box.item label="中（256✕256）" name="Medium(256x256)"/>
 		<combo_box.item label="大（512✕512）" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index fa6c329fe7..df19f3678f 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -39,7 +39,7 @@
 	</string>
 	<string name="AboutPosition">
 		あなたは、現在[REGION]の[POSITION_LOCAL_0,number,1]，[POSITION_LOCAL_1,number,1]，[POSITION_LOCAL_2,number,1]にいます。
-位置は、&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt;です。（[HOSTIP]）
+位置は、&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt;です。
 SLURL：&lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 （グローバル座標は、[POSITION_0,number,1]，[POSITION_1,number,1]，[POSITION_2,number,1]です。）
 [SERVER_VERSION]
@@ -66,7 +66,6 @@ SLURL：&lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 帯域幅：[NET_BANDWITH]kbit／秒
 ＬＯＤ係数：[LOD_FACTOR]
 描画の質：[RENDER_QUALITY]
-高度な光源モデル：[GPU_SHADERS]
 テクスチャメモリ：[TEXTURE_MEMORY]㎆
 	</string>
 	<string name="AboutOSXHiDPI">
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
index f3357026d5..28a5142baa 100644
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		Salvar uma imagem em seu inventário custa L$[UPLOAD_COST]. Para salvar sua imagem como uma textura, selecione um dos formatos quadrados.
 	</text>
 	<combo_box label="Resolução" name="texture_size_combo">
-		<combo_box.item label="Janela ativa (512x512)" name="CurrentWindow"/>
+		<combo_box.item label="Janela ativa" name="CurrentWindow"/>
 		<combo_box.item label="Pequeno (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Médio (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 4ce1e6d2ec..509b3d72a0 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -10,7 +10,7 @@
 	<string name="AboutHeader">[CHANNEL] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3] ([ADDRESS_SIZE]bit) 
 [[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]]</string>
 	<string name="BuildConfig">Configuração do corpo [BUILD_CONFIG]</string>
-	<string name="AboutPosition">Você está em [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] em [REGION] localizado em &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+	<string name="AboutPosition">Você está em [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] em [REGION] localizado em &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt;
 SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 (coordenadas globais [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
index f07e12e0ed..adc612dfd8 100644
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		Сохранение изображения в инвентаре стоит L$[UPLOAD_COST]. Чтобы сохранить его как текстуру, выберите один из квадратных форматов.
 	</text>
 	<combo_box label="Размер" name="texture_size_combo">
-		<combo_box.item label="Текущее окно (512x512)" name="CurrentWindow"/>
+		<combo_box.item label="Текущее окно" name="CurrentWindow"/>
 		<combo_box.item label="Маленький (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Средний (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Большой (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 0079309ba2..48eb7118aa 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -42,7 +42,7 @@
 		Конфигурация построения [BUILD_CONFIG]
 	</string>
 	<string name="AboutPosition">
-		Вы в точке [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] в регионе «[REGION]», расположенном на &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		Вы в точке [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] в регионе «[REGION]», расположенном на &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt;
 SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 (глобальные координаты [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
index be5940c4b9..160cba8700 100644
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		Bir görüntüyü envanterinize kaydetmenin maliyeti L$[UPLOAD_COST] olur. Görüntünüzü bir doku olarak kaydetmek için kare formatlardan birini seçin.
 	</text>
 	<combo_box label="Çözünürlük" name="texture_size_combo">
-		<combo_box.item label="Mevcut Pencere(512x512)" name="CurrentWindow"/>
+		<combo_box.item label="Mevcut Pencere" name="CurrentWindow"/>
 		<combo_box.item label="Küçük (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Orta (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Büyük (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index fa2fd3a802..92e5160e97 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -42,7 +42,7 @@
 		Yapı Konfigürasyonu [BUILD_CONFIG]
 	</string>
 	<string name="AboutPosition">
-		&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP]) üzerinde bulunan [REGION] içerisinde [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] konumundasınız
+		&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; üzerinde bulunan [REGION] içerisinde [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] konumundasınız
 SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 (küresel koordinatlar [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
 [SERVER_VERSION]
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
index 094bf019b4..9c45c54a5e 100644
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		將圖像儲存到收納區的費用為 L$[UPLOAD_COST]。 若要將圖像存為材質，請選擇一個正方格式。
 	</text>
 	<combo_box label="解析度" name="texture_size_combo">
-		<combo_box.item label="目前視窗(512x512)" name="CurrentWindow"/>
+		<combo_box.item label="目前視窗" name="CurrentWindow"/>
 		<combo_box.item label="小（128x128）" name="Small(128x128)"/>
 		<combo_box.item label="中（256x256）" name="Medium(256x256)"/>
 		<combo_box.item label="大（512x512）" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index bdb16c9bf1..8fae007429 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -42,7 +42,7 @@
 		建製設置 [BUILD_CONFIG]
 	</string>
 	<string name="AboutPosition">
-		你的方位是 [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1]，地區名：[REGION]，主機：&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
+		你的方位是 [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1]，地區名：[REGION]，主機：&lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt;
 第二人生URL：&lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 （全域坐標：[POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]）
 [SERVER_VERSION]
@@ -69,7 +69,6 @@
 頻寬：[NET_BANDWITH]千位元/秒
 細節層次率：[LOD_FACTOR]
 呈像品質：[RENDER_QUALITY]
-進階照明模型：[GPU_SHADERS]
 材質記憶體：[TEXTURE_MEMORY]MB
 	</string>
 	<string name="AboutOSXHiDPI">
diff --git a/scripts/code_tools/fix_xml_indentations.py b/scripts/code_tools/fix_xml_indentations.py
index e317e4f7f6..a196b0b7d4 100644
--- a/scripts/code_tools/fix_xml_indentations.py
+++ b/scripts/code_tools/fix_xml_indentations.py
@@ -86,21 +86,37 @@ def save_xml(tree, file_path, xml_decl, indent_text=False, indent_tab=False, rm_
         except IOError as e:
             print(f"Error saving file {file_path}: {e}")
 
-def process_directory(directory_path, indent_text=False, indent_tab=False, rm_space=False, rewrite_decl=False):
+def process_xml_files(file_paths, indent_text=False, indent_tab=False, rm_space=False, rewrite_decl=False):
+    found_files = False
+    if file_paths:
+        found_files = True
+        for file_path in file_paths:
+            xml_decl = get_xml_declaration(file_path)
+            tree = parse_xml_file(file_path)
+            if tree is not None:
+                save_xml(tree, file_path, xml_decl, indent_text, indent_tab, rm_space, rewrite_decl)
+    return found_files
+
+def process_directory(directory_path, indent_text=False, indent_tab=False, rm_space=False, rewrite_decl=False, file_pattern=None, recursive=False):
     if not os.path.isdir(directory_path):
         print(f"Directory not found: {directory_path}")
         return
 
-    xml_files = glob.glob(os.path.join(directory_path, "*.xml"))
-    if not xml_files:
-        print(f"No XML files found in directory: {directory_path}")
-        return
+    pattern = file_pattern if file_pattern else "*.xml"
+    found_files = False
+
+    if not recursive:
+        # Non-recursive mode
+        xml_files = glob.glob(os.path.join(directory_path, pattern))
+        found_files = process_xml_files(xml_files, indent_text, indent_tab, rm_space, rewrite_decl)
+    else:
+        # Recursive mode
+        for root, dirs, files in os.walk(directory_path):
+            xml_files = glob.glob(os.path.join(root, pattern))
+            found_files = process_xml_files(xml_files, indent_text, indent_tab, rm_space, rewrite_decl)
 
-    for file_path in xml_files:
-        xml_decl = get_xml_declaration(file_path)
-        tree = parse_xml_file(file_path)
-        if tree is not None:
-            save_xml(tree, file_path, xml_decl, indent_text, indent_tab, rm_space, rewrite_decl)
+    if not found_files:
+        print(f"No XML files found in {'directory tree' if recursive else 'directory'}: {directory_path}")
 
 if __name__ == "__main__":
     if len(sys.argv) < 2 or '--help' in sys.argv:
@@ -112,9 +128,13 @@ if __name__ == "__main__":
         print("  --indent-tab     Uses tabs instead of spaces for indentation.")
         print("  --rm-space       Removes spaces in self-closing tags.")
         print("  --rewrite_decl   Replaces the XML declaration line.")
+        print("  --file <pattern> Only process files matching the pattern")
+        print("  --recursive      Process files in all subdirectories")
         print("\nCommon Usage:")
         print("  To format XML files with text indentation, tab indentation, and removal of spaces in self-closing tags:")
         print("  python fix_xml_indentations.py /path/to/xmls --indent-text --indent-tab --rm-space")
+        print("\n  To format specific XML files recursively through all subdirectories:")
+        print("  python fix_xml_indentations.py /path/to/xmls --file floater_*.xml --recursive")
         sys.exit(1)
 
     directory_path = sys.argv[1]
@@ -122,4 +142,16 @@ if __name__ == "__main__":
     indent_tab = '--indent-tab' in sys.argv
     rm_space = '--rm-space' in sys.argv
     rewrite_decl = '--rewrite_decl' in sys.argv
-    process_directory(directory_path, indent_text, indent_tab, rm_space, rewrite_decl)
+    recursive = '--recursive' in sys.argv
+
+    # Get file pattern if specified
+    file_pattern = None
+    if '--file' in sys.argv:
+        try:
+            file_index = sys.argv.index('--file') + 1
+            if file_index < len(sys.argv):
+                file_pattern = sys.argv[file_index]
+        except ValueError:
+            pass
+
+    process_directory(directory_path, indent_text, indent_tab, rm_space, rewrite_decl, file_pattern, recursive)
diff --git a/scripts/messages/message_template.msg b/scripts/messages/message_template.msg
index 1450c111c2..40ba2cc6b6 100755
--- a/scripts/messages/message_template.msg
+++ b/scripts/messages/message_template.msg
@@ -4,9 +4,9 @@ version 2.0
 
 // The Version 2.0 template requires preservation of message
 // numbers. Each message must be numbered relative to the
-// other messages of that type. The current highest number 
+// other messages of that type. The current highest number
 // for each type is listed below:
-// Low: 430
+// Low: 431
 // Medium: 18
 // High: 30
 // PLEASE UPDATE THIS WHEN YOU ADD A NEW MESSAGE!
@@ -19,17 +19,17 @@ version 2.0
 // Test Message
 
 {
-	TestMessage Low 1 NotTrusted Zerocoded
-	{
-		TestBlock1		Single
-		{	Test1		U32	}
-	}
-	{
-		NeighborBlock		Multiple		4
-		{	Test0		U32	}
-		{	Test1		U32	}
-		{	Test2		U32	}
-	}
+    TestMessage Low 1 NotTrusted Zerocoded
+    {
+        TestBlock1 Single
+        {   Test1   U32 }
+    }
+    {
+        NeighborBlock Multiple 4
+        {   Test0   U32 }
+        {   Test1   U32 }
+        {   Test2   U32 }
+    }
 }
 
 // *************************************************************************
@@ -43,28 +43,28 @@ version 2.0
 
 // Packet Ack - Ack a list of packets sent reliable
 {
-	PacketAck Fixed 0xFFFFFFFB NotTrusted Unencoded
-	{
-		Packets			Variable		
-		{	ID			U32	}
-	}
+    PacketAck Fixed 0xFFFFFFFB NotTrusted Unencoded
+    {
+        Packets Variable
+        {   ID  U32 }
+    }
 }
 
 
 // OpenCircuit - Tells the recipient's messaging system to open the descibed circuit
 {
-	OpenCircuit Fixed 0xFFFFFFFC NotTrusted Unencoded UDPBlackListed
-	{
-		CircuitInfo		Single
-		{	IP			IPADDR	}
-		{	Port		IPPORT	}
-	}
+    OpenCircuit Fixed 0xFFFFFFFC NotTrusted Unencoded UDPBlackListed
+    {
+        CircuitInfo Single
+        {   IP      IPADDR  }
+        {   Port    IPPORT  }
+    }
 }
 
 
 // CloseCircuit - Tells the recipient's messaging system to close the descibed circuit
 {
-	CloseCircuit Fixed 0xFFFFFFFD NotTrusted Unencoded
+    CloseCircuit Fixed 0xFFFFFFFD NotTrusted Unencoded
 }
 
 
@@ -76,22 +76,22 @@ version 2.0
 // PingID is used to determine how backlogged the ping was that was
 // returned (or how hosed the other side is)
 {
-	StartPingCheck High 1 NotTrusted Unencoded
-	{
-		PingID Single
-		{	PingID	U8	}
-		{	OldestUnacked	U32	}	// Current oldest "unacked" packet on the sender side
-	}
+    StartPingCheck High 1 NotTrusted Unencoded
+    {
+        PingID Single
+        {   PingID          U8  }
+        {   OldestUnacked   U32 }   // Current oldest "unacked" packet on the sender side
+    }
 }
 
 // CompletePingCheck - used to measure circuit ping times
 
 {
-	CompletePingCheck High 2 NotTrusted Unencoded
-	{
-		PingID Single
-		{	PingID	U8	}
-	}
+    CompletePingCheck High 2 NotTrusted Unencoded
+    {
+        PingID Single
+        {   PingID  U8  }
+    }
 }
 
 // space->sim
@@ -99,13 +99,13 @@ version 2.0
 // AddCircuitCode - Tells the recipient's messaging system that this code
 // is for a legal circuit
 {
-	AddCircuitCode Low 2 Trusted Unencoded
-	{
-		CircuitCode		Single
-		{	Code		U32		}
-		{	SessionID	LLUUID	}
-		{	AgentID		LLUUID	} // WARNING - may be null in valid message
-	}
+    AddCircuitCode Low 2 Trusted Unencoded
+    {
+        CircuitCode Single
+        {   Code        U32     }
+        {   SessionID   LLUUID  }
+        {   AgentID     LLUUID  }   // WARNING - may be null in valid message
+    }
 }
 
 // viewer->sim
@@ -115,13 +115,13 @@ version 2.0
 // id of the process, which every server will generate on startup and
 // the viewer will be handed after login.
 {
-	UseCircuitCode Low 3 NotTrusted Unencoded
-	{
-		CircuitCode		Single
-		{	Code		U32		}
-		{	SessionID	LLUUID	}
-		{	ID			LLUUID	} // agent id
-	}
+    UseCircuitCode Low 3 NotTrusted Unencoded
+    {
+        CircuitCode Single
+        {   Code        U32     }
+        {   SessionID   LLUUID  }
+        {   ID          LLUUID  }   // agent id
+    }
 }
 
 
@@ -131,17 +131,17 @@ version 2.0
 
 // Neighbor List - Passed anytime neighbors change
 {
-	NeighborList High 3 Trusted Unencoded
-	{
-		NeighborBlock	Multiple		4
-		{	IP			IPADDR	}
-		{	Port		IPPORT	}
-		{	PublicIP    IPADDR	}
-		{	PublicPort  IPPORT	}
-		{	RegionID	LLUUID	}
-		{	Name		Variable		1	}	// string
-		{	SimAccess	U8	}
-	}
+    NeighborList High 3 Trusted Unencoded
+    {
+        NeighborBlock Multiple 4
+        {   IP          IPADDR      }
+        {   Port        IPPORT      }
+        {   PublicIP    IPADDR      }
+        {   PublicPort  IPPORT      }
+        {   RegionID    LLUUID      }
+        {   Name        Variable 1  }   // string
+        {   SimAccess   U8          }
+    }
 }
 
 
@@ -149,22 +149,22 @@ version 2.0
 // simulator -> dataserver
 // reliable
 {
-	AvatarTextureUpdate Low 4 Trusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	TexturesChanged	BOOL	}
-	}
-	{
-		WearableData		Variable
-		{	CacheID			LLUUID }
-		{	TextureIndex	U8 }
-		{	HostName		Variable	1	}
-	}
-	{
-		TextureData		Variable
-		{	TextureID		LLUUID	}
-	}
+    AvatarTextureUpdate Low 4 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID         LLUUID  }
+        {   TexturesChanged BOOL    }
+    }
+    {
+        WearableData Variable
+        {   CacheID         LLUUID      }
+        {   TextureIndex    U8          }
+        {   HostName        Variable 1  }
+    }
+    {
+        TextureData Variable
+        {   TextureID   LLUUID  }
+    }
 }
 
 
@@ -172,11 +172,11 @@ version 2.0
 // simulator -> dataserver
 // reliable
 {
-	SimulatorMapUpdate Low 5 Trusted Unencoded
-	{
-		MapData		Single
-		{	Flags		U32		}
-	}
+    SimulatorMapUpdate Low 5 Trusted Unencoded
+    {
+        MapData Single
+        {   Flags   U32 }
+    }
 }
 
 // SimulatorSetMap
@@ -184,27 +184,27 @@ version 2.0
 // reliable
 // Used to upload a map image into the database (currently used only for Land For Sale)
 {
-	SimulatorSetMap Low 6 Trusted Unencoded
-	{
-		MapData		Single
-		{	RegionHandle	U64		}
-		{	Type			S32		}
-		{	MapImage		LLUUID	}
-	}
+    SimulatorSetMap Low 6 Trusted Unencoded
+    {
+        MapData Single
+        {   RegionHandle    U64     }
+        {   Type            S32     }
+        {   MapImage        LLUUID  }
+    }
 }
 
 // SubscribeLoad
 // spaceserver -> simulator
 // reliable
 {
-	SubscribeLoad	Low	7 Trusted Unencoded
+    SubscribeLoad Low 7 Trusted Unencoded
 }
 
 // UnsubscribeLoad
 // spaceserver -> simulator
 // reliable
 {
-	UnsubscribeLoad Low 8 Trusted Unencoded
+    UnsubscribeLoad Low 8 Trusted Unencoded
 }
 
 
@@ -215,95 +215,95 @@ version 2.0
 // SimulatorReady - indicates the sim has finished loading its state
 // and is ready to receive updates from others
 {
-	SimulatorReady Low 9 Trusted Zerocoded
-	{
-		SimulatorBlock		Single
-		{	SimName			Variable	1	}
-		{	SimAccess		U8	}
-		{	RegionFlags		U32	}
-		{	RegionID		LLUUID	}
-		{	EstateID		U32	}
-		{	ParentEstateID	U32	}
-	}
-	{
-		TelehubBlock		Single
-		{	HasTelehub		BOOL		}
-		{	TelehubPos		LLVector3	}
-	}
+    SimulatorReady Low 9 Trusted Zerocoded
+    {
+        SimulatorBlock Single
+        {   SimName         Variable 1  }
+        {   SimAccess       U8          }
+        {   RegionFlags     U32         }
+        {   RegionID        LLUUID      }
+        {   EstateID        U32         }
+        {   ParentEstateID  U32         }
+    }
+    {
+        TelehubBlock Single
+        {   HasTelehub  BOOL        }
+        {   TelehubPos  LLVector3   }
+    }
 }
 
 // TelehubInfo - fill in the UI for telehub creation floater.
 // sim -> viewer
 // reliable
 {
-	TelehubInfo	Low	10 Trusted Unencoded
-	{
-		TelehubBlock		Single
-		{	ObjectID		LLUUID			}	// null if no telehub
-		{	ObjectName		Variable 1		}	// string
-		{	TelehubPos		LLVector3		}	// fallback if viewer can't find object
-		{	TelehubRot		LLQuaternion	}
-	}
-	{
-		SpawnPointBlock		Variable
-		{	SpawnPointPos	LLVector3		}	// relative to telehub position
-	}
+    TelehubInfo Low 10 Trusted Unencoded
+    {
+        TelehubBlock Single
+        {   ObjectID    LLUUID          }   // null if no telehub
+        {   ObjectName  Variable 1      }   // string
+        {   TelehubPos  LLVector3       }   // fallback if viewer can't find object
+        {   TelehubRot  LLQuaternion    }
+    }
+    {
+        SpawnPointBlock Variable
+        {   SpawnPointPos   LLVector3   }   // relative to telehub position
+    }
 }
 
 // SimulatorPresentAtLocation - indicates that the sim is present at a grid
 // location and passes what it believes its neighbors are
 {
-	SimulatorPresentAtLocation Low 11 Trusted Unencoded
-	{
-		SimulatorPublicHostBlock	Single
-		{	Port        IPPORT }
-		{	SimulatorIP IPADDR }
-		{   GridX       U32	   }
-		{	GridY       U32    }
-	}
-	{
-		NeighborBlock	Multiple		4
-		{	IP			IPADDR	}
-		{	Port		IPPORT	}
-	}
-	{
-		SimulatorBlock		Single
-		{	SimName			Variable	1	}
-		{	SimAccess		U8	}
-		{	RegionFlags		U32	}
-		{	RegionID		LLUUID	}
-		{	EstateID		U32	}
-		{	ParentEstateID	U32	}
-	}
-	{
-		TelehubBlock		Variable
-		{	HasTelehub		BOOL		}
-		{	TelehubPos		LLVector3	}
-	}
+    SimulatorPresentAtLocation Low 11 Trusted Unencoded
+    {
+        SimulatorPublicHostBlock Single
+        {   Port        IPPORT }
+        {   SimulatorIP IPADDR }
+        {   GridX       U32    }
+        {   GridY       U32    }
+    }
+    {
+        NeighborBlock Multiple 4
+        {   IP      IPADDR  }
+        {   Port    IPPORT  }
+    }
+    {
+        SimulatorBlock Single
+        {   SimName         Variable 1  }
+        {   SimAccess       U8          }
+        {   RegionFlags     U32         }
+        {   RegionID        LLUUID      }
+        {   EstateID        U32         }
+        {   ParentEstateID  U32         }
+    }
+    {
+        TelehubBlock Variable
+        {   HasTelehub      BOOL        }
+        {   TelehubPos      LLVector3   }
+    }
 }
 
 // SimulatorLoad
 // simulator -> spaceserver
 // reliable
 {
-	SimulatorLoad Low 12 Trusted Unencoded
-	{
-		SimulatorLoad		Single
-		{	TimeDilation 	F32 }
-		{	AgentCount 		S32 }
-		{	CanAcceptAgents	BOOL	}
-	}
-	{
-		AgentList	Variable
-		{	CircuitCode		U32	}
-		{	X				U8	}
-		{	Y				U8	}
-	}
+    SimulatorLoad Low 12 Trusted Unencoded
+    {
+        SimulatorLoad Single
+        {   TimeDilation    F32     }
+        {   AgentCount      S32     }
+        {   CanAcceptAgents BOOL    }
+    }
+    {
+        AgentList Variable
+        {   CircuitCode     U32 }
+        {   X               U8  }
+        {   Y               U8  }
+    }
 }
 
 // Simulator Shutdown Request - Tells spaceserver that a simulator is trying to shutdown
 {
-	SimulatorShutdownRequest Low 13 Trusted Unencoded
+    SimulatorShutdownRequest Low 13 Trusted Unencoded
 }
 
 // ****************************************************************************
@@ -312,37 +312,37 @@ version 2.0
 
 // sim -> dataserver
 {
-	RegionPresenceRequestByRegionID Low 14 Trusted Unencoded
-	{
-		RegionData		Variable
-		{	RegionID	LLUUID	}
-	}
+    RegionPresenceRequestByRegionID Low 14 Trusted Unencoded
+    {
+        RegionData Variable
+        {   RegionID    LLUUID  }
+    }
 }
 
 // sim -> dataserver
 {
-	RegionPresenceRequestByHandle Low 15 Trusted Unencoded
-	{
-		RegionData		Variable
-		{	RegionHandle	U64	}
-	}
+    RegionPresenceRequestByHandle Low 15 Trusted Unencoded
+    {
+        RegionData Variable
+        {   RegionHandle    U64 }
+    }
 }
 
 // dataserver -> sim
 {
-	RegionPresenceResponse Low 16 Trusted Zerocoded
-	{
-		RegionData		Variable
-		{	RegionID			LLUUID	}
-		{	RegionHandle		U64	}
-		{	InternalRegionIP	IPADDR	}
-		{	ExternalRegionIP	IPADDR	}
-		{	RegionPort			IPPORT	}
-		{	ValidUntil			F64	}
-		{	Message				Variable	1	}
-	}
+    RegionPresenceResponse Low 16 Trusted Zerocoded
+    {
+        RegionData Variable
+        {   RegionID            LLUUID      }
+        {   RegionHandle        U64         }
+        {   InternalRegionIP    IPADDR      }
+        {   ExternalRegionIP    IPADDR      }
+        {   RegionPort          IPPORT      }
+        {   ValidUntil          F64         }
+        {   Message             Variable 1  }
+    }
 }
- 
+
 
 // ****************************************************************************
 // Simulator to dataserver messages
@@ -350,42 +350,42 @@ version 2.0
 
 // Updates SimName, EstateID and SimAccess using RegionID as a key
 {
-	UpdateSimulator Low 17 Trusted Unencoded
-	{
-		SimulatorInfo	Single
-		{	RegionID	LLUUID	}
-		{	SimName		Variable	1	}
-		{	EstateID	U32		}
-		{	SimAccess	U8		}
-	}
+    UpdateSimulator Low 17 Trusted Unencoded
+    {
+        SimulatorInfo Single
+        {   RegionID    LLUUID      }
+        {   SimName     Variable 1  }
+        {   EstateID    U32         }
+        {   SimAccess   U8          }
+    }
 }
 
 
 // record dwell time.
 {
-	LogDwellTime	Low	18 Trusted Unencoded
-	{
-		DwellInfo	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	Duration	F32		}
-		{	SimName		Variable	1 }
-		{	RegionX		U32		}
-		{	RegionY		U32		}
-		{	AvgAgentsInView U8  }
-		{	AvgViewerFPS U8		}
-	}
+    LogDwellTime Low 18 Trusted Unencoded
+    {
+        DwellInfo Single
+        {   AgentID         LLUUID      }
+        {   SessionID       LLUUID      }
+        {   Duration        F32         }
+        {   SimName         Variable 1  }
+        {   RegionX         U32         }
+        {   RegionY         U32         }
+        {   AvgAgentsInView U8          }
+        {   AvgViewerFPS    U8          }
+    }
 }
 
 // Disabled feature response message
 {
-	FeatureDisabled	Low 19 Trusted Unencoded
-	{
-		FailureInfo			Single
-		{	ErrorMessage	Variable	1	}
-		{	AgentID			LLUUID			}
-		{	TransactionID	LLUUID			}
-	}
+    FeatureDisabled Low 19 Trusted Unencoded
+    {
+        FailureInfo Single
+        {   ErrorMessage    Variable 1  }
+        {   AgentID         LLUUID      }
+        {   TransactionID   LLUUID      }
+    }
 }
 
 
@@ -393,47 +393,47 @@ version 2.0
 // from either the simulator or the dataserver, depending on how
 // the transaction failed.
 {
-	LogFailedMoneyTransaction	Low 20 Trusted Unencoded
-	{
-		TransactionData	Single
-		{	TransactionID	LLUUID	}
-		{ 	TransactionTime	U32		} // utc seconds since epoch
-		{	TransactionType	S32		}	// see lltransactiontypes.h
-		{	SourceID		LLUUID  }
-		{	DestID			LLUUID	}	// destination of the transfer
-		{	Flags			U8		}
-		{	Amount			S32		}
-		{	SimulatorIP		IPADDR	}	// U32 encoded IP
-		{	GridX			U32		}
-		{	GridY			U32		}
-		{	FailureType		U8		}
-	}
+    LogFailedMoneyTransaction Low 20 Trusted Unencoded
+    {
+        TransactionData Single
+        {   TransactionID   LLUUID  }
+        {   TransactionTime U32     }   // utc seconds since epoch
+        {   TransactionType S32     }   // see lltransactiontypes.h
+        {   SourceID        LLUUID  }
+        {   DestID          LLUUID  }   // destination of the transfer
+        {   Flags           U8      }
+        {   Amount          S32     }
+        {   SimulatorIP     IPADDR  }   // U32 encoded IP
+        {   GridX           U32     }
+        {   GridY           U32     }
+        {   FailureType     U8      }
+    }
 }
 
 // complaint/bug-report - sim -> dataserver. see UserReport for details.
 // reliable
 {
-	UserReportInternal Low 21 Trusted Zerocoded
-	{
-		ReportData	Single
-		{   ReportType		U8   }
-		{   Category		U8   }
-		{   ReporterID		LLUUID  }
-		{	ViewerPosition	LLVector3	}
-		{	AgentPosition	LLVector3	}
-		{   ScreenshotID	LLUUID  }
-		{   ObjectID		LLUUID  }
-		{   OwnerID			LLUUID  }
-		{   LastOwnerID		LLUUID  }
-		{   CreatorID		LLUUID  }
-		{	RegionID		LLUUID	}
-		{   AbuserID		LLUUID  }
-		{	AbuseRegionName	Variable	1	}
-		{	AbuseRegionID	LLUUID	}
-		{   Summary			Variable	1   }
-		{   Details 		Variable	2   }
-		{	VersionString	Variable	1	}
-	}
+    UserReportInternal Low 21 Trusted Zerocoded
+    {
+        ReportData Single
+        {   ReportType      U8          }
+        {   Category        U8          }
+        {   ReporterID      LLUUID      }
+        {   ViewerPosition  LLVector3   }
+        {   AgentPosition   LLVector3   }
+        {   ScreenshotID    LLUUID      }
+        {   ObjectID        LLUUID      }
+        {   OwnerID         LLUUID      }
+        {   LastOwnerID     LLUUID      }
+        {   CreatorID       LLUUID      }
+        {   RegionID        LLUUID      }
+        {   AbuserID        LLUUID      }
+        {   AbuseRegionName Variable 1  }
+        {   AbuseRegionID   LLUUID      }
+        {   Summary         Variable 1  }
+        {   Details         Variable 2  }
+        {   VersionString   Variable 1  }
+    }
 }
 
 // SetSimStatusInDatabase
@@ -441,18 +441,18 @@ version 2.0
 // sim -> dataserver
 // reliable
 {
-	SetSimStatusInDatabase Low 22 Trusted Unencoded
-	{
-		Data	Single
-		{	RegionID	LLUUID	}
-		{   HostName 	Variable 1	}
-		{	X			S32	}
-		{	Y			S32	}
-		{	PID			S32	}
-		{	AgentCount	S32	}
-		{	TimeToLive  S32 } // in seconds
-		{	Status		Variable	1	}
-	}
+    SetSimStatusInDatabase Low 22 Trusted Unencoded
+    {
+        Data Single
+        {   RegionID    LLUUID      }
+        {   HostName    Variable 1  }
+        {   X           S32         }
+        {   Y           S32         }
+        {   PID         S32         }
+        {   AgentCount  S32         }
+        {   TimeToLive  S32         }   // in seconds
+        {   Status      Variable 1  }
+    }
 }
 
 // SetSimPresenceInDatabase
@@ -460,18 +460,18 @@ version 2.0
 // that a given simulator is present and valid for a set amount of
 // time
 {
-	SetSimPresenceInDatabase Low 23 Trusted Unencoded
-	{
-		SimData Single
-		{   RegionID 	LLUUID	}
-		{   HostName 	Variable 1	}
-		{	GridX		U32	}
-		{	GridY		U32	}
-		{	PID			S32	}
-		{	AgentCount	S32	}
-		{	TimeToLive  S32 } // in seconds
-		{	Status		Variable	1	}
-	}
+    SetSimPresenceInDatabase Low 23 Trusted Unencoded UDPDeprecated
+    {
+        SimData Single
+        {   RegionID    LLUUID      }
+        {   HostName    Variable 1  }
+        {   GridX       U32         }
+        {   GridY       U32         }
+        {   PID         S32         }
+        {   AgentCount  S32         }
+        {   TimeToLive  S32         }   // in seconds
+        {   Status      Variable 1  }
+    }
 }
 
 // ***************************************************************************
@@ -480,32 +480,32 @@ version 2.0
 
 // once we use local stats, this will include a region handle
 {
-	EconomyDataRequest Low 24 NotTrusted Unencoded
+    EconomyDataRequest Low 24 NotTrusted Unencoded
 }
 
 // dataserver to sim, response w/ econ data
 {
-	EconomyData Low 25 Trusted Zerocoded
-	{
-		Info					Single
-		{	ObjectCapacity			S32	}
-		{	ObjectCount				S32	}
-		{	PriceEnergyUnit			S32	}
-		{	PriceObjectClaim		S32	}
-		{	PricePublicObjectDecay	S32	}
-		{	PricePublicObjectDelete	S32	}
-		{	PriceParcelClaim		S32	}
-		{	PriceParcelClaimFactor	F32	}
-		{	PriceUpload				S32	}
-		{	PriceRentLight			S32	}
-		{	TeleportMinPrice		S32	}
-		{	TeleportPriceExponent 	F32	}
-		{	EnergyEfficiency		F32	}
-		{	PriceObjectRent			F32	}
-		{	PriceObjectScaleFactor 	F32	}
-		{	PriceParcelRent			S32	}
-		{	PriceGroupCreate		S32	}
-	}
+    EconomyData Low 25 Trusted Zerocoded
+    {
+        Info Single
+        {   ObjectCapacity          S32 }
+        {   ObjectCount             S32 }
+        {   PriceEnergyUnit         S32 }
+        {   PriceObjectClaim        S32 }
+        {   PricePublicObjectDecay  S32 }
+        {   PricePublicObjectDelete S32 }
+        {   PriceParcelClaim        S32 }
+        {   PriceParcelClaimFactor  F32 }
+        {   PriceUpload             S32 }
+        {   PriceRentLight          S32 }
+        {   TeleportMinPrice        S32 }
+        {   TeleportPriceExponent   F32 }
+        {   EnergyEfficiency        F32 }
+        {   PriceObjectRent         F32 }
+        {   PriceObjectScaleFactor  F32 }
+        {   PriceParcelRent         S32 }
+        {   PriceGroupCreate        S32 }
+    }
 }
 
 // ***************************************************************************
@@ -517,75 +517,75 @@ version 2.0
 // viewer -> sim -> data
 // reliable
 {
-	AvatarPickerRequest Low 26 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-		{	SessionID	LLUUID		}
-		{	QueryID		LLUUID		}
-	}
-	{
-		Data			Single
-		{	Name		Variable 1	}
-	}
+    AvatarPickerRequest Low 26 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   QueryID     LLUUID  }
+    }
+    {
+        Data Single
+        {   Name    Variable 1  }
+    }
 }
 
 // backend implementation which tracks if the user is a god.
 {
-	AvatarPickerRequestBackend Low 27 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-		{	SessionID	LLUUID		}
-		{	QueryID		LLUUID		}
-		{	GodLevel	U8	}
-	}
-	{
-		Data			Single
-		{	Name		Variable 1	}
-	}
+    AvatarPickerRequestBackend Low 27 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   QueryID     LLUUID  }
+        {   GodLevel    U8      }
+    }
+    {
+        Data Single
+        {   Name    Variable 1  }
+    }
 }
 
 // AvatarPickerReply
 // List of names to select a person
 // reliable
 {
-	AvatarPickerReply Low 28 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-		{	QueryID		LLUUID		}
-	}
-	{
-		Data			Variable
-		{	AvatarID	LLUUID		}
-		{	FirstName	Variable 1	}
-		{	LastName	Variable 1	}
-	}
+    AvatarPickerReply Low 28 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+        {   QueryID LLUUID  }
+    }
+    {
+        Data Variable
+        {   AvatarID    LLUUID      }
+        {   FirstName   Variable 1  }
+        {   LastName    Variable 1  }
+    }
 }
 
 // PlacesQuery
 // Used for getting a list of places for the group land panel
 // and the user land holdings panel.  NOT for the directory.
 {
-	PlacesQuery Low 29 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-		{	SessionID	LLUUID		}
-		{	QueryID		LLUUID		}
-	}
-	{
-		TransactionData Single
-		{	TransactionID	LLUUID	}
-	}
-	{
-		QueryData		Single
-		{	QueryText	Variable	1	}
-		{	QueryFlags	U32				}
-		{	Category	S8				}
-		{	SimName		Variable	1	}
-	}
+    PlacesQuery Low 29 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   QueryID     LLUUID  }
+    }
+    {
+        TransactionData Single
+        {   TransactionID   LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryText   Variable 1   }
+        {   QueryFlags  U32          }
+        {   Category    S8           }
+        {   SimName     Variable 1   }
+    }
 }
 
 // PlacesReply
@@ -594,112 +594,112 @@ version 2.0
 // global x,y,z.  Otherwise, use center of the AABB.
 // reliable
 {
-	PlacesReply Low 30 Trusted Zerocoded UDPDeprecated
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-		{	QueryID		LLUUID		}
-	}
-	{
-		TransactionData Single
-		{	TransactionID	LLUUID	}
-	}
-	{
-		QueryData		Variable
-		{	OwnerID			LLUUID			}
-		{	Name			Variable	1	}
-		{	Desc			Variable	1	}
-		{	ActualArea		S32				}
-		{	BillableArea	S32				}
-		{	Flags			U8				}
-		{	GlobalX			F32				}	// meters
-		{	GlobalY			F32				}	// meters
-		{	GlobalZ			F32				}	// meters
-		{	SimName			Variable	1	}
-		{	SnapshotID		LLUUID			}
-		{	Dwell			F32				}
-		{	Price			S32				}
-		//{	ProductSKU		Variable	1	}
-	}
+    PlacesReply Low 30 Trusted Zerocoded UDPDeprecated
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+        {   QueryID LLUUID  }
+    }
+    {
+        TransactionData Single
+        {   TransactionID   LLUUID  }
+    }
+    {
+        QueryData Variable
+        {   OwnerID         LLUUID      }
+        {   Name            Variable 1  }
+        {   Desc            Variable 1  }
+        {   ActualArea      S32         }
+        {   BillableArea    S32         }
+        {   Flags           U8          }
+        {   GlobalX         F32         }   // meters
+        {   GlobalY         F32         }   // meters
+        {   GlobalZ         F32         }   // meters
+        {   SimName         Variable 1  }
+        {   SnapshotID      LLUUID      }
+        {   Dwell           F32         }
+        {   Price           S32         }
+        //{   ProductSKU      Variable 1  }
+    }
 }
 
 // DirFindQuery viewer->sim
-// Message to start asking questions for the directory 
-{
-	DirFindQuery Low 31 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-		{	SessionID	LLUUID		}
-	}
-	{
-		QueryData		Single
-		{	QueryID		LLUUID		}
-		{	QueryText	Variable 1	}
-		{	QueryFlags	U32			}
-		{	QueryStart	S32			}	// prev/next page support
-	}
+// Message to start asking questions for the directory
+{
+    DirFindQuery Low 31 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryID     LLUUID      }
+        {   QueryText   Variable 1  }
+        {   QueryFlags  U32         }
+        {   QueryStart  S32         }   // prev/next page support
+    }
 }
 
 // DirFindQueryBackend sim->data
 // Trusted message generated by receipt of DirFindQuery to sim.
 {
-	DirFindQueryBackend Low 32 Trusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-	}
-	{
-		QueryData		Single
-		{	QueryID		LLUUID		}
-		{	QueryText	Variable 1	}
-		{	QueryFlags	U32			}
-		{	QueryStart	S32			}	// prev/next page support
-		{	EstateID	U32			}
-		{	Godlike		BOOL		}
-	}
+    DirFindQueryBackend Low 32 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryID     LLUUID      }
+        {   QueryText   Variable 1  }
+        {   QueryFlags  U32         }
+        {   QueryStart  S32         }   // prev/next page support
+        {   EstateID    U32         }
+        {   Godlike     BOOL        }
+    }
 }
 
 
 // DirPlacesQuery viewer->sim
 // Used for the Find directory of places
 {
-	DirPlacesQuery Low 33 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-		{	SessionID	LLUUID		}
-	}
-	{
-		QueryData		Single
-		{	QueryID		LLUUID		}
-		{	QueryText	Variable	1	}
-		{	QueryFlags	U32				}
-		{	Category	S8				}
-		{	SimName		Variable	1	}
-		{	QueryStart	S32			}
-	}
+    DirPlacesQuery Low 33 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryID     LLUUID      }
+        {   QueryText   Variable 1  }
+        {   QueryFlags  U32         }
+        {   Category    S8          }
+        {   SimName     Variable 1  }
+        {   QueryStart  S32         }
+    }
 }
 
 // DirPlacesQueryBackend sim->dataserver
 // Used for the Find directory of places.
 {
-	DirPlacesQueryBackend Low 34 Trusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-	}
-	{
-		QueryData		Single
-		{	QueryID		LLUUID		}
-		{	QueryText	Variable	1	}
-		{	QueryFlags	U32				}
-		{	Category	S8				}
-		{	SimName		Variable	1	}
-		{	EstateID	U32				}
-		{	Godlike		BOOL			}
-		{	QueryStart	S32			}
-	}
+    DirPlacesQueryBackend Low 34 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryID     LLUUID      }
+        {   QueryText   Variable 1  }
+        {   QueryFlags  U32         }
+        {   Category    S8          }
+        {   SimName     Variable 1  }
+        {   EstateID    U32         }
+        {   Godlike     BOOL        }
+        {   QueryStart  S32         }
+    }
 }
 
 // DirPlacesReply dataserver->sim->viewer
@@ -707,164 +707,164 @@ version 2.0
 // global x,y,z.  Otherwise, use center of the AABB.
 // reliable
 {
-	DirPlacesReply Low 35 Trusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-	}
-	{
-		QueryData		Variable
-		{	QueryID		LLUUID		}
-	}
-	{
-		QueryReplies            Variable
-		{	ParcelID		LLUUID		}
-		{	Name			Variable 1	}
-		{	ForSale			BOOL		}
-		{	Auction			BOOL		}
-		{	Dwell			F32			}
-	}
-	{
-		StatusData            Variable
-		{	Status		U32		}
-	}
+    DirPlacesReply Low 35 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        QueryData Variable
+        {   QueryID LLUUID  }
+    }
+    {
+        QueryReplies Variable
+        {   ParcelID    LLUUID      }
+        {   Name        Variable 1  }
+        {   ForSale     BOOL        }
+        {   Auction     BOOL        }
+        {   Dwell       F32         }
+    }
+    {
+        StatusData Variable
+        {   Status  U32 }
+    }
 }
 
 // DirPeopleReply
 {
-	DirPeopleReply Low 36 Trusted Zerocoded
-	{
-		AgentData				Single
-		{	AgentID				LLUUID	}
-	}
-	{
-		QueryData		        Single
-		{	QueryID		        LLUUID	}
-	}
-	{
-		QueryReplies            Variable
- 		{	AgentID	  	 	    LLUUID			}
-		{	FirstName	        Variable	1	}
-		{	LastName	        Variable	1	}
-		{	Group		        Variable	1	}
-		{	Online  	        BOOL			}
-		{	Reputation	        S32				}
-	}
+    DirPeopleReply Low 36 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryID LLUUID  }
+    }
+    {
+        QueryReplies Variable
+        {   AgentID     LLUUID      }
+        {   FirstName   Variable 1  }
+        {   LastName    Variable 1  }
+        {   Group       Variable 1  }
+        {   Online      BOOL        }
+        {   Reputation  S32         }
+    }
 }
 
 // DirEventsReply
 {
-	DirEventsReply Low 37 Trusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-	}
-	{
-		QueryData		Single
-		{	QueryID		LLUUID		}
-	}
-	{
-		QueryReplies	Variable
-		{	OwnerID		LLUUID			}
-		{	Name		Variable	1	}
-		{	EventID		U32				}
-		{	Date		Variable	1	}
-		{	UnixTime	U32				}
-		{	EventFlags	U32				}
-	}
-	{
-		StatusData Variable
-		{	Status		U32			}
-	}
+    DirEventsReply Low 37 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryID LLUUID      }
+    }
+    {
+        QueryReplies Variable
+        {   OwnerID     LLUUID      }
+        {   Name        Variable 1  }
+        {   EventID     U32         }
+        {   Date        Variable 1  }
+        {   UnixTime    U32         }
+        {   EventFlags  U32         }
+    }
+    {
+        StatusData Variable
+        {   Status  U32 }
+    }
 }
 
 // DirGroupsReply
 // dataserver -> userserver -> viewer
 // reliable
 {
-	DirGroupsReply Low 38 Trusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID			}
-	}
-	{
-		QueryData		Single
-		{	QueryID		LLUUID			}
-	}
-	{
-		QueryReplies	Variable
-		{	GroupID			LLUUID			}
-		{	GroupName		Variable	1	}	// string
-		{	Members			S32				}
-		{	SearchOrder		F32				}
-	}
+    DirGroupsReply Low 38 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryID LLUUID  }
+    }
+    {
+        QueryReplies Variable
+        {   GroupID     LLUUID      }
+        {   GroupName   Variable 1  }   // string
+        {   Members     S32         }
+        {   SearchOrder F32         }
+    }
 }
 
 
 // DirClassifiedQuery viewer->sim
 // reliable
 {
-	DirClassifiedQuery Low 39 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		QueryData			Single
-		{	QueryID			LLUUID			}
-		{	QueryText		Variable	1	}
-		{	QueryFlags		U32				}
-		{	Category		U32				}
-		{	QueryStart	S32					}
-	}
+    DirClassifiedQuery Low 39 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID         LLUUID  }
+        {   SessionID       LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryID     LLUUID      }
+        {   QueryText   Variable 1  }
+        {   QueryFlags  U32         }
+        {   Category    U32         }
+        {   QueryStart  S32         }
+    }
 }
 
 // DirClassifiedQueryBackend sim->dataserver
 // reliable
 {
-	DirClassifiedQueryBackend Low 40 Trusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-	}
-	{
-		QueryData			Single
-		{	QueryID			LLUUID			}
-		{	QueryText		Variable	1	}
-		{	QueryFlags		U32				}
-		{	Category		U32				}
-		{	EstateID		U32				}
-		{	Godlike			BOOL			}
-		{	QueryStart	S32					}
-	}
+    DirClassifiedQueryBackend Low 40 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryID     LLUUID      }
+        {   QueryText   Variable 1  }
+        {   QueryFlags  U32         }
+        {   Category    U32         }
+        {   EstateID    U32         }
+        {   Godlike     BOOL        }
+        {   QueryStart  S32         }
+    }
 }
 
 // DirClassifiedReply dataserver->sim->viewer
 // reliable
 {
-	DirClassifiedReply Low 41 Trusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-	}
-	{
-		QueryData		Single
-		{	QueryID		LLUUID		}
-	}
-	{
-		QueryReplies	Variable
-		{	ClassifiedID	LLUUID		}
-		{	Name			Variable 1	}
-		{	ClassifiedFlags	U8			}
-		{	CreationDate	U32			}
-		{	ExpirationDate	U32			}
-		{	PriceForListing	S32			}
-	}
-	{
-		StatusData Variable
-		{	Status			U32		}
-	}
+    DirClassifiedReply Low 41 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryID LLUUID  }
+    }
+    {
+        QueryReplies Variable
+        {   ClassifiedID    LLUUID      }
+        {   Name            Variable 1  }
+        {   ClassifiedFlags U8          }
+        {   CreationDate    U32         }
+        {   ExpirationDate  U32         }
+        {   PriceForListing S32         }
+    }
+    {
+        StatusData Variable
+        {   Status  U32 }
+    }
 }
 
 
@@ -874,17 +874,17 @@ version 2.0
 // This fills in the tabs of the Classifieds panel.
 // reliable
 {
-	AvatarClassifiedReply Low 42 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID		}
-		{	TargetID		LLUUID		}
-	}
-	{
-		Data			Variable
-		{	ClassifiedID	LLUUID		}
-		{	Name			Variable 1	}
-	}
+    AvatarClassifiedReply Low 42 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   TargetID    LLUUID  }
+    }
+    {
+        Data Variable
+        {   ClassifiedID    LLUUID      }
+        {   Name            Variable 1  }
+    }
 }
 
 
@@ -893,16 +893,16 @@ version 2.0
 // simulator -> dataserver
 // reliable
 {
-	ClassifiedInfoRequest Low 43 NotTrusted Zerocoded
-	{
-		AgentData        Single
-		{    AgentID        LLUUID		}
-		{    SessionID      LLUUID		}
-	}
-	{
-		Data        Single
-		{	ClassifiedID	LLUUID		}
-	}
+    ClassifiedInfoRequest Low 43 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   ClassifiedID    LLUUID  }
+    }
 }
 
 
@@ -911,28 +911,28 @@ version 2.0
 // simulator -> viewer
 // reliable
 {
-	ClassifiedInfoReply Low 44 Trusted Unencoded
+    ClassifiedInfoReply Low 44 Trusted Unencoded
     {
-        AgentData    Single
-        {	AgentID			LLUUID		}
+        AgentData Single
+        {   AgentID LLUUID  }
     }
     {
-		Data        Single
-		{	ClassifiedID	LLUUID		}
-		{	CreatorID		LLUUID		}
-		{	CreationDate	U32			}
-		{	ExpirationDate	U32			}
-		{	Category		U32			}
-		{	Name			Variable 1	}
-        {	Desc			Variable 2	}
-		{	ParcelID		LLUUID		}
-		{	ParentEstate	U32			}
-        {	SnapshotID		LLUUID		}
-        {	SimName			Variable 1	}
-        {	PosGlobal		LLVector3d	}
-        {	ParcelName		Variable 1	}
-		{	ClassifiedFlags	U8			}
-		{	PriceForListing	S32			}
+        Data Single
+        {   ClassifiedID    LLUUID      }
+        {   CreatorID       LLUUID      }
+        {   CreationDate    U32         }
+        {   ExpirationDate  U32         }
+        {   Category        U32         }
+        {   Name            Variable 1  }
+        {   Desc            Variable 2  }
+        {   ParcelID        LLUUID      }
+        {   ParentEstate    U32         }
+        {   SnapshotID      LLUUID      }
+        {   SimName         Variable 1  }
+        {   PosGlobal       LLVector3d  }
+        {   ParcelName      Variable 1  }
+        {   ClassifiedFlags U8          }
+        {   PriceForListing S32         }
     }
 }
 
@@ -943,25 +943,25 @@ version 2.0
 // viewer -> simulator -> dataserver
 // reliable
 {
-	ClassifiedInfoUpdate Low 45 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-	}
-	{
-		Data		Single
-		{	ClassifiedID	LLUUID		}
-		{	Category		U32			}
-		{	Name			Variable 1	}
-		{	Desc			Variable 2	}
-		{	ParcelID		LLUUID		}
-		{	ParentEstate	U32			}
-		{	SnapshotID		LLUUID		}
-		{	PosGlobal		LLVector3d	}
-		{	ClassifiedFlags	U8			}
-		{	PriceForListing	S32			}
-	}
+    ClassifiedInfoUpdate Low 45 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   ClassifiedID    LLUUID      }
+        {   Category        U32         }
+        {   Name            Variable 1  }
+        {   Desc            Variable 2  }
+        {   ParcelID        LLUUID      }
+        {   ParentEstate    U32         }
+        {   SnapshotID      LLUUID      }
+        {   PosGlobal       LLVector3d  }
+        {   ClassifiedFlags U8          }
+        {   PriceForListing S32         }
+    }
 }
 
 
@@ -970,36 +970,36 @@ version 2.0
 // viewer -> simulator -> dataserver
 // reliable
 {
-	ClassifiedDelete Low 46 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-	}
-	{
-		Data	Single
-		{	ClassifiedID	LLUUID		}
-	}
+    ClassifiedDelete Low 46 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   ClassifiedID    LLUUID  }
+    }
 }
 
 // ClassifiedGodDelete
 // Delete a classified from the database.
-// QueryID is needed so database can send a repeat list of 
+// QueryID is needed so database can send a repeat list of
 // classified.
 // viewer -> simulator -> dataserver
 // reliable
 {
-	ClassifiedGodDelete Low 47 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-	}
-	{
-		Data	Single
-		{	ClassifiedID	LLUUID		}
-		{	QueryID			LLUUID		}
-	}
+    ClassifiedGodDelete Low 47 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   ClassifiedID    LLUUID  }
+        {   QueryID         LLUUID  }
+    }
 }
 
 
@@ -1007,168 +1007,168 @@ version 2.0
 // Special query for the land for sale/auction panel.
 // reliable
 {
-	DirLandQuery Low 48 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		QueryData			Single
-		{	QueryID			LLUUID	}
-		{	QueryFlags		U32		}
-		{	SearchType		U32		}
-		{	Price			S32		}
-		{	Area			S32		}
-		{	QueryStart		S32		}
-	}
+    DirLandQuery Low 48 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryID     LLUUID  }
+        {   QueryFlags  U32     }
+        {   SearchType  U32     }
+        {   Price       S32     }
+        {   Area        S32     }
+        {   QueryStart  S32     }
+    }
 }
 
 // DirLandQueryBackend sim->dataserver
 // Special query for the land for sale/auction panel.
 {
-	DirLandQueryBackend Low 49 Trusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-	}
-	{
-		QueryData			Single
-		{	QueryID			LLUUID	}
-		{	QueryFlags		U32		}
-		{	SearchType		U32		}
-		{	Price			S32		}
-		{	Area			S32		}
-		{	QueryStart		S32		}
-		{	EstateID		U32		}
-		{	Godlike			BOOL	}
-	}
+    DirLandQueryBackend Low 49 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryID     LLUUID  }
+        {   QueryFlags  U32     }
+        {   SearchType  U32     }
+        {   Price       S32     }
+        {   Area        S32     }
+        {   QueryStart  S32     }
+        {   EstateID    U32     }
+        {   Godlike     BOOL    }
+    }
 }
 
 // DirLandReply
 // dataserver -> simulator -> viewer
 // reliable
 {
-	DirLandReply Low 50 Trusted Zerocoded UDPDeprecated
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-	}
-	{
-		QueryData			Single
-		{	QueryID			LLUUID		}
-	}
-	{
-		QueryReplies		Variable
-		{	ParcelID		LLUUID		}
-		{	Name			Variable 1	}
-		{	Auction			BOOL		}
-		{	ForSale			BOOL		}
-		{	SalePrice		S32			}
-		{	ActualArea		S32			}
-		//{	ProductSKU		Variable 1	}
-	}
+    DirLandReply Low 50 Trusted Zerocoded UDPDeprecated
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryID LLUUID  }
+    }
+    {
+        QueryReplies Variable
+        {   ParcelID    LLUUID      }
+        {   Name        Variable 1  }
+        {   Auction     BOOL        }
+        {   ForSale     BOOL        }
+        {   SalePrice   S32         }
+        {   ActualArea  S32         }
+        //{ ProductSKU  Variable 1  }
+    }
 }
 
 // DEPRECATED: DirPopularQuery viewer->sim
 // Special query for the land for sale/auction panel.
 // reliable
 {
-	DirPopularQuery Low 51 NotTrusted Zerocoded Deprecated
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		QueryData			Single
-		{	QueryID			LLUUID	}
-		{	QueryFlags		U32		}
-	}
+    DirPopularQuery Low 51 NotTrusted Zerocoded Deprecated
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryID     LLUUID  }
+        {   QueryFlags  U32     }
+    }
 }
 
 // DEPRECATED: DirPopularQueryBackend sim->dataserver
 // Special query for the land for sale/auction panel.
 // reliable
 {
-	DirPopularQueryBackend Low 52 Trusted Zerocoded Deprecated
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-	}
-	{
-		QueryData			Single
-		{	QueryID			LLUUID	}
-		{	QueryFlags		U32		}
-		{	EstateID		U32		}
-		{	Godlike			BOOL	}
-	}
+    DirPopularQueryBackend Low 52 Trusted Zerocoded Deprecated
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryID     LLUUID  }
+        {   QueryFlags  U32     }
+        {   EstateID    U32     }
+        {   Godlike     BOOL    }
+    }
 }
 
 // DEPRECATED: DirPopularReply
 // dataserver -> simulator -> viewer
 // reliable
 {
-	DirPopularReply Low 53 Trusted Zerocoded Deprecated
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-	}
-	{
-		QueryData			Single
-		{	QueryID			LLUUID		}
-	}
-	{
-		QueryReplies		Variable
-		{	ParcelID		LLUUID		}
-		{	Name			Variable 1	}
-		{	Dwell			F32			}
-	}
+    DirPopularReply Low 53 Trusted Zerocoded Deprecated
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        QueryData Single
+        {   QueryID LLUUID  }
+    }
+    {
+        QueryReplies Variable
+        {   ParcelID    LLUUID      }
+        {   Name        Variable 1  }
+        {   Dwell       F32         }
+    }
 }
 
 // ParcelInfoRequest
 // viewer -> simulator -> dataserver
 // reliable
 {
-	ParcelInfoRequest Low 54 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID	}
-	}
-	{
-		Data			Single
-		{	ParcelID		LLUUID		}
-	}
+    ParcelInfoRequest Low 54 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   ParcelID    LLUUID  }
+    }
 }
 
 // ParcelInfoReply
 // dataserver -> simulator -> viewer
 // reliable
 {
-	ParcelInfoReply Low 55 Trusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID		}
-	}
-	{
-		Data			Single
-		{	ParcelID		LLUUID			}
-		{	OwnerID			LLUUID			}
-		{	Name			Variable	1	}
-		{	Desc			Variable	1	}
-		{	ActualArea		S32				}
-		{	BillableArea	S32				}
-		{	Flags			U8				}
-		{	GlobalX			F32				}	// meters
-		{	GlobalY			F32				}	// meters
-		{	GlobalZ			F32				}	// meters
-		{	SimName			Variable	1	}
-		{	SnapshotID		LLUUID			}
-		{	Dwell			F32				}
-		{	SalePrice		S32				}
-		{	AuctionID		S32				}
-	}
+    ParcelInfoReply Low 55 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        Data Single
+        {   ParcelID        LLUUID      }
+        {   OwnerID         LLUUID      }
+        {   Name            Variable 1  }
+        {   Desc            Variable 1  }
+        {   ActualArea      S32         }
+        {   BillableArea    S32         }
+        {   Flags           U8          }
+        {   GlobalX         F32         }   // meters
+        {   GlobalY         F32         }   // meters
+        {   GlobalZ         F32         }   // meters
+        {   SimName         Variable 1  }
+        {   SnapshotID      LLUUID      }
+        {   Dwell           F32         }
+        {   SalePrice       S32         }
+        {   AuctionID       S32         }
+    }
 }
 
 
@@ -1176,16 +1176,16 @@ version 2.0
 // viewer -> simulator
 // reliable
 {
-	ParcelObjectOwnersRequest Low 56 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ParcelData		Single
-		{	LocalID			S32		}
-	}
+    ParcelObjectOwnersRequest Low 56 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ParcelData Single
+        {   LocalID S32 }
+    }
 }
 
 
@@ -1193,51 +1193,51 @@ version 2.0
 // simulator -> viewer
 // reliable
 {
-	ParcelObjectOwnersReply Low 57 Trusted Zerocoded UDPDeprecated
-	{
-		Data			Variable
-		{	OwnerID			LLUUID			}
-		{	IsGroupOwned	BOOL			}
-		{	Count			S32				}
-		{	OnlineStatus	BOOL			}
-	}
+    ParcelObjectOwnersReply Low 57 Trusted Zerocoded UDPDeprecated
+    {
+        Data Variable
+        {   OwnerID         LLUUID  }
+        {   IsGroupOwned    BOOL    }
+        {   Count           S32     }
+        {   OnlineStatus    BOOL    }
+    }
 }
 
 // GroupNoticeListRequest
 // viewer -> simulator -> dataserver
 // reliable
 {
-	GroupNoticesListRequest	Low	58 NotTrusted	Unencoded
-	{
-		AgentData        Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-	}
-	{
-		Data        Single
-		{	GroupID			LLUUID		}
-	}
+    GroupNoticesListRequest Low 58 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   GroupID LLUUID  }
+    }
 }
 
 // GroupNoticesListReply
 // dataserver -> simulator -> viewer
 // reliable
 {
-	GroupNoticesListReply	Low	59 Trusted	Unencoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID		}
-		{	GroupID			LLUUID		}
-	}
-	{
-		Data		Variable
-		{	NoticeID		LLUUID		}
-		{	Timestamp		U32			}
-		{	FromName		Variable 2	}
-		{	Subject			Variable 2	}
-		{	HasAttachment	BOOL		}
-		{	AssetType		U8			}
-	}
+    GroupNoticesListReply Low 59 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+        {   GroupID LLUUID  }
+    }
+    {
+        Data Variable
+        {   NoticeID        LLUUID      }
+        {   Timestamp       U32         }
+        {   FromName        Variable 2  }
+        {   Subject         Variable 2  }
+        {   HasAttachment   BOOL        }
+        {   AssetType       U8          }
+    }
 }
 
 // GroupNoticeRequest
@@ -1245,48 +1245,48 @@ version 2.0
 // simulator -> dataserver
 // reliable
 {
-	GroupNoticeRequest Low 60 NotTrusted Unencoded
-	{
-		AgentData        Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-	}
-	{
-		Data        Single
-		{	GroupNoticeID	LLUUID		}
-	}
+    GroupNoticeRequest Low 60 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   GroupNoticeID   LLUUID  }
+    }
 }
 
 // GroupNoticeAdd
-// Add a group notice. 
+// Add a group notice.
 // simulator -> dataserver
 // reliable
 {
-	GroupNoticeAdd Low 61 Trusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID		}
-	}
-	{
-		MessageBlock		Single
-		{	ToGroupID		LLUUID	}
-		{	ID				LLUUID	}
-		{	Dialog			U8	}
-		{	FromAgentName	Variable	1	}
-		{	Message			Variable	2	}
-		{	BinaryBucket	Variable	2	}
-	}
+    GroupNoticeAdd Low 61 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        MessageBlock Single
+        {   ToGroupID       LLUUID      }
+        {   ID              LLUUID      }
+        {   Dialog          U8          }
+        {   FromAgentName   Variable 1  }
+        {   Message         Variable 2  }
+        {   BinaryBucket    Variable 2  }
+    }
 }
 
 
 // ****************************************************************************
 // Teleport messages
 //
-// The teleport messages are numerous, so I have attempted to give them a 
+// The teleport messages are numerous, so I have attempted to give them a
 // consistent naming convention. Since there is a bit of glob pattern
 // aliasing, the rules are applied in order.
 //
-// Teleport* - viewer->sim or sim->viewer message which announces a 
+// Teleport* - viewer->sim or sim->viewer message which announces a
 //             teleportation request, progrees, start, or end.
 // Data* - sim->data or data->sim trusted message.
 // Space* - sim->space or space->sim trusted messaging
@@ -1301,202 +1301,202 @@ version 2.0
 // TeleportRequest
 // viewer -> sim specifying exact teleport destination
 {
-	TeleportRequest	Low	62 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID		}
-		{	SessionID	LLUUID		}
-	}
-	{
-		Info		Single
-		{	RegionID	LLUUID		}
-		{	Position	LLVector3	}
-		{	LookAt		LLVector3	}
-	}
+    TeleportRequest Low 62 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Info Single
+        {   RegionID    LLUUID      }
+        {   Position    LLVector3   }
+        {   LookAt      LLVector3   }
+    }
 }
 
 // TeleportLocationRequest
 // viewer -> sim specifying exact teleport destination
 {
-	TeleportLocationRequest	Low	63 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID		}
-		{	SessionID	LLUUID		}
-	}
-	{
-		Info	Single
-		{	RegionHandle	U64			}
-		{	Position		LLVector3	}
-		{	LookAt			LLVector3	}
-	}
+    TeleportLocationRequest Low 63 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Info Single
+        {   RegionHandle    U64         }
+        {   Position        LLVector3   }
+        {   LookAt          LLVector3   }
+    }
 }
 
 // TeleportLocal
 // sim -> viewer reply telling the viewer that we've successfully TP'd
 // to somewhere else within the sim
 {
-	TeleportLocal Low 64 Trusted Unencoded
-	{
-		Info		Single
-		{	AgentID			LLUUID			}
-		{	LocationID		U32				}
-		{	Position		LLVector3		}	// region
-		{	LookAt			LLVector3		}
-		{	TeleportFlags 	U32				}
-	}
+    TeleportLocal Low 64 Trusted Unencoded
+    {
+        Info Single
+        {   AgentID         LLUUID      }
+        {   LocationID      U32         }
+        {   Position        LLVector3   }   // region
+        {   LookAt          LLVector3   }
+        {   TeleportFlags   U32         }
+    }
 }
 
 // TeleportLandmarkRequest viewer->sim
 // teleport to landmark asset ID destination. use LLUUD::null for home.
 {
-	TeleportLandmarkRequest Low 65 NotTrusted Zerocoded
-	{
-		Info		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-		{	LandmarkID		LLUUID	}
-	}
+    TeleportLandmarkRequest Low 65 NotTrusted Zerocoded
+    {
+        Info Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   LandmarkID  LLUUID  }
+    }
 }
 
 // TeleportProgress sim->viewer
 // Tell the agent how the teleport is going.
 {
-	TeleportProgress Low 66 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-	}
-	{
-		Info			Single
-		{	TeleportFlags	U32			}
-		{	Message		Variable	1	}  // string
-	}
+    TeleportProgress Low 66 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        Info Single
+        {   TeleportFlags   U32         }
+        {   Message         Variable 1  }   // string
+    }
 }
 
 // DataHomeLocationRequest sim->data
-// Request 
+// Request
 {
-	DataHomeLocationRequest Low 67 Trusted Zerocoded
-	{
-		Info		Single
-		{	AgentID			LLUUID	}
-		{	KickedFromEstateID	U32	}
-	}
-	{
-		AgentInfo	Single
-		{   AgentEffectiveMaturity U32  }
-	}
+    DataHomeLocationRequest Low 67 Trusted Zerocoded
+    {
+        Info Single
+        {   AgentID             LLUUID  }
+        {   KickedFromEstateID  U32     }
+    }
+    {
+        AgentInfo Single
+        {   AgentEffectiveMaturity U32  }
+    }
 }
 
 // DataHomeLocationReply data->sim
 // response is the location of agent home.
 {
-	DataHomeLocationReply Low 68 Trusted Unencoded
-	{
-		Info		Single
-		{	AgentID			LLUUID		}
-		{	RegionHandle	U64			}
-		{	Position		LLVector3	}	// region coords
-		{	LookAt			LLVector3	}
-	}
+    DataHomeLocationReply Low 68 Trusted Unencoded
+    {
+        Info Single
+        {   AgentID         LLUUID      }
+        {   RegionHandle    U64         }
+        {   Position        LLVector3   }   // region coords
+        {   LookAt          LLVector3   }
+    }
 }
 
 
 // TeleportFinish sim->viewer
-// called when all of the information has been collected and readied for 
+// called when all of the information has been collected and readied for
 // the agent.
 {
-	TeleportFinish Low 69 Trusted Unencoded UDPBlackListed
-	{
-		Info		Single
-		{	AgentID			LLUUID			}
-		{	LocationID		U32				}
-		{	SimIP			IPADDR			}
-		{	SimPort			IPPORT			}
-		{	RegionHandle	U64				}
-		{	SeedCapability	Variable	2	}	// URL
-		{	SimAccess		U8				}
-		{	TeleportFlags 	U32				}
-	}
+    TeleportFinish Low 69 Trusted Unencoded UDPBlackListed
+    {
+        Info Single
+        {   AgentID         LLUUID      }
+        {   LocationID      U32         }
+        {   SimIP           IPADDR      }
+        {   SimPort         IPPORT      }
+        {   RegionHandle    U64         }
+        {   SeedCapability  Variable 2  }   // URL
+        {   SimAccess       U8          }
+        {   TeleportFlags   U32         }
+    }
 }
 
 // StartLure viewer->sim
-// Sent from viewer to the local simulator to lure target id to near 
-// agent id. This will generate an instant message that will be routed 
-// through the space server and out to the userserver. When that IM 
-// goes through the userserver and the TargetID is online, the 
+// Sent from viewer to the local simulator to lure target id to near
+// agent id. This will generate an instant message that will be routed
+// through the space server and out to the userserver. When that IM
+// goes through the userserver and the TargetID is online, the
 // userserver will send an InitializeLure to the spaceserver. When that
-// packet is acked, the original instant message is finally forwarded to 
+// packet is acked, the original instant message is finally forwarded to
 // TargetID.
 {
-	StartLure	Low	70 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID			}
-		{	SessionID		LLUUID			}
-	}
-	{
-		Info	Single
-		{	LureType 		U8	 			}
-		{	Message			Variable	1	}
-	}
-	{
-		TargetData Variable
-		{	TargetID		LLUUID			}
-	}
+    StartLure Low 70 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Info Single
+        {   LureType    U8          }
+        {   Message     Variable 1  }
+    }
+    {
+        TargetData Variable
+        {   TargetID    LLUUID  }
+    }
 }
 
 // TeleportLureRequest viewer->sim
-// Message from target of lure to begin the teleport process on the 
+// Message from target of lure to begin the teleport process on the
 // local simulator.
 {
-	TeleportLureRequest	Low	71 NotTrusted Unencoded
-	{
-		Info	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	LureID		LLUUID	}
-		{	TeleportFlags 	U32				}
-	}
+    TeleportLureRequest Low 71 NotTrusted Unencoded
+    {
+        Info Single
+        {   AgentID         LLUUID  }
+        {   SessionID       LLUUID  }
+        {   LureID          LLUUID  }
+        {   TeleportFlags   U32     }
+    }
 }
 
 // TeleportCancel viewer->sim
 // reliable
 {
-	TeleportCancel	Low	72 NotTrusted Unencoded
-	{
-		Info	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
+    TeleportCancel Low 72 NotTrusted Unencoded
+    {
+        Info Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
 }
 
 
 // TeleportStart sim->viewer
 // announce a successful teleport request to the viewer.
 {
-	TeleportStart Low 73 Trusted Unencoded
-	{
-		Info	Single
-		{	TeleportFlags	U32		}
-	}
+    TeleportStart Low 73 Trusted Unencoded
+    {
+        Info Single
+        {   TeleportFlags   U32 }
+    }
 }
 
 // TeleportFailed somewhere->sim->viewer
 // announce failure of teleport request
 {
-	TeleportFailed Low 74 Trusted Unencoded
-	{
-		Info		Single
-		{	AgentID		LLUUID			}
-		{	Reason		Variable	1	}  // string
-	}
-	{
-		AlertInfo			Variable
-		{	Message			Variable	1	}	// string id
-		{	ExtraParams		Variable	1	}	// llsd extra parameters
-	}
+    TeleportFailed Low 74 Trusted Unencoded
+    {
+        Info Single
+        {   AgentID LLUUID      }
+        {   Reason  Variable 1  }   // string
+    }
+    {
+        AlertInfo Variable
+        {   Message     Variable 1  }   // string id
+        {   ExtraParams Variable 1  }   // llsd extra parameters
+    }
 }
 
 
@@ -1506,306 +1506,306 @@ version 2.0
 
 // Undo
 {
-	Undo Low 75 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	GroupID		LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	ObjectID	LLUUID	}
-	}
+    Undo Low 75 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupID     LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectID    LLUUID  }
+    }
 }
 
 
 // Redo
 {
-	Redo Low 76 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	GroupID		LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	ObjectID	LLUUID	}
-	}
+    Redo Low 76 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupID     LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectID    LLUUID  }
+    }
 }
 
 // UndoLand
 {
-	UndoLand Low 77 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
+    UndoLand Low 77 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
 }
 
 
 // AgentPause - viewer occasionally will block, inform simulator of this fact
 {
-	AgentPause Low 78 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	SerialNum	U32		}	// U32, used by both pause and resume. Non-increasing numbers are ignored.
-	}
+    AgentPause Low 78 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   SerialNum   U32     }   // used by both pause and resume. Non-increasing numbers are ignored.
+    }
 }
 
 // AgentResume - unblock the agent
 {
-	AgentResume Low 79 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	SerialNum	U32		}	// U32, used by both pause and resume. Non-increasing numbers are ignored.
-	}
+    AgentResume Low 79 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   SerialNum   U32     }   // used by both pause and resume. Non-increasing numbers are ignored.
+    }
 }
 
 
 // AgentUpdate - Camera info sent from viewer to simulator
 // or, more simply, two axes and compute cross product
 // State data is temporary, indicates current behavior state:
-//	0 = walking
+//  0 = walking
 //  1 = mouselook
-//  2 = typing 
-//  
+//  2 = typing
+//
 // Center is region local (JNC 8.16.2001)
 // Camera center is region local (JNC 8.29.2001)
 {
-	AgentUpdate High 4 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-		{	BodyRotation	LLQuaternion	}
-		{	HeadRotation	LLQuaternion	}
-		{	State			U8	}
-		{	CameraCenter	LLVector3	}
-		{	CameraAtAxis	LLVector3	}
-		{	CameraLeftAxis	LLVector3	}
-		{	CameraUpAxis	LLVector3	}
-		{	Far				F32	}
-		{	ControlFlags	U32	}
-		{	Flags			U8	}
-	}
+    AgentUpdate High 4 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID         LLUUID          }
+        {   SessionID       LLUUID          }
+        {   BodyRotation    LLQuaternion    }
+        {   HeadRotation    LLQuaternion    }
+        {   State           U8              }
+        {   CameraCenter    LLVector3       }
+        {   CameraAtAxis    LLVector3       }
+        {   CameraLeftAxis  LLVector3       }
+        {   CameraUpAxis    LLVector3       }
+        {   Far             F32             }
+        {   ControlFlags    U32             }
+        {   Flags           U8              }
+    }
 }
 
 // ChatFromViewer
-// Specifies the text to be said and the "type", 
+// Specifies the text to be said and the "type",
 // normal speech, shout, whisper.
 // with the specified radius
 {
-	ChatFromViewer Low 80 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-	}
-	{
-		ChatData			Single
-		{	Message			Variable 2	}
-		{	Type			U8			}
-		{	Channel			S32			}
-	}
+    ChatFromViewer Low 80 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ChatData Single
+        {   Message Variable 2  }
+        {   Type    U8          }
+        {   Channel S32         }
+    }
 }
 
 
 // AgentThrottle
 {
-	AgentThrottle Low 81 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-		{	CircuitCode		U32		}
-	}
-	{
-		Throttle			Single
-		{	GenCounter		U32		}
-		{	Throttles		Variable 1	}
-	}
+    AgentThrottle Low 81 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   CircuitCode U32     }
+    }
+    {
+        Throttle Single
+        {   GenCounter  U32         }
+        {   Throttles   Variable 1  }
+    }
 }
 
 
 // AgentFOV - Update to agent's field of view, angle is vertical, single F32 float in radians
 {
-	AgentFOV Low 82 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-		{	CircuitCode		U32		}
-	}
-	{
-		FOVBlock			Single
-		{	GenCounter		U32		}
-		{	VerticalAngle	F32	}
-	}
+    AgentFOV Low 82 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   CircuitCode U32     }
+    }
+    {
+        FOVBlock Single
+        {   GenCounter      U32     }
+        {   VerticalAngle   F32     }
+    }
 }
 
 
 // AgentHeightWidth - Update to height and aspect, sent as height/width to save space
 // Usually sent when window resized or created
 {
-	AgentHeightWidth Low 83 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-		{	CircuitCode		U32		}
-	}
-	{
-		HeightWidthBlock	Single
-		{	GenCounter		U32		}
-		{	Height			U16	}
-		{	Width			U16	}
-	}
+    AgentHeightWidth Low 83 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   CircuitCode U32     }
+    }
+    {
+        HeightWidthBlock Single
+        {   GenCounter  U32 }
+        {   Height      U16 }
+        {   Width       U16 }
+    }
 }
 
 
 // AgentSetAppearance - Update to agent appearance
 {
-	AgentSetAppearance Low 84 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-		{	SerialNum		U32	}	// U32, Increases every time the appearance changes. A value of 0 resets.
-		{ 	Size			LLVector3	}
-	}
-	{
-		WearableData		Variable
-		{	CacheID			LLUUID }
-		{	TextureIndex	U8 }
-	}
-	{
-		ObjectData			Single
-		{	TextureEntry	Variable	2	}
-	}
-	{
-		VisualParam			Variable
-		{	ParamValue		U8	}
-	}
+    AgentSetAppearance Low 84 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID      }
+        {   SessionID   LLUUID      }
+        {   SerialNum   U32         }   // Increases every time the appearance changes. A value of 0 resets.
+        {   Size        LLVector3   }
+    }
+    {
+        WearableData Variable
+        {   CacheID         LLUUID  }
+        {   TextureIndex    U8      }
+    }
+    {
+        ObjectData Single
+        {   TextureEntry    Variable 2  }
+    }
+    {
+        VisualParam Variable
+        {   ParamValue  U8  }
+    }
 }
 
 // AgentAnimation - Update animation state
 // viewer --> simulator
 {
-	AgentAnimation High 5 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-	}
-	{
-		AnimationList Variable
-		{ AnimID		LLUUID }
-		{ StartAnim		BOOL }
-	}
-	{
-		PhysicalAvatarEventList Variable
-		{ TypeData		Variable	1 }
-	}
+    AgentAnimation High 5 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        AnimationList Variable
+        { AnimID    LLUUID  }
+        { StartAnim BOOL    }
+    }
+    {
+        PhysicalAvatarEventList Variable
+        { TypeData  Variable 1  }
+    }
 }
 
 // AgentRequestSit - Try to sit on an object
 {
-	AgentRequestSit		High 6  NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-	}
-	{
-		TargetObject	Single
-		{	TargetID	LLUUID	}
-		{	Offset		LLVector3	}
-	}
+    AgentRequestSit High 6 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        TargetObject Single
+        {   TargetID    LLUUID      }
+        {   Offset      LLVector3   }
+    }
 }
 
 // AgentSit - Actually sit on object
 {
-	AgentSit			High 7  NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-	}
+    AgentSit High 7 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
 }
 
 
 // quit message sent between simulators
 {
-	AgentQuitCopy Low 85 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-	}
-	{
-		FuseBlock			Single
-		{	ViewerCircuitCode	U32	}
-	}
+    AgentQuitCopy Low 85 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        FuseBlock Single
+        {   ViewerCircuitCode   U32 }
+    }
 }
 
 
 // Request Image - Sent by the viewer to request a specified image at a specified resolution
 
 {
-	RequestImage High 8 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-	}
-	{
-		RequestImage			Variable
-		{	Image				LLUUID	}
-		{	DiscardLevel		S8	}
-		{	DownloadPriority	F32	}
-		{	Packet				U32	}
-		{	Type				U8	}
-	}
+    RequestImage High 8 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        RequestImage Variable
+        {   Image               LLUUID  }
+        {   DiscardLevel        S8      }
+        {   DownloadPriority    F32     }
+        {   Packet              U32     }
+        {   Type                U8      }
+    }
 }
 
 // ImageNotInDatabase
 // Simulator informs viewer that a requsted image definitely does not exist in the asset database
 {
-	ImageNotInDatabase Low 86 Trusted Unencoded
-	{
-		ImageID				Single
-		{	ID				LLUUID	}
-	}
+    ImageNotInDatabase Low 86 Trusted Unencoded
+    {
+        ImageID Single
+        {   ID  LLUUID  }
+    }
 }
 
 // RebakeAvatarTextures
 // simulator -> viewer request when a temporary baked avatar texture is not found
 {
-	RebakeAvatarTextures Low 87 Trusted Unencoded
-	{
-		TextureData			Single
-		{	TextureID		LLUUID	}
-	}
+    RebakeAvatarTextures Low 87 Trusted Unencoded
+    {
+        TextureData Single
+        {   TextureID   LLUUID  }
+    }
 }
 
 
 // SetAlwaysRun
 // Lets the viewer choose between running and walking
 {
-	SetAlwaysRun Low 88 NotTrusted Unencoded
-	{
-		AgentData				Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-		{	AlwaysRun		BOOL	}
-	}
+    SetAlwaysRun Low 88 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   AlwaysRun   BOOL    }
+    }
 }
 
 // ObjectAdd - create new object in the world
@@ -1818,69 +1818,69 @@ version 2.0
 //
 // If only one ImageID is sent for an object type that has more than
 // one face, the same image is repeated on each subsequent face.
-// 
+//
 // Data field is opaque type-specific data for this object
 {
-	ObjectAdd Medium 1 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	GroupID			LLUUID	}
-	}
-	{
-		ObjectData			Single
-		{	PCode			U8	}
-		{	Material		U8	}
-		{	AddFlags		U32	}	// see object_flags.h
-
-		{	PathCurve		U8	}
-		{	ProfileCurve	U8	}
-		{	PathBegin		U16	}	// 0 to 1, quanta = 0.01
-		{	PathEnd			U16	}	// 0 to 1, quanta = 0.01
-		{	PathScaleX		U8	}	// 0 to 1, quanta = 0.01
-		{	PathScaleY		U8	}	// 0 to 1, quanta = 0.01
-		{	PathShearX		U8	}	// -.5 to .5, quanta = 0.01
-		{	PathShearY		U8	}	// -.5 to .5, quanta = 0.01
-		{	PathTwist		S8	}	// -1 to 1, quanta = 0.01
-		{	PathTwistBegin		S8	}	// -1 to 1, quanta = 0.01
-		{ 	PathRadiusOffset 	S8	} 	// -1 to 1, quanta = 0.01
-		{ 	PathTaperX		S8	}	// -1 to 1, quanta = 0.01
-		{	PathTaperY		S8	}	// -1 to 1, quanta = 0.01
-		{	PathRevolutions		U8	}	// 0 to 3, quanta = 0.015
-		{	PathSkew		S8	}	// -1 to 1, quanta = 0.01
-		{	ProfileBegin	U16	}	// 0 to 1, quanta = 0.01
-		{	ProfileEnd		U16	}	// 0 to 1, quanta = 0.01
-		{	ProfileHollow	U16	}	// 0 to 1, quanta = 0.01
-
-		{	BypassRaycast	U8	}
-		{	RayStart		LLVector3	}
-		{	RayEnd			LLVector3	}
-		{	RayTargetID		LLUUID	}
-		{	RayEndIsIntersection	U8	}
-
-		{	Scale			LLVector3	}
-		{	Rotation		LLQuaternion	}
-
-		{	State			U8	}
-	}
+    ObjectAdd Medium 1 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupID     LLUUID  }
+    }
+    {
+        ObjectData Single
+        {   PCode                   U8              }
+        {   Material                U8              }
+        {   AddFlags                U32             }   // see object_flags.h
+
+        {   PathCurve               U8              }
+        {   ProfileCurve            U8              }
+        {   PathBegin               U16             }   // 0 to 1, quanta = 0.01
+        {   PathEnd                 U16             }   // 0 to 1, quanta = 0.01
+        {   PathScaleX              U8              }   // 0 to 1, quanta = 0.01
+        {   PathScaleY              U8              }   // 0 to 1, quanta = 0.01
+        {   PathShearX              U8              }   // -.5 to .5, quanta = 0.01
+        {   PathShearY              U8              }   // -.5 to .5, quanta = 0.01
+        {   PathTwist               S8              }   // -1 to 1, quanta = 0.01
+        {   PathTwistBegin          S8              }   // -1 to 1, quanta = 0.01
+        {   PathRadiusOffset        S8              }   // -1 to 1, quanta = 0.01
+        {   PathTaperX              S8              }   // -1 to 1, quanta = 0.01
+        {   PathTaperY              S8              }   // -1 to 1, quanta = 0.01
+        {   PathRevolutions         U8              }   // 0 to 3, quanta = 0.015
+        {   PathSkew                S8              }   // -1 to 1, quanta = 0.01
+        {   ProfileBegin            U16             }   // 0 to 1, quanta = 0.01
+        {   ProfileEnd              U16             }   // 0 to 1, quanta = 0.01
+        {   ProfileHollow           U16             }   // 0 to 1, quanta = 0.01
+
+        {   BypassRaycast           U8              }
+        {   RayStart                LLVector3       }
+        {   RayEnd                  LLVector3       }
+        {   RayTargetID             LLUUID          }
+        {   RayEndIsIntersection    U8              }
+
+        {   Scale                   LLVector3       }
+        {   Rotation                LLQuaternion    }
+
+        {   State                   U8              }
+    }
 }
 
 
 // ObjectDelete
 // viewer -> simulator
 {
-	ObjectDelete Low 89 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	Force		BOOL	}	// BOOL, god trying to force delete
-	}
-	{
-		ObjectData		Variable
-		{	ObjectLocalID	U32	}
-	}
+    ObjectDelete Low 89 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   Force       BOOL    }   // god trying to force delete
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32 }
+    }
 }
 
 
@@ -1888,22 +1888,22 @@ version 2.0
 // viewer -> simulator
 // Makes a copy of a set of objects, offset by a given amount
 {
-	ObjectDuplicate Low 90 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	GroupID		LLUUID	}
-	}
-	{
-		SharedData			Single
-		{	Offset			LLVector3	}
-		{	DuplicateFlags	U32			}	// see object_flags.h
-	}
-	{
-		ObjectData			Variable
-		{	ObjectLocalID		U32		}
-	}
+    ObjectDuplicate Low 90 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupID     LLUUID  }
+    }
+    {
+        SharedData Single
+        {   Offset          LLVector3   }
+        {   DuplicateFlags  U32         }   // see object_flags.h
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32 }
+    }
 }
 
 
@@ -1912,25 +1912,25 @@ version 2.0
 // Makes a copy of an object, using the add object raycast
 // code to abut it to other objects.
 {
-	ObjectDuplicateOnRay Low 91 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID					LLUUID	}
-		{	SessionID				LLUUID	}
-		{	GroupID					LLUUID	}
-		{	RayStart				LLVector3	}	// region local
-		{	RayEnd					LLVector3	}	// region local
-		{	BypassRaycast			BOOL	}
-		{	RayEndIsIntersection	BOOL	}
-		{	CopyCenters				BOOL	}
-		{	CopyRotates				BOOL	}
-		{	RayTargetID				LLUUID	}
-		{	DuplicateFlags			U32		}	// see object_flags.h
-	}
-	{
-		ObjectData			Variable
-		{	ObjectLocalID			U32		}
-	}
+    ObjectDuplicateOnRay Low 91 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID                 LLUUID      }
+        {   SessionID               LLUUID      }
+        {   GroupID                 LLUUID      }
+        {   RayStart                LLVector3   }   // region local
+        {   RayEnd                  LLVector3   }   // region local
+        {   BypassRaycast           BOOL        }
+        {   RayEndIsIntersection    BOOL        }
+        {   CopyCenters             BOOL        }
+        {   CopyRotates             BOOL        }
+        {   RayTargetID             LLUUID      }
+        {   DuplicateFlags          U32         }   // see object_flags.h
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32 }
+    }
 }
 
 
@@ -1939,18 +1939,18 @@ version 2.0
 // updates position, rotation and scale in one message
 // positions sent as region-local floats
 {
-	MultipleObjectUpdate Medium 2 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ObjectData		Variable 
-		{	ObjectLocalID	U32		}
-		{   Type			U8		}
-		{	Data			Variable	1	}	// custom type
-	}
+    MultipleObjectUpdate Medium 2 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32         }
+        {   Type            U8          }
+        {   Data            Variable 1  }   // custom type
+    }
 }
 
 // RequestMultipleObjects
@@ -1964,17 +1964,17 @@ version 2.0
 // CacheMissType 0 => full object (viewer doesn't have it)
 // CacheMissType 1 => CRC mismatch only
 {
-	RequestMultipleObjects Medium 3 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ObjectData	Variable 
-		{	CacheMissType	U8	}
-		{	ID				U32	}
-	}
+    RequestMultipleObjects Medium 3 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   CacheMissType   U8  }
+        {   ID              U32 }
+    }
 }
 
 
@@ -1990,17 +1990,17 @@ version 2.0
 // == New Location ==
 // MultipleObjectUpdate can be used instead.
 {
-	ObjectPosition Medium 4 NotTrusted Zerocoded Deprecated
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	ObjectLocalID	U32			}
-		{	Position		LLVector3	}	// region
-	}
+    ObjectPosition Medium 4 NotTrusted Zerocoded Deprecated
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32         }
+        {   Position        LLVector3   }   // region
+    }
 }
 
 
@@ -2016,159 +2016,175 @@ version 2.0
 // == New Location ==
 // MultipleObjectUpdate can be used instead.
 {
-	ObjectScale Low 92 NotTrusted Zerocoded Deprecated
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	ObjectLocalID	U32			}
-		{	Scale			LLVector3	}
-	}
+    ObjectScale Low 92 NotTrusted Zerocoded Deprecated
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32         }
+        {   Scale           LLVector3   }
+    }
 }
 
 
 // ObjectRotation
 // viewer -> simulator
 {
-	ObjectRotation Low 93 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	ObjectLocalID	U32				}
-		{	Rotation		LLQuaternion	}
-	}
+    ObjectRotation Low 93 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32             }
+        {   Rotation        LLQuaternion    }
+    }
 }
 
 
 // ObjectFlagUpdate
 // viewer -> simulator
 {
-	ObjectFlagUpdate Low 94 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	ObjectLocalID	U32		}
-		{	UsePhysics		BOOL	}
-		{	IsTemporary		BOOL	}
-		{	IsPhantom		BOOL	}
-		{	CastsShadows	BOOL	}
-	}
+    ObjectFlagUpdate Low 94 NotTrusted Zerocoded
     {
-		ExtraPhysics        Variable
-		{   PhysicsShapeType U8     }
-        {   Density          F32    }
-        {   Friction         F32    }
-        {   Restitution      F32    }
-        {   GravityMultiplier    F32    }
-
-	}
+        AgentData Single
+        {   AgentID         LLUUID  }
+        {   SessionID       LLUUID  }
+        {   ObjectLocalID   U32     }
+        {   UsePhysics      BOOL    }
+        {   IsTemporary     BOOL    }
+        {   IsPhantom       BOOL    }
+        {   CastsShadows    BOOL    }
+    }
+    {
+        ExtraPhysics Variable
+        {   PhysicsShapeType    U8     }
+        {   Density             F32    }
+        {   Friction            F32    }
+        {   Restitution         F32    }
+        {   GravityMultiplier   F32    }
+    }
 }
 
 
 // ObjectClickAction
 // viewer -> simulator
 {
-	ObjectClickAction Low 95 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	ObjectLocalID	U32		}
-		{	ClickAction		U8		}
-	}
+    ObjectClickAction Low 95 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32 }
+        {   ClickAction     U8  }
+    }
 }
 
 
 // ObjectImage
 // viewer -> simulator
 {
-	ObjectImage Low 96 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData			Variable
-		{	ObjectLocalID		U32				}
-		{	MediaURL			Variable	1	}
-		{	TextureEntry		Variable	2	}
-	}
-}
-
-
-{
-	ObjectMaterial Low 97 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	ObjectLocalID	U32	}
-		{	Material	U8	}
-	}
-}
-
-
-{
-	ObjectShape Low 98 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData			Variable
-		{	ObjectLocalID	U32	}
-		{	PathCurve		U8	}
-		{	ProfileCurve	U8	}
-		{	PathBegin		U16	}	// 0 to 1, quanta = 0.01
-		{	PathEnd			U16	}	// 0 to 1, quanta = 0.01
-		{	PathScaleX		U8	}	// 0 to 1, quanta = 0.01
-		{	PathScaleY		U8	}	// 0 to 1, quanta = 0.01
-		{	PathShearX		U8	}	// -.5 to .5, quanta = 0.01
-		{	PathShearY		U8	}	// -.5 to .5, quanta = 0.01
-		{	PathTwist		S8	}	// -1 to 1, quanta = 0.01
-		{	PathTwistBegin		S8	}	// -1 to 1, quanta = 0.01
-		{ 	PathRadiusOffset 	S8	} 	// -1 to 1, quanta = 0.01
-		{ 	PathTaperX		S8	}	// -1 to 1, quanta = 0.01
-		{	PathTaperY		S8	}	// -1 to 1, quanta = 0.01
-		{	PathRevolutions		U8	}	// 0 to 3, quanta = 0.015
-		{	PathSkew		S8	}	// -1 to 1, quanta = 0.01
-		{	ProfileBegin	U16	}	// 0 to 1, quanta = 0.01
-		{	ProfileEnd		U16	}	// 0 to 1, quanta = 0.01
-		{	ProfileHollow	U16	}	// 0 to 1, quanta = 0.01
-	}
-}
-
-{
-	ObjectExtraParams Low 99 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData			Variable
-		{	ObjectLocalID	U32				}
-		{	ParamType		U16				}
-		{	ParamInUse		BOOL			}
-		{	ParamSize		U32				}
-		{	ParamData		Variable	1	}
-	}
+    ObjectImage Low 96 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32         }
+        {   MediaURL        Variable 1  }
+        {   TextureEntry    Variable 2  }
+    }
+}
+
+//  ObjectBypassModUpdate
+//  Viewer -> Simulator
+//  Allows the owner of an object to bypass mod protections for
+//  Predefined fields.
+{
+    ObjectBypassModUpdate Low 431 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32         }
+        {   PropertyID      U8          }
+        {   Value           Variable 2  }
+    }
+}
+
+{
+    ObjectMaterial Low 97 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32 }
+        {   Material        U8  }
+    }
+}
+
+{
+    ObjectShape Low 98 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID       U32 }
+        {   PathCurve           U8  }
+        {   ProfileCurve        U8  }
+        {   PathBegin           U16 }   // 0 to 1, quanta = 0.01
+        {   PathEnd             U16 }   // 0 to 1, quanta = 0.01
+        {   PathScaleX          U8  }   // 0 to 1, quanta = 0.01
+        {   PathScaleY          U8  }   // 0 to 1, quanta = 0.01
+        {   PathShearX          U8  }   // -.5 to .5, quanta = 0.01
+        {   PathShearY          U8  }   // -.5 to .5, quanta = 0.01
+        {   PathTwist           S8  }   // -1 to 1, quanta = 0.01
+        {   PathTwistBegin      S8  }   // -1 to 1, quanta = 0.01
+        {   PathRadiusOffset    S8  }   // -1 to 1, quanta = 0.01
+        {   PathTaperX          S8  }   // -1 to 1, quanta = 0.01
+        {   PathTaperY          S8  }   // -1 to 1, quanta = 0.01
+        {   PathRevolutions     U8  }   // 0 to 3, quanta = 0.015
+        {   PathSkew            S8  }   // -1 to 1, quanta = 0.01
+        {   ProfileBegin        U16 }   // 0 to 1, quanta = 0.01
+        {   ProfileEnd          U16 }   // 0 to 1, quanta = 0.01
+        {   ProfileHollow       U16 }   // 0 to 1, quanta = 0.01
+    }
+}
+
+{
+    ObjectExtraParams Low 99 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32         }
+        {   ParamType       U16         }
+        {   ParamInUse      BOOL        }
+        {   ParamSize       U32         }
+        {   ParamData       Variable 1  }
+    }
 }
 
 
@@ -2177,57 +2193,57 @@ version 2.0
 // TODO: Eliminate god-bit. Maybe not. God-bit is ok, because it's
 // known on the server.
 {
-	ObjectOwner Low 100 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		HeaderData		Single
-		{	Override	BOOL	}	// BOOL, God-bit.
-		{	OwnerID		LLUUID	}
-		{	GroupID		LLUUID	}
-	}
-	{
-		ObjectData	Variable
-		{	ObjectLocalID	U32	}
-	}
+    ObjectOwner Low 100 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        HeaderData Single
+        {   Override    BOOL    }   // God-bit.
+        {   OwnerID     LLUUID  }
+        {   GroupID     LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32 }
+    }
 }
 
 // ObjectGroup
 // To make the object part of no group, set GroupID = LLUUID::null.
 // This call only works if objectid.ownerid == agentid.
 {
-	ObjectGroup	Low	101 NotTrusted Zerocoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	GroupID		LLUUID	}
-	}
-	{
-		ObjectData	Variable
-		{	ObjectLocalID	U32	}
-	}
+    ObjectGroup Low 101 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupID     LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32 }
+    }
 }
 
 // Attempt to buy an object. This will only pack root objects.
 {
-	ObjectBuy Low 102 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	GroupID		LLUUID	}
-		{	CategoryID	LLUUID	}	// folder where it goes (if derezed)
-	}
-	{
-		ObjectData		Variable
-		{	ObjectLocalID	U32	}
-		{	SaleType		U8	}   // U8 -> EForSale
-		{	SalePrice		S32	}
-	}
+    ObjectBuy Low 102 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupID     LLUUID  }
+        {   CategoryID  LLUUID  }   // folder where it goes (if derezed)
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32 }
+        {   SaleType        U8  }   // U8 -> EForSale
+        {   SalePrice       S32 }
+    }
 }
 
 // viewer -> simulator
@@ -2235,29 +2251,29 @@ version 2.0
 // buy object inventory. If the transaction succeeds, it will add
 // inventory to the agent, and potentially remove the original.
 {
-	BuyObjectInventory	Low	103 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		Data	Single
-		{	ObjectID	LLUUID	}
-		{	ItemID		LLUUID	}
-		{	FolderID	LLUUID	}
-	}
+    BuyObjectInventory Low 103 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   ObjectID    LLUUID  }
+        {   ItemID      LLUUID  }
+        {   FolderID    LLUUID  }
+    }
 }
 
 // sim -> viewer
 // Used to propperly handle buying asset containers
 {
-	DerezContainer		Low	104 	Trusted Zerocoded
-	{
-		Data			Single
-		{	ObjectID	LLUUID	}
-		{	Delete		BOOL	}  // BOOL
-	}
+    DerezContainer Low 104 Trusted Zerocoded
+    {
+        Data Single
+        {   ObjectID    LLUUID  }
+        {   Delete      BOOL    }
+    }
 }
 
 // ObjectPermissions
@@ -2266,217 +2282,217 @@ version 2.0
 // If set is false, tries to turn off bits in mask.
 // BUG: This just forces the permissions field.
 {
-	ObjectPermissions Low 105 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		HeaderData		Single
-		{	Override	BOOL	}	// BOOL, God-bit.
-	}
-	{
-		ObjectData	Variable
-		{	ObjectLocalID	U32	}
-		{	Field		U8	}
-		{	Set			U8	}
-		{	Mask		U32	}
-	}
+    ObjectPermissions Low 105 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        HeaderData Single
+        {   Override    BOOL    }   // God-bit.
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32 }
+        {   Field           U8  }
+        {   Set             U8  }
+        {   Mask            U32 }
+    }
 }
 
 // set object sale information
 {
-	ObjectSaleInfo Low 106 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ObjectData			Variable
-		{	LocalID			U32	}
-		{	SaleType		U8	}   // U8 -> EForSale
-		{	SalePrice		S32	}
-	}
+    ObjectSaleInfo Low 106 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   LocalID     U32 }
+        {   SaleType    U8  }   // U8 -> EForSale
+        {   SalePrice   S32 }
+    }
 }
 
 
 // set object names
 {
-	ObjectName Low 107 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	LocalID		U32	}
-		{	Name		Variable	1	}
-	}
+    ObjectName Low 107 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   LocalID U32         }
+        {   Name    Variable 1  }
+    }
 }
 
 // set object descriptions
 {
-	ObjectDescription Low 108 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	LocalID		U32	}
-		{	Description	Variable	1	}
-	}
+    ObjectDescription Low 108 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   LocalID     U32         }
+        {   Description Variable 1  }
+    }
 }
 
 // set object category
 {
-	ObjectCategory Low 109 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	LocalID		U32	}
-		{	Category	U32	}
-	}
+    ObjectCategory Low 109 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   LocalID     U32 }
+        {   Category    U32 }
+    }
 }
 
 // ObjectSelect
 // Variable object data because rectangular selection can
 // generate a large list very quickly.
 {
-	ObjectSelect Low 110 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	ObjectLocalID	U32	}
-	}
+    ObjectSelect Low 110 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32 }
+    }
 
 }
 
 
 // ObjectDeselect
 {
-	ObjectDeselect Low 111 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	ObjectLocalID	U32	}
-	}
+    ObjectDeselect Low 111 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32 }
+    }
 
 }
 
 // ObjectAttach
 {
-	ObjectAttach Low 112 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	AttachmentPoint	U8	}
-	}
-	{
-		ObjectData		Variable
-		{	ObjectLocalID	U32				}
-		{	Rotation		LLQuaternion	}
-	}
+    ObjectAttach Low 112 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   AttachmentPoint U8  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32             }
+        {   Rotation        LLQuaternion    }
+    }
 }
 
 // ObjectDetach -- derezzes an attachment, marking its item in your inventory as not "(worn)"
 {
-	ObjectDetach Low 113 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	ObjectLocalID	U32	}
-	}
+    ObjectDetach Low 113 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32 }
+    }
 }
 
 
 // ObjectDrop -- drops an attachment from your avatar onto the ground
 {
-	ObjectDrop Low 114 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	ObjectLocalID	U32	}
-	}
+    ObjectDrop Low 114 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32 }
+    }
 }
 
 
 // ObjectLink
 {
-	ObjectLink Low 115 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	ObjectLocalID	U32	}
-	}
+    ObjectLink Low 115 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32 }
+    }
 }
 
 // ObjectDelink
 {
-	ObjectDelink Low 116 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	ObjectLocalID	U32	}
-	}
+    ObjectDelink Low 116 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32 }
+    }
 }
 
 
 // ObjectGrab
 {
-	ObjectGrab Low 117 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData			Single
-		{	LocalID				U32  }
-		{	GrabOffset			LLVector3 }
-	}
-	{
-		SurfaceInfo     Variable
-		{   UVCoord     LLVector3 }
-		{   STCoord     LLVector3 }
-       	{   FaceIndex   S32 }
-       	{   Position    LLVector3 }
-       	{   Normal      LLVector3 }
-       	{   Binormal    LLVector3 }
-	}
+    ObjectGrab Low 117 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Single
+        {   LocalID     U32         }
+        {   GrabOffset  LLVector3   }
+    }
+    {
+        SurfaceInfo Variable
+        {   UVCoord     LLVector3   }
+        {   STCoord     LLVector3   }
+        {   FaceIndex   S32         }
+        {   Position    LLVector3   }
+        {   Normal      LLVector3   }
+        {   Binormal    LLVector3   }
+    }
 }
 
 
@@ -2485,146 +2501,146 @@ version 2.0
 // TimeSinceLast could go to 1 byte, since capped
 // at 100 on sim.
 {
-	ObjectGrabUpdate Low 118 NotTrusted Zerocoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData	Single
-		{	ObjectID			LLUUID	}
-		{	GrabOffsetInitial	LLVector3	}	// LLVector3
-		{	GrabPosition		LLVector3	}	// LLVector3, region local
-		{	TimeSinceLast		U32	}
-	}
-	{
-		SurfaceInfo     Variable
-		{   UVCoord     LLVector3 }
-		{   STCoord     LLVector3 }
-       	{   FaceIndex   S32 }
-       	{   Position    LLVector3 }
-       	{   Normal      LLVector3 }
-       	{   Binormal    LLVector3 }
-	}
-
-}
-
-
-// ObjectDeGrab				
-{
-	ObjectDeGrab Low 119 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData			Single
-		{	LocalID				U32  }
-	}
-	{
-		SurfaceInfo     Variable
-		{   UVCoord     LLVector3 }
-		{   STCoord     LLVector3 }
-       	{   FaceIndex   S32 }
-       	{   Position    LLVector3 }
-       	{   Normal      LLVector3 }
-       	{   Binormal    LLVector3 }
-	}
+    ObjectGrabUpdate Low 118 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Single
+        {   ObjectID            LLUUID      }
+        {   GrabOffsetInitial   LLVector3   }   // LLVector3
+        {   GrabPosition        LLVector3   }   // LLVector3, region local
+        {   TimeSinceLast       U32         }
+    }
+    {
+        SurfaceInfo Variable
+        {   UVCoord     LLVector3   }
+        {   STCoord     LLVector3   }
+        {   FaceIndex   S32         }
+        {   Position    LLVector3   }
+        {   Normal      LLVector3   }
+        {   Binormal    LLVector3   }
+    }
+
+}
+
+
+// ObjectDeGrab
+{
+    ObjectDeGrab Low 119 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Single
+        {   LocalID U32  }
+    }
+    {
+        SurfaceInfo Variable
+        {   UVCoord     LLVector3 }
+        {   STCoord     LLVector3 }
+        {   FaceIndex   S32 }
+        {   Position    LLVector3 }
+        {   Normal      LLVector3 }
+        {   Binormal    LLVector3 }
+    }
 }
 
 
 // ObjectSpinStart
 {
-	ObjectSpinStart Low 120 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ObjectData			Single
-		{	ObjectID		LLUUID	}
-	}
+    ObjectSpinStart Low 120 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Single
+        {   ObjectID    LLUUID  }
+    }
 }
 
 
 // ObjectSpinUpdate
 {
-	ObjectSpinUpdate Low 121 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ObjectData			Single
-		{	ObjectID		LLUUID	}
-		{	Rotation		LLQuaternion }
-	}
+    ObjectSpinUpdate Low 121 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Single
+        {   ObjectID    LLUUID          }
+        {   Rotation    LLQuaternion    }
+    }
 }
 
 
 // ObjectSpinStop
 {
-	ObjectSpinStop Low 122 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ObjectData			Single
-		{	ObjectID		LLUUID	}
-	}
+    ObjectSpinStop Low 122 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Single
+        {   ObjectID    LLUUID  }
+    }
 }
 
 // Export selected objects
 // viewer->sim
 {
-	ObjectExportSelected Low 123 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	RequestID		LLUUID  }
-		{	VolumeDetail	S16		}
-	}
-	{
-		ObjectData			Variable
-		{	ObjectID		LLUUID	}
-	}
+    ObjectExportSelected Low 123 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID         LLUUID  }
+        {   RequestID       LLUUID  }
+        {   VolumeDetail    S16     }
+    }
+    {
+        ObjectData Variable
+        {   ObjectID    LLUUID  }
+    }
 }
 
 
 // ModifyLand - sent to modify a piece of land on a simulator.
 // viewer -> sim
 {
-	ModifyLand Low 124 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ModifyBlock			Single
-		{	Action			U8	}
-		{	BrushSize		U8	}
-		{	Seconds			F32	}
-		{	Height			F32	}
-	}
-	{
-		ParcelData			Variable
-		{	LocalID			S32		}
-		{	West			F32		}
-		{	South			F32		}
-		{	East			F32		}
-		{	North			F32		}
-	}
-	{
-		ModifyBlockExtended Variable
-		{   BrushSize       F32 }
-	}
+    ModifyLand Low 124 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ModifyBlock Single
+        {   Action      U8  }
+        {   BrushSize   U8  }
+        {   Seconds     F32 }
+        {   Height      F32 }
+    }
+    {
+        ParcelData Variable
+        {   LocalID S32 }
+        {   West    F32 }
+        {   South   F32 }
+        {   East    F32 }
+        {   North   F32 }
+    }
+    {
+        ModifyBlockExtended Variable
+        {   BrushSize   F32 }
+    }
 }
 
 
@@ -2632,12 +2648,12 @@ version 2.0
 // viewer->sim
 // requires administrative access
 {
-	VelocityInterpolateOn Low 125 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID		LLUUID	}
-	}
+    VelocityInterpolateOn Low 125 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
 }
 
 
@@ -2645,54 +2661,54 @@ version 2.0
 // viewer->sim
 // requires administrative access
 {
-	VelocityInterpolateOff Low 126 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID		LLUUID	}
-	}
+    VelocityInterpolateOff Low 126 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
 }
 
 // Save State
 // viewer->sim
 // requires administrative access
 {
-	StateSave Low 127 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		DataBlock		Single
-		{	Filename	Variable	1	}
-	}
+    StateSave Low 127 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        DataBlock Single
+        {   Filename    Variable 1  }
+    }
 }
 
 // ReportAutosaveCrash
 // sim->launcher
 {
-	ReportAutosaveCrash Low 128 NotTrusted Unencoded
-	{
-		AutosaveData	Single
-		{	PID		S32	}
-		{	Status	S32 }
-	}
+    ReportAutosaveCrash Low 128 NotTrusted Unencoded
+    {
+        AutosaveData Single
+        {   PID     S32 }
+        {   Status  S32 }
+    }
 }
 
 // SimWideDeletes
 {
-	SimWideDeletes Low 129 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		DataBlock			Single
-		{	TargetID		LLUUID	}
-		{	Flags			U32	}
-	}
+    SimWideDeletes Low 129 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        DataBlock Single
+        {   TargetID    LLUUID  }
+        {   Flags       U32     }
+    }
 }
 
 // RequestObjectPropertiesFamily
@@ -2700,133 +2716,133 @@ version 2.0
 // Medium frequency because it is driven by mouse hovering over objects, which
 // occurs at high rates.
 {
-	RequestObjectPropertiesFamily Medium 5 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData		Single
-		{	RequestFlags		U32	}
-		{	ObjectID			LLUUID	}
-	}
+    RequestObjectPropertiesFamily Medium 5 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Single
+        {   RequestFlags    U32     }
+        {   ObjectID        LLUUID  }
+    }
 }
 
 
 // Track agent - this information is used when sending out the
-// coarse location update so that we know who you are tracking. 
+// coarse location update so that we know who you are tracking.
 // To stop tracking - send a null uuid as the prey.
 {
-	TrackAgent		Low	130 	NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		TargetData		Single
-		{	PreyID		LLUUID	}
-	}
+    TrackAgent Low 130 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        TargetData Single
+        {   PreyID  LLUUID  }
+    }
 }
 
 // end viewer to simulator section
 
 {
-       ViewerStats Low 131 NotTrusted Zerocoded UDPDeprecated
-       {
-               AgentData                       Single
-               {       AgentID                 LLUUID      }
-               {       SessionID               LLUUID      }
-               {       IP                      IPADDR       }
-               {       StartTime               U32       }
-               {       RunTime                 F32       }  // F32
-               {       SimFPS                  F32       }  // F32
-               {       FPS                     F32       }  // F32
-               {       AgentsInView			   U8 } //
-               {       Ping                    F32       }  // F32
-               {       MetersTraveled  F64       }
-               {       RegionsVisited  S32       }
-               {       SysRAM                  U32       }
-               {       SysOS                   Variable        1       }  // String
-               {       SysCPU                  Variable        1       }  // String
-               {       SysGPU                  Variable        1       }  // String
-       }
-
-       {
-               DownloadTotals          Single
-               {       World                   U32       }
-               {       Objects                 U32       }
-               {       Textures                U32       }
-       }
-
-       {
-               NetStats                        Multiple        2
-               {       Bytes                   U32       }
-               {       Packets                 U32       }
-               {       Compressed              U32       }
-               {       Savings                 U32       }
-       }
-
-       {       
-               FailStats                       Single
-               {       SendPacket              U32       }
-               {       Dropped                 U32       }
-               {       Resent                  U32       }
-               {       FailedResends   U32       }
-               {       OffCircuit              U32       }
-               {       Invalid                 U32       }
-       }
-
-       {
-               MiscStats                       Variable
-               {       Type                    U32       }
-               {       Value                   F64       }
-       }
-}
-		
+    ViewerStats Low 131 NotTrusted Zerocoded UDPDeprecated
+    {
+        AgentData Single
+        {   AgentID         LLUUID      }
+        {   SessionID       LLUUID      }
+        {   IP              IPADDR      }
+        {   StartTime       U32         }
+        {   RunTime         F32         }   // F32
+        {   SimFPS          F32         }   // F32
+        {   FPS             F32         }   // F32
+        {   AgentsInView    U8          }
+        {   Ping            F32         }   // F32
+        {   MetersTraveled  F64         }
+        {   RegionsVisited  S32         }
+        {   SysRAM          U32         }
+        {   SysOS           Variable 1  }   // String
+        {   SysCPU          Variable 1  }   // String
+        {   SysGPU          Variable 1  }   // String
+    }
+
+    {
+        DownloadTotals Single
+        {   World       U32   }
+        {   Objects     U32   }
+        {   Textures    U32   }
+    }
+
+    {
+        NetStats Multiple 2
+        {   Bytes       U32   }
+        {   Packets     U32   }
+        {   Compressed  U32   }
+        {   Savings     U32   }
+    }
+
+    {
+        FailStats Single
+        {   SendPacket      U32   }
+        {   Dropped         U32   }
+        {   Resent          U32   }
+        {   FailedResends   U32   }
+        {   OffCircuit      U32   }
+        {   Invalid         U32   }
+    }
+
+    {
+        MiscStats Variable
+        {   Type    U32   }
+        {   Value   F64   }
+    }
+}
+
 // ScriptAnswerYes
 // reliable
 {
-	ScriptAnswerYes Low 132 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}			   
-	{
-		Data	Single
-		{	TaskID			LLUUID	}
-		{	ItemID			LLUUID	}
-		{	Questions		S32	}
-	}
+    ScriptAnswerYes Low 132 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   TaskID      LLUUID  }
+        {   ItemID      LLUUID  }
+        {   Questions   S32     }
+    }
 }
 
 
 // complaint/bug-report
 // reliable
 {
-	UserReport	Low	133 	NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ReportData	Single
-		{   ReportType		U8   }   // BUG=1, COMPLAINT=2
-		{   Category		U8   }   // see sequence.user_report_category
-		{	Position		LLVector3	} // screenshot position, region-local
-		{   CheckFlags		U8	} // checkboxflags
-		{   ScreenshotID	LLUUID  }
-		{   ObjectID		LLUUID  }
-		{   AbuserID		LLUUID  }
-		{	AbuseRegionName	Variable	1	}
-		{	AbuseRegionID	LLUUID	}
-		{   Summary			Variable	1   }
-		{   Details 		Variable	2   }
-		{	VersionString	Variable	1	}
-	}
+    UserReport Low 133 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ReportData Single
+        {   ReportType      U8          }   // BUG=1, COMPLAINT=2
+        {   Category        U8          }   // see sequence.user_report_category
+        {   Position        LLVector3   }   // screenshot position, region-local
+        {   CheckFlags      U8          }   // checkboxflags
+        {   ScreenshotID    LLUUID      }
+        {   ObjectID        LLUUID      }
+        {   AbuserID        LLUUID      }
+        {   AbuseRegionName Variable 1  }
+        {   AbuseRegionID   LLUUID      }
+        {   Summary         Variable 1  }
+        {   Details         Variable 2  }
+        {   VersionString   Variable 1  }
+    }
 }
 
 
@@ -2836,67 +2852,73 @@ version 2.0
 
 // AlertMessage
 // Specifies the text to be posted in an alert dialog
+// Also sent from dataserver to simulator with AgentInfo block
+// Simulator doesn't include AgentInfo block to viewer
 {
-	AlertMessage Low 134 Trusted Unencoded
-	{
-		AlertData			Single
-		{	Message			Variable	1	}
-	}
-	{
-		AlertInfo			Variable
-		{	Message			Variable	1	}
-		{	ExtraParams		Variable	1	}
-	}
+    AlertMessage Low 134 Trusted Unencoded
+    {
+        AlertData Single
+        {   Message Variable 1  }
+    }
+    {
+        AlertInfo Variable
+        {   Message     Variable 1  }
+        {   ExtraParams Variable 1  }
+    }
+    {
+        AgentInfo Variable
+        {   AgentID LLUUID  }
+    }
 }
 
 // Send an AlertMessage to the named agent.
 // usually dataserver->simulator
 {
-	AgentAlertMessage	Low	135 Trusted	Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-	}
-	{
-		AlertData			Single
-		{	Modal			BOOL			}
-		{	Message			Variable	1	}
-	}
+    AgentAlertMessage Low 135 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        AlertData Single
+        {   Modal   BOOL        }
+        {   Message Variable 1  }
+    }
 }
 
 
 // MeanCollisionAlert
 // Specifies the text to be posted in an alert dialog
 {
-	MeanCollisionAlert Low 136 Trusted Zerocoded
-	{
-		MeanCollision		Variable
-		{	Victim			LLUUID	}
-		{	Perp			LLUUID	}
-		{	Time			U32		}
-		{	Mag				F32		}
-		{	Type			U8		}
-	}
+    MeanCollisionAlert Low 136 Trusted Zerocoded
+    {
+        MeanCollision Variable
+        {   Victim  LLUUID  }
+        {   Perp    LLUUID  }
+        {   Time    U32     }
+        {   Mag     F32     }
+        {   Type    U8      }
+    }
 }
 
 // ViewerFrozenMessage
 // Specifies the text to be posted in an alert dialog
 {
-	ViewerFrozenMessage Low 137 Trusted Unencoded
-	{
-		FrozenData			Single
-		{	Data			BOOL	}
-	}
+    ViewerFrozenMessage Low 137 Trusted Unencoded
+    {
+        FrozenData Single
+        {   Data    BOOL    }
+    }
 }
 
 // Health Message
 // Tells viewer what agent health is
 {
-	HealthMessage Low 138 Trusted Zerocoded
-	{
-		HealthData			Single
-		{	Health			F32	}
-	}
+    HealthMessage Low 138 Trusted Zerocoded
+    {
+        HealthData Single
+        {   Health  F32 }
+    }
 }
 
 // ChatFromSimulator
@@ -2905,55 +2927,55 @@ version 2.0
 // Viewer can optionally use position to animate
 // If audible is CHAT_NOT_AUDIBLE, message will not be valid
 {
-	ChatFromSimulator Low 139 Trusted Unencoded
-	{
-		ChatData			Single
-		{	FromName		Variable 1	}
-		{	SourceID		LLUUID		}	// agent id or object id
-		{	OwnerID			LLUUID		}	// object's owner
-		{	SourceType		U8			}
-		{	ChatType		U8			}
-		{	Audible			U8			}
-		{	Position		LLVector3	}
-		{	Message			Variable 2	}	// UTF-8 text
-	}
+    ChatFromSimulator Low 139 Trusted Unencoded
+    {
+        ChatData Single
+        {   FromName    Variable 1  }
+        {   SourceID    LLUUID      }   // agent id or object id
+        {   OwnerID     LLUUID      }   // object's owner
+        {   SourceType  U8          }
+        {   ChatType    U8          }
+        {   Audible     U8          }
+        {   Position    LLVector3   }
+        {   Message     Variable 2  }   // UTF-8 text
+    }
 }
 
 
 // Simulator statistics packet (goes out to viewer and dataserver/spaceserver)
 {
-	SimStats Low 140 Trusted Unencoded
-	{
-		Region Single
-		{	RegionX				U32				}
-		{	RegionY				U32				}
-		{	RegionFlags			U32				}
-		{	ObjectCapacity		U32				}
-	}
-	{
-		Stat	Variable
-		{	StatID		U32	}
-		{	StatValue	F32	}
-	}
-	{
-		PidStat Single
-		{	PID					S32				}
-	}
-	{
-		RegionInfo Variable
-		{	RegionFlagsExtended	U64				}
-	}
+    SimStats Low 140 Trusted Unencoded
+    {
+        Region Single
+        {   RegionX         U32 }
+        {   RegionY         U32 }
+        {   RegionFlags     U32 }
+        {   ObjectCapacity  U32 }
+    }
+    {
+        Stat Variable
+        {   StatID      U32 }
+        {   StatValue   F32 }
+    }
+    {
+        PidStat Single
+        {   PID S32 }
+    }
+    {
+        RegionInfo Variable
+        {   RegionFlagsExtended U64 }
+    }
 }
 
 // viewer -> sim
 // reliable
 {
-	RequestRegionInfo Low 141 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID			}
-		{	SessionID		LLUUID			}
-	}
+    RequestRegionInfo Low 141 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
 }
 
 // RegionInfo
@@ -2962,53 +2984,63 @@ version 2.0
 // sim -> viewer
 // reliable
 {
-	RegionInfo Low 142 NotTrusted Zerocoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID			}
-		{	SessionID		LLUUID			}
-	}
-	{
-		RegionInfo	Single
-		{	SimName			Variable	1	}	// string
-		{	EstateID		U32				}
-		{	ParentEstateID	U32				}
-		{	RegionFlags		U32				}
-		{	SimAccess		U8				}
-		{	MaxAgents		U8				}
-		{	BillableFactor		F32			}
-		{	ObjectBonusFactor 	F32			}
-		{	WaterHeight			F32			}
-		{	TerrainRaiseLimit	F32 		}
-		{	TerrainLowerLimit	F32 		}
-		{	PricePerMeter 		S32			}
-		{	RedirectGridX 		S32			}
-		{	RedirectGridY 		S32			}
-		{	UseEstateSun		BOOL		}
-		{	SunHour				F32			}	// last value set by estate or region controls JC
-	}
-	{
-		RegionInfo2		Single
-		{	ProductSKU			Variable 1	}	// string
-		{	ProductName			Variable 1	}	// string
-		{	MaxAgents32			U32			}	// Identical to RegionInfo.MaxAgents but allows greater range
-		{	HardMaxAgents		U32			}
-		{	HardMaxObjects		U32			}
-	}
-	{
-		RegionInfo3		Variable
-		{	RegionFlagsExtended	U64			}
-	}
-	{
-		RegionInfo5     Variable
-		{	ChatWhisperRange	F32 		}
-		{	ChatNormalRange		F32 		}
-		{	ChatShoutRange		F32 		}
-		{	ChatWhisperOffset	F32 		}
-		{	ChatNormalOffset	F32 		}
-		{	ChatShoutOffset		F32 		}
-		{	ChatFlags			U32			}
-	}
+    RegionInfo Low 142 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        RegionInfo Single
+        {   SimName             Variable 1  }   // string
+        {   EstateID            U32         }
+        {   ParentEstateID      U32         }
+        {   RegionFlags         U32         }
+        {   SimAccess           U8          }
+        {   MaxAgents           U8          }
+        {   BillableFactor      F32         }
+        {   ObjectBonusFactor   F32         }
+        {   WaterHeight         F32         }
+        {   TerrainRaiseLimit   F32         }
+        {   TerrainLowerLimit   F32         }
+        {   PricePerMeter       S32         }
+        {   RedirectGridX       S32         }
+        {   RedirectGridY       S32         }
+        {   UseEstateSun        BOOL        }
+        {   SunHour             F32         }   // last value set by estate or region controls JC
+    }
+    {
+        RegionInfo2 Single
+        {   ProductSKU      Variable 1  }   // string
+        {   ProductName     Variable 1  }   // string
+        {   MaxAgents32     U32         }   // Identical to RegionInfo.MaxAgents but allows greater range
+        {   HardMaxAgents   U32         }
+        {   HardMaxObjects  U32         }
+    }
+    {
+        RegionInfo3 Variable
+        {   RegionFlagsExtended U64 }
+    }
+    {
+        RegionInfo5 Variable
+        {   ChatWhisperRange    F32 }
+        {   ChatNormalRange     F32 }
+        {   ChatShoutRange      F32 }
+        {   ChatWhisperOffset   F32 }
+        {   ChatNormalOffset    F32 }
+        {   ChatShoutOffset     F32 }
+        {   ChatFlags           U32 }
+    }
+    {
+        CombatSettings Variable
+        {   CombatFlags         U32 }
+        {   OnDeath             U8  }
+        {   DamageThrottle      F32 }
+        {   RegenerationRate    F32 }
+        {   InvulnerabilyTime   F32 }
+        {   DamageLimit         F32 }
+    }
+
 }
 
 // GodUpdateRegionInfo
@@ -3017,27 +3049,27 @@ version 2.0
 // viewer -> sim
 // reliable
 {
-	GodUpdateRegionInfo Low 143 NotTrusted Zerocoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID			}
-		{	SessionID		LLUUID			}
-	}
-	{
-		RegionInfo	Single
-		{	SimName			Variable	1	}	// string
-		{	EstateID		U32				}
-		{	ParentEstateID	U32				}
-		{	RegionFlags		U32				}
-		{	BillableFactor		F32			}
-		{	PricePerMeter 		S32			}
-		{	RedirectGridX 		S32			}
-		{	RedirectGridY 		S32			}
-	}
-	{
-		RegionInfo2	Variable
-		{	RegionFlagsExtended	U64			}
-	}
+    GodUpdateRegionInfo Low 143 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        RegionInfo Single
+        {   SimName         Variable 1  }   // string
+        {   EstateID        U32         }
+        {   ParentEstateID  U32         }
+        {   RegionFlags     U32         }
+        {   BillableFactor  F32         }
+        {   PricePerMeter   S32         }
+        {   RedirectGridX   S32         }
+        {   RedirectGridY   S32         }
+    }
+    {
+        RegionInfo2 Variable
+        {   RegionFlagsExtended U64 }
+    }
 }
 
 //NearestLandingRegionRequest
@@ -3046,11 +3078,11 @@ version 2.0
 //to request the most up to date region for the requesting
 //region to redirect teleports to
 {
-	NearestLandingRegionRequest Low 144 Trusted Unencoded
-	{
-		RequestingRegionData Single
-		{	RegionHandle 		U64			}
-	}
+    NearestLandingRegionRequest Low 144 Trusted Unencoded
+    {
+        RequestingRegionData Single
+        {   RegionHandle    U64 }
+    }
 }
 
 //NearestLandingPointReply
@@ -3059,11 +3091,11 @@ version 2.0
 //to the redirectregion request stating which region
 //the requesting region should redirect teleports to if necessary
 {
-	NearestLandingRegionReply Low 145 Trusted Unencoded
-	{
-		LandingRegionData Single
-		{	RegionHandle		U64			}
-	}
+    NearestLandingRegionReply Low 145 Trusted Unencoded
+    {
+        LandingRegionData Single
+        {   RegionHandle    U64 }
+    }
 }
 
 //NearestLandingPointUpdated
@@ -3072,11 +3104,11 @@ version 2.0
 //to have the dataserver note/clear in the db
 //that the region has updated it's nearest landing point
 {
-	NearestLandingRegionUpdated Low 146 Trusted Unencoded
-	{
-		RegionData Single
-		{	RegionHandle		U64			}
-	}
+    NearestLandingRegionUpdated Low 146 Trusted Unencoded
+    {
+        RegionData Single
+        {   RegionHandle    U64 }
+    }
 }
 
 
@@ -3085,11 +3117,11 @@ version 2.0
 //Sent from the region to the data server
 //to note that the region's teleportation landing status has changed
 {
-	TeleportLandingStatusChanged Low 147 Trusted Unencoded
-	{
-		RegionData Single
-		{	RegionHandle		U64			}
-	}
+    TeleportLandingStatusChanged Low 147 Trusted Unencoded
+    {
+        RegionData Single
+        {   RegionHandle    U64 }
+    }
 }
 
 // RegionHandshake
@@ -3098,51 +3130,51 @@ version 2.0
 // sim -> viewer
 // reliable
 {
-	RegionHandshake			Low	148 	Trusted Zerocoded
-	{
-		RegionInfo	Single
-		{	RegionFlags		U32	}
-		{	SimAccess		U8	}
-		{	SimName			Variable	1	} // string
-		{	SimOwner		LLUUID	}
-		{	IsEstateManager	BOOL	}	// this agent, for this sim
-		{	WaterHeight		F32	}
-		{	BillableFactor	F32	}
-		{	CacheID			LLUUID }
-		{	TerrainBase0		LLUUID		}
-		{	TerrainBase1		LLUUID		}
-		{	TerrainBase2		LLUUID		}
-		{	TerrainBase3		LLUUID		}
-		{	TerrainDetail0		LLUUID		}
-		{	TerrainDetail1		LLUUID		}
-		{	TerrainDetail2		LLUUID		}
-		{	TerrainDetail3		LLUUID		}
-		{	TerrainStartHeight00	F32		}
-		{	TerrainStartHeight01	F32		}
-		{	TerrainStartHeight10	F32		}
-		{	TerrainStartHeight11	F32		}
-		{	TerrainHeightRange00	F32		}
-		{	TerrainHeightRange01	F32		}
-		{	TerrainHeightRange10	F32		}
-		{	TerrainHeightRange11	F32		}
-	}
-	{
-		RegionInfo2	Single
-		{	RegionID		LLUUID	}
-	}
-	{
-		RegionInfo3	Single
-		{	CPUClassID				S32		}
-		{	CPURatio				S32		}
-		{	ColoName				Variable	1	}	// string
-		{	ProductSKU				Variable	1	}	// string
-		{	ProductName				Variable	1	}	// string
-	}
-	{
-		RegionInfo4		Variable
-		{	RegionFlagsExtended	U64			}
-		{	RegionProtocols		U64			}
-	}
+    RegionHandshake Low 148 Trusted Zerocoded
+    {
+        RegionInfo Single
+        {   RegionFlags             U32         }
+        {   SimAccess               U8          }
+        {   SimName                 Variable 1  }   // string
+        {   SimOwner                LLUUID      }
+        {   IsEstateManager         BOOL        }   // this agent, for this sim
+        {   WaterHeight             F32         }
+        {   BillableFactor          F32         }
+        {   CacheID                 LLUUID      }
+        {   TerrainBase0            LLUUID      }
+        {   TerrainBase1            LLUUID      }
+        {   TerrainBase2            LLUUID      }
+        {   TerrainBase3            LLUUID      }
+        {   TerrainDetail0          LLUUID      }
+        {   TerrainDetail1          LLUUID      }
+        {   TerrainDetail2          LLUUID      }
+        {   TerrainDetail3          LLUUID      }
+        {   TerrainStartHeight00    F32         }
+        {   TerrainStartHeight01    F32         }
+        {   TerrainStartHeight10    F32         }
+        {   TerrainStartHeight11    F32         }
+        {   TerrainHeightRange00    F32         }
+        {   TerrainHeightRange01    F32         }
+        {   TerrainHeightRange10    F32         }
+        {   TerrainHeightRange11    F32         }
+    }
+    {
+        RegionInfo2 Single
+        {   RegionID    LLUUID  }
+    }
+    {
+        RegionInfo3 Single
+        {   CPUClassID  S32         }
+        {   CPURatio    S32         }
+        {   ColoName    Variable 1  }   // string
+        {   ProductSKU  Variable 1  }   // string
+        {   ProductName Variable 1  }   // string
+    }
+    {
+        RegionInfo4 Variable
+        {   RegionFlagsExtended U64 }
+        {   RegionProtocols     U64 }
+    }
 }
 
 // RegionHandshakeReply
@@ -3154,295 +3186,295 @@ version 2.0
 // After the simulator receives this, it will start sending
 // data about objects.
 {
-	RegionHandshakeReply			Low	149 	NotTrusted Zerocoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID			}
-		{	SessionID		LLUUID			}
-	}
-	{
-		RegionInfo	Single
-		{	Flags			U32		}
-	}
+    RegionHandshakeReply Low 149 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        RegionInfo Single
+        {   Flags   U32 }
+    }
 }
 
-// The CoarseLocationUpdate message is sent to notify the viewer of 
+// The CoarseLocationUpdate message is sent to notify the viewer of
 // the location of mappable objects in the region. 1 meter resolution is
-// sufficient for this. The index block is used to show where you are, 
+// sufficient for this. The index block is used to show where you are,
 // and where someone you are tracking is located. They are -1 if not
 // applicable.
 {
-	CoarseLocationUpdate Medium 6 Trusted Unencoded
-	{
-		Location	Variable
-		{	X		U8	}
-		{	Y		U8	}
-		{	Z		U8	}	// Z in meters / 4
-	}
-	{
-		Index 		Single
-		{	You		S16	}
-		{	Prey	S16	}
-	}
-    {
-         AgentData       Variable
-         {       AgentID                 LLUUID                  }
-    }
-}
-
-// ImageData - sent to viewer to transmit information about an image 
-{
-	ImageData High 9 Trusted Unencoded
-	{
-		ImageID				Single
-		{	ID				LLUUID	}
-		{	Codec			U8	}
-		{	Size			U32	}
-		{	Packets			U16	}
-	}
-	{
-		ImageData			Single
-		{	Data			Variable	2	}
-	}
-}
-
-// ImagePacket - follow on image data for images having > 1 packet of data 
-{
-	ImagePacket High 10 Trusted Unencoded
-	{
-		ImageID				Single
-		{	ID				LLUUID	}
-		{	Packet			U16	}
-	}
-	{
-		ImageData			Single
-		{	Data			Variable	2	}
-	}
+    CoarseLocationUpdate Medium 6 Trusted Unencoded
+    {
+        Location Variable
+        {   X   U8  }
+        {   Y   U8  }
+        {   Z   U8  }   // Z in meters / 4
+    }
+    {
+        Index Single
+        {   You     S16 }
+        {   Prey    S16 }
+    }
+    {
+        AgentData Variable
+        {   AgentID LLUUID  }
+    }
+}
+
+// ImageData - sent to viewer to transmit information about an image
+{
+    ImageData High 9 Trusted Unencoded
+    {
+        ImageID Single
+        {   ID      LLUUID  }
+        {   Codec   U8  }
+        {   Size    U32 }
+        {   Packets U16 }
+    }
+    {
+        ImageData Single
+        {   Data    Variable 2  }
+    }
+}
+
+// ImagePacket - follow on image data for images having > 1 packet of data
+{
+    ImagePacket High 10 Trusted Unencoded
+    {
+        ImageID Single
+        {   ID      LLUUID  }
+        {   Packet  U16 }
+    }
+    {
+        ImageData Single
+        {   Data    Variable 2  }
+    }
 }
 
 // LayerData - Sent to viewer - encodes layer data
 
 {
-	LayerData High 11 Trusted Unencoded
-	{
-		LayerID				Single
-		{	Type			U8	}
+    LayerData High 11 Trusted Unencoded
+    {
+        LayerID Single
+        {   Type    U8  }
 
-	}
-	{
-		LayerData			Single
-		{	Data			Variable	2	}
-	}
+    }
+    {
+        LayerData Single
+        {   Data    Variable 2  }
+    }
 }
 
 // ObjectUpdate - Sent by objects from the simulator to the viewer
 //
 // If only one ImageID is sent for an object type that has more than
 // one face, the same image is repeated on each subsequent face.
-// 
+//
 // NameValue is a list of name-value strings, separated by \n characters,
 // terminated by \0
 //
 // Data is type-specific opaque data for this object
 {
-	ObjectUpdate High 12 Trusted Zerocoded
-	{
-		RegionData			Single
-		{	RegionHandle	U64	}
-		{   TimeDilation	U16   }
-	}
-	{
-		ObjectData			Variable
-		{	ID				U32	}
-		{	State			U8	}
-
-		{	FullID			LLUUID	}
-		{	CRC				U32	}	// TEMPORARY HACK FOR JAMES
-		{	PCode			U8	}
-		{	Material		U8	}
-		{	ClickAction		U8	}
-		{	Scale			LLVector3	}
-		{	ObjectData		Variable	1	}
-
-		{	ParentID		U32	}
-		{	UpdateFlags		U32	}	// U32, see object_flags.h
-
-		{	PathCurve		U8	}
-		{	ProfileCurve	U8	}
-		{	PathBegin		U16	}	// 0 to 1, quanta = 0.01
-		{	PathEnd			U16	}	// 0 to 1, quanta = 0.01
-		{	PathScaleX		U8	}	// 0 to 1, quanta = 0.01
-		{	PathScaleY		U8	}	// 0 to 1, quanta = 0.01
-		{	PathShearX		U8	}	// -.5 to .5, quanta = 0.01
-		{	PathShearY		U8	}	// -.5 to .5, quanta = 0.01
-		{	PathTwist		S8	}	// -1 to 1, quanta = 0.01
-		{	PathTwistBegin		S8	}	// -1 to 1, quanta = 0.01
-		{ 	PathRadiusOffset 	S8	} 	// -1 to 1, quanta = 0.01
-		{ 	PathTaperX		S8	}	// -1 to 1, quanta = 0.01
-		{	PathTaperY		S8	}	// -1 to 1, quanta = 0.01
-		{	PathRevolutions		U8	}	// 0 to 3, quanta = 0.015
-		{	PathSkew		S8	}	// -1 to 1, quanta = 0.01
-		{	ProfileBegin	U16	}	// 0 to 1, quanta = 0.01
-		{	ProfileEnd		U16	}	// 0 to 1, quanta = 0.01
-		{	ProfileHollow	U16	}	// 0 to 1, quanta = 0.01
-
-		{	TextureEntry	Variable	2	}
-		{	TextureAnim		Variable	1	}
-
-		{	NameValue		Variable	2	}
-		{	Data			Variable	2	}
-		{	Text			Variable	1	}	// llSetText() hovering text
-		{	TextColor		Fixed		4	}	// actually, a LLColor4U
-		{	MediaURL		Variable	1	}	// URL for web page, movie, etc.
-
-		// Info for particle systems
-		{	PSBlock			Variable	1	}
-		
-		// Extra parameters
-		{	ExtraParams		Variable	1	}
-		
-		// info for looped attached sounds
+    ObjectUpdate High 12 Trusted Zerocoded
+    {
+        RegionData Single
+        {   RegionHandle    U64 }
+        {   TimeDilation    U16 }
+    }
+    {
+        ObjectData Variable
+        {   ID                  U32         }
+        {   State               U8          }
+
+        {   FullID              LLUUID      }
+        {   CRC                 U32         }   // TEMPORARY HACK FOR JAMES
+        {   PCode               U8          }
+        {   Material            U8          }
+        {   ClickAction         U8          }
+        {   Scale               LLVector3   }
+        {   ObjectData          Variable 1  }
+
+        {   ParentID            U32         }
+        {   UpdateFlags         U32         }   // see object_flags.h
+
+        {   PathCurve           U8          }
+        {   ProfileCurve        U8          }
+        {   PathBegin           U16         }   // 0 to 1, quanta = 0.01
+        {   PathEnd             U16         }   // 0 to 1, quanta = 0.01
+        {   PathScaleX          U8          }   // 0 to 1, quanta = 0.01
+        {   PathScaleY          U8          }   // 0 to 1, quanta = 0.01
+        {   PathShearX          U8          }   // -.5 to .5, quanta = 0.01
+        {   PathShearY          U8          }   // -.5 to .5, quanta = 0.01
+        {   PathTwist           S8          }   // -1 to 1, quanta = 0.01
+        {   PathTwistBegin      S8          }   // -1 to 1, quanta = 0.01
+        {   PathRadiusOffset    S8          }   // -1 to 1, quanta = 0.01
+        {   PathTaperX          S8          }   // -1 to 1, quanta = 0.01
+        {   PathTaperY          S8          }   // -1 to 1, quanta = 0.01
+        {   PathRevolutions     U8          }   // 0 to 3, quanta = 0.015
+        {   PathSkew            S8          }   // -1 to 1, quanta = 0.01
+        {   ProfileBegin        U16         }   // 0 to 1, quanta = 0.01
+        {   ProfileEnd          U16         }   // 0 to 1, quanta = 0.01
+        {   ProfileHollow       U16         }   // 0 to 1, quanta = 0.01
+
+        {   TextureEntry        Variable 2  }
+        {   TextureAnim         Variable 1  }
+
+        {   NameValue           Variable 2  }
+        {   Data                Variable 2  }
+        {   Text                Variable 1  }   // llSetText() hovering text
+        {   TextColor           Fixed    4  }   // actually, a LLColor4U
+        {   MediaURL            Variable 1  }   // URL for web page, movie, etc.
+
+        // Info for particle systems
+        {   PSBlock             Variable 1  }
+
+        // Extra parameters
+        {   ExtraParams         Variable 1  }
+
+        // info for looped attached sounds
         // because these are almost always all zero
-		// the hit after zero-coding is only 2 bytes
-		// not the 42 you see here
-		{	Sound           LLUUID  }
-		{	OwnerID			LLUUID	}	// HACK object's owner id, only set if non-null sound, for muting
-		{	Gain            F32		}
-		{	Flags           U8		}
-		{	Radius          F32		}  // cutoff radius
-
-		// joint info -- is sent in the update of each joint-child-root
-		{	JointType 			U8		}
-		{	JointPivot			LLVector3	}
-		{	JointAxisOrAnchor 	LLVector3	}
-	}
+        // the hit after zero-coding is only 2 bytes
+        // not the 42 you see here
+        {   Sound               LLUUID      }
+        {   OwnerID             LLUUID      }   // HACK object's owner id, only set if non-null sound, for muting
+        {   Gain                F32         }
+        {   Flags               U8          }
+        {   Radius              F32         }   // cutoff radius
+
+        // joint info -- is sent in the update of each joint-child-root
+        {   JointType           U8          }
+        {   JointPivot          LLVector3   }
+        {   JointAxisOrAnchor   LLVector3   }
+    }
 }
 
 
 // ObjectUpdateCompressed
 {
-	ObjectUpdateCompressed High 13 Trusted Unencoded
-	{
-		RegionData			Single
-		{	RegionHandle	U64		}
-		{   TimeDilation	U16		}
-	}
-	{
-		ObjectData			Variable
-		{   UpdateFlags			U32	}
-		{	Data			Variable   2	}
-	}
+    ObjectUpdateCompressed High 13 Trusted Unencoded
+    {
+        RegionData Single
+        {   RegionHandle    U64 }
+        {   TimeDilation    U16 }
+    }
+    {
+        ObjectData Variable
+        {   UpdateFlags U32         }
+        {   Data        Variable 2  }
+    }
 }
 
 // ObjectUpdateCached
 // reliable
 {
-	ObjectUpdateCached High 14 Trusted Unencoded
-	{
-		RegionData			Single
-		{	RegionHandle	U64		}
-		{   TimeDilation	U16		}
-	}
-	{
-		ObjectData			Variable
-		{   ID				U32		}
-		{	CRC				U32		}
-		{   UpdateFlags		U32	}
-	}
+    ObjectUpdateCached High 14 Trusted Unencoded
+    {
+        RegionData Single
+        {   RegionHandle    U64 }
+        {   TimeDilation    U16 }
+    }
+    {
+        ObjectData Variable
+        {   ID          U32 }
+        {   CRC         U32 }
+        {   UpdateFlags U32 }
+    }
 }
 
 // packed terse object update format
 {
-	ImprovedTerseObjectUpdate High 15 Trusted Unencoded
-	{
-		RegionData			Single
-		{	RegionHandle	U64	}
-		{   TimeDilation	U16   }
-	}
-	{
-		ObjectData			Variable
-		{	Data			Variable	1	}
-		{	TextureEntry	Variable	2	}
-	}
+    ImprovedTerseObjectUpdate High 15 Trusted Unencoded
+    {
+        RegionData Single
+        {   RegionHandle    U64 }
+        {   TimeDilation    U16 }
+    }
+    {
+        ObjectData Variable
+        {   Data            Variable 1  }
+        {   TextureEntry    Variable 2  }
+    }
 }
 
 // KillObject - Sent by objects to the viewer to tell them to kill themselves
 
 {
-	KillObject High 16 Trusted Unencoded
-	{
-		ObjectData			Variable
-		{	ID				U32	}
-	}
+    KillObject High 16 Trusted Unencoded
+    {
+        ObjectData Variable
+        {   ID  U32 }
+    }
 }
 
 
-// CrossedRegion - new way to tell a viewer it has gone across a region 
+// CrossedRegion - new way to tell a viewer it has gone across a region
 // boundary
 {
-	CrossedRegion Medium 7 Trusted Unencoded UDPBlackListed
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		RegionData		Single
-		{	SimIP			IPADDR	}
-		{	SimPort			IPPORT	}
-		{	RegionHandle	U64	}
-		{	SeedCapability	Variable	2	}	// URL
-	}
-	{
-		Info			Single
-		{	Position		LLVector3	}
-		{	LookAt			LLVector3	}
-	}
+    CrossedRegion Medium 7 Trusted Unencoded UDPBlackListed
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        RegionData Single
+        {   SimIP           IPADDR      }
+        {   SimPort         IPPORT      }
+        {   RegionHandle    U64         }
+        {   SeedCapability  Variable 2  }   // URL
+    }
+    {
+        Info Single
+        {   Position    LLVector3   }
+        {   LookAt      LLVector3   }
+    }
 }
 
 // SimulatorViewerTimeMessage - Allows viewer to resynch to world time
 
 {
-	SimulatorViewerTimeMessage Low 150 Trusted Unencoded
-	{
-		TimeInfo		Single
-		{	UsecSinceStart	U64	}
-		{	SecPerDay		U32	}
-		{	SecPerYear		U32	}
-		{	SunDirection	LLVector3	}
-		{	SunPhase		F32	}
-		{	SunAngVelocity	LLVector3	}
-	}
+    SimulatorViewerTimeMessage Low 150 Trusted Unencoded
+    {
+        TimeInfo Single
+        {   UsecSinceStart  U64         }
+        {   SecPerDay       U32         }
+        {   SecPerYear      U32         }
+        {   SunDirection    LLVector3   }
+        {   SunPhase        F32         }
+        {   SunAngVelocity  LLVector3   }
+    }
 }
 
 // EnableSimulator - Preps a viewer to receive data from a simulator
 
 {
-	EnableSimulator Low 151 Trusted Unencoded UDPBlackListed
-	{
-		SimulatorInfo	Single
-		{	Handle		U64	}
-		{	IP			IPADDR	}
-		{	Port		IPPORT	}
-	}
+    EnableSimulator Low 151 Trusted Unencoded UDPBlackListed
+    {
+        SimulatorInfo Single
+        {   Handle  U64     }
+        {   IP      IPADDR  }
+        {   Port    IPPORT  }
+    }
 }
 
 // DisableThisSimulator - Tells a viewer not to expect data from this simulator anymore
 
 {
-	DisableSimulator Low 152 Trusted Unencoded
+    DisableSimulator Low 152 Trusted Unencoded
 }
 
 // ConfirmEnableSimulator - A confirmation message sent from simulator to neighbors that the simulator
 // has successfully been enabled by the viewer
 
 {
-	ConfirmEnableSimulator Medium 8 Trusted Unencoded
-	{
-		AgentData				Single
-		{	AgentID				LLUUID	}
-		{	SessionID			LLUUID	}
-	}
+    ConfirmEnableSimulator Medium 8 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -3451,52 +3483,52 @@ version 2.0
 
 // Request a new transfer (target->source)
 {
-	TransferRequest Low 153 NotTrusted Zerocoded
-	{
-		TransferInfo		Single
-		{	TransferID		LLUUID	}
-		{	ChannelType		S32	}
-		{	SourceType		S32	}
-		{	Priority		F32	}
-		{	Params			Variable	2	}
-	}
+    TransferRequest Low 153 NotTrusted Zerocoded
+    {
+        TransferInfo Single
+        {   TransferID  LLUUID      }
+        {   ChannelType S32         }
+        {   SourceType  S32         }
+        {   Priority    F32         }
+        {   Params      Variable 2  }
+    }
 }
 
 // Return info about a transfer/initiate transfer (source->target)
 // Possibly should have a Params field like above
 {
-	TransferInfo Low 154 NotTrusted Zerocoded
-	{
-		TransferInfo		Single
-		{	TransferID		LLUUID	}
-		{	ChannelType		S32	}
-		{	TargetType		S32	}
-		{	Status			S32	}
-		{	Size			S32	}
-		{	Params			Variable	2	}
-	}
+    TransferInfo Low 154 NotTrusted Zerocoded
+    {
+        TransferInfo Single
+        {   TransferID  LLUUID      }
+        {   ChannelType S32         }
+        {   TargetType  S32         }
+        {   Status      S32         }
+        {   Size        S32         }
+        {   Params      Variable 2  }
+    }
 }
 
 {
-	TransferPacket High 17 NotTrusted Unencoded
-	{
-		TransferData Single
-		{	TransferID	LLUUID	}
-		{	ChannelType	S32	}
-		{	Packet		S32	}
-		{	Status		S32	}
-		{	Data		Variable 2	}
-	}
+    TransferPacket High 17 NotTrusted Unencoded
+    {
+        TransferData Single
+        {   TransferID  LLUUID      }
+        {   ChannelType S32         }
+        {   Packet      S32         }
+        {   Status      S32         }
+        {   Data        Variable 2  }
+    }
 }
 
 // Abort a transfer in progress (either from target->source or source->target)
 {
-	TransferAbort Low 155 NotTrusted Zerocoded
-	{
-		TransferInfo		Single
-		{	TransferID		LLUUID	}
-		{	ChannelType		S32	}
-	}
+    TransferAbort Low 155 NotTrusted Zerocoded
+    {
+        TransferInfo Single
+        {   TransferID  LLUUID  }
+        {   ChannelType S32     }
+    }
 }
 
 
@@ -3506,51 +3538,51 @@ version 2.0
 
 // RequestXfer - request an arbitrary xfer
 {
-	RequestXfer Low 156 NotTrusted Zerocoded
-	{
-		XferID				Single
-		{	ID				U64	}
-		{	Filename		Variable	1	}
-		{	FilePath		U8	} // ELLPath
-		{	DeleteOnCompletion BOOL	} // BOOL
-		{	UseBigPackets	BOOL	} // BOOL
-		{	VFileID			LLUUID	}
-		{	VFileType		S16	}
-	}
-}
-
-// SendXferPacket - send an additional packet of an arbitrary xfer from sim -> viewer 
-{
-	SendXferPacket High 18 NotTrusted Unencoded
-	{
-		XferID				Single
-		{	ID				U64	}
-		{	Packet			U32	}
-	}
-	{
-		DataPacket			Single
-		{	Data			Variable	2	}
-	}
+    RequestXfer Low 156 NotTrusted Zerocoded
+    {
+        XferID Single
+        {   ID                  U64         }
+        {   Filename            Variable 1  }
+        {   FilePath            U8          }   // ELLPath
+        {   DeleteOnCompletion  BOOL        }
+        {   UseBigPackets       BOOL        }
+        {   VFileID             LLUUID      }
+        {   VFileType           S16         }
+    }
+}
+
+// SendXferPacket - send an additional packet of an arbitrary xfer from sim -> viewer
+{
+    SendXferPacket High 18 NotTrusted Unencoded
+    {
+        XferID Single
+        {   ID      U64 }
+        {   Packet  U32 }
+    }
+    {
+        DataPacket Single
+        {   Data    Variable 2  }
+    }
 }
 
 // ConfirmXferPacket
 {
-	ConfirmXferPacket High 19 NotTrusted Unencoded
-	{
-		XferID				Single
-		{	ID				U64	}
-		{	Packet			U32	}
-	}
+    ConfirmXferPacket High 19 NotTrusted Unencoded
+    {
+        XferID Single
+        {   ID      U64 }
+        {   Packet  U32 }
+    }
 }
 
 // AbortXfer
 {
-	AbortXfer Low 157 NotTrusted Unencoded
-	{
-		XferID				Single
-		{	ID				U64	}
-		{	Result			S32	}
-	}
+    AbortXfer Low 157 NotTrusted Unencoded
+    {
+        XferID Single
+        {   ID      U64 }
+        {   Result  S32 }
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -3559,198 +3591,198 @@ version 2.0
 
 
 // AvatarAnimation - Update animation state
-// simulator --> viewer 
-{
-	AvatarAnimation High 20 Trusted Unencoded
-	{
-		Sender			Single
-		{	ID			LLUUID	}
-	}
-	{
-		AnimationList Variable
-		{ AnimID		LLUUID }
-		{ AnimSequenceID S32 }
-	}
-	{
-		AnimationSourceList Variable
-		{ ObjectID		LLUUID }
-	}
-	{
-		PhysicalAvatarEventList Variable
-		{ TypeData		Variable	1 }
-	}
+// simulator --> viewer
+{
+    AvatarAnimation High 20 Trusted Unencoded
+    {
+        Sender Single
+        {   ID  LLUUID  }
+    }
+    {
+        AnimationList Variable
+        { AnimID            LLUUID }
+        { AnimSequenceID    S32 }
+    }
+    {
+        AnimationSourceList Variable
+        { ObjectID  LLUUID }
+    }
+    {
+        PhysicalAvatarEventList Variable
+        { TypeData  Variable 1  }
+    }
 
 }
+
 // AvatarAppearance - Update visual params
 {
-	AvatarAppearance Low 158 Trusted Zerocoded
-	{
-		Sender				Single
-		{	ID				LLUUID	}
-		{	IsTrial			BOOL    }
-	}
-	{	
-		ObjectData			Single
-		{	TextureEntry	Variable	2	}
-	}
-	{
-		VisualParam			Variable
-		{	ParamValue		U8	}
-	}
-	{
-		AppearanceData		Variable
-		{	AppearanceVersion	U8	}
-		{	CofVersion			S32	}
-		{	Flags				U32	}
-	}
-	{
-		AppearanceHover		Variable
-		{	HoverHeight	LLVector3	}
-	}
-	{
-		AttachmentBlock		Variable
-		{	ID				    LLUUID  }
-		{	AttachmentPoint 		U8  }
-	}
+    AvatarAppearance Low 158 Trusted Zerocoded
+    {
+        Sender Single
+        {   ID      LLUUID  }
+        {   IsTrial BOOL    }
+    }
+    {
+        ObjectData Single
+        {   TextureEntry    Variable 2  }
+    }
+    {
+        VisualParam Variable
+        {   ParamValue  U8  }
+    }
+    {
+        AppearanceData Variable
+        {   AppearanceVersion   U8  }
+        {   CofVersion          S32 }
+        {   Flags               U32 }
+    }
+    {
+        AppearanceHover Variable
+        {   HoverHeight LLVector3   }
+    }
+    {
+        AttachmentBlock Variable
+        {   ID              LLUUID  }
+        {   AttachmentPoint U8      }
+    }
 }
 
 // AvatarSitResponse - response to a request to sit on an object
 {
-	AvatarSitResponse	High 21 Trusted Zerocoded
-	{
-		SitObject			Single
-		{	ID				LLUUID	}
-	}
-	{
-		SitTransform		Single
-		{	AutoPilot		BOOL }
-		{	SitPosition		LLVector3	}
-		{	SitRotation		LLQuaternion	}
-		{	CameraEyeOffset	LLVector3	}
-		{	CameraAtOffset	LLVector3	}
-		{	ForceMouselook	BOOL }
-	}
+    AvatarSitResponse High 21 Trusted Zerocoded
+    {
+        SitObject Single
+        {   ID  LLUUID  }
+    }
+    {
+        SitTransform Single
+        {   AutoPilot       BOOL            }
+        {   SitPosition     LLVector3       }
+        {   SitRotation     LLQuaternion    }
+        {   CameraEyeOffset LLVector3       }
+        {   CameraAtOffset  LLVector3       }
+        {   ForceMouselook  BOOL            }
+    }
 }
 
 // SetFollowCamProperties
-{ 
-	SetFollowCamProperties		Low	159 Trusted	Unencoded
-	{
-		ObjectData			Single
-		{	ObjectID				LLUUID	}
-	}
-	{
-		CameraProperty	Variable
-		{ 	Type 	S32 }
-		{ 	Value 	F32 }
-	}
+{
+    SetFollowCamProperties Low 159 Trusted Unencoded
+    {
+        ObjectData Single
+        {   ObjectID    LLUUID  }
+    }
+    {
+        CameraProperty Variable
+        {   Type    S32 }
+        {   Value   F32 }
+    }
 }
 
 // ClearFollowCamProperties
 {
-	ClearFollowCamProperties	Low 160 Trusted Unencoded
-	{
-		ObjectData			Single
-		{	ObjectID				LLUUID	}
-	}
+    ClearFollowCamProperties Low 160 Trusted Unencoded
+    {
+        ObjectData Single
+        {   ObjectID    LLUUID  }
+    }
 }
 
 // CameraConstraint - new camera distance limit (based on collision with objects)
 {
-	CameraConstraint High 22 Trusted Zerocoded
-	{
-		CameraCollidePlane	Single
-		{	Plane		LLVector4 }
-	}
+    CameraConstraint High 22 Trusted Zerocoded
+    {
+        CameraCollidePlane Single
+        {   Plane   LLVector4 }
+    }
 }
 
 // ObjectProperties
 // Extended information such as creator, permissions, etc.
 // Medium because potentially driven by mouse hover events.
 {
-	ObjectProperties Medium 9 Trusted Zerocoded
-	{
-		ObjectData			Variable
-		{	ObjectID		LLUUID	}
-		{	CreatorID		LLUUID	}
-		{	OwnerID			LLUUID	}
-		{	GroupID			LLUUID	}
-		{	CreationDate	U64	}
-		{	BaseMask		U32	}
-		{	OwnerMask		U32	}
-		{	GroupMask		U32	}
-		{	EveryoneMask	U32	}
-		{	NextOwnerMask	U32	}
-		{	OwnershipCost	S32	}
-//		{	TaxRate			F32	}	// F32
-		{	SaleType		U8	}   // U8 -> EForSale
-		{	SalePrice		S32	}
-		{	AggregatePerms	U8	}
-		{	AggregatePermTextures		U8	}
-		{	AggregatePermTexturesOwner	U8	}
-		{	Category		U32	}	// LLCategory
-		{	InventorySerial	S16	}	// S16
-		{	ItemID			LLUUID	}
-		{	FolderID		LLUUID	}
-		{	FromTaskID		LLUUID	}
-		{	LastOwnerID		LLUUID	}
-		{	Name			Variable	1	}
-		{	Description		Variable	1	}
-		{	TouchName		Variable	1	}
-		{	SitName			Variable	1	}
-		{	TextureID		Variable	1	}
-	}
+    ObjectProperties Medium 9 Trusted Zerocoded
+    {
+        ObjectData Variable
+        {   ObjectID        LLUUID          }
+        {   CreatorID       LLUUID          }
+        {   OwnerID         LLUUID          }
+        {   GroupID         LLUUID          }
+        {   CreationDate    U64             }
+        {   BaseMask        U32             }
+        {   OwnerMask       U32             }
+        {   GroupMask       U32             }
+        {   EveryoneMask    U32             }
+        {   NextOwnerMask   U32             }
+        {   OwnershipCost   S32             }
+//        {   TaxRate         F32             }   // F32
+        {   SaleType        U8              }   // U8 -> EForSale
+        {   SalePrice       S32             }
+        {   AggregatePerms              U8  }
+        {   AggregatePermTextures       U8  }
+        {   AggregatePermTexturesOwner  U8  }
+        {   Category            U32         }   // LLCategory
+        {   InventorySerial     S16         }   // S16
+        {   ItemID              LLUUID      }
+        {   FolderID            LLUUID      }
+        {   FromTaskID          LLUUID      }
+        {   LastOwnerID         LLUUID      }
+        {   Name            Variable 1      }
+        {   Description     Variable 1      }
+        {   TouchName       Variable 1      }
+        {   SitName         Variable 1      }
+        {   TextureID       Variable 1      }
+    }
 }
 
 // ObjectPropertiesFamily
 // Medium because potentially driven by mouse hover events.
 {
-	ObjectPropertiesFamily Medium 10 Trusted Zerocoded
-	{
-		ObjectData			Single
-		{	RequestFlags	U32	}
-		{	ObjectID		LLUUID	}
-		{	OwnerID			LLUUID	}
-		{	GroupID			LLUUID	}
-		{	BaseMask		U32	}
-		{	OwnerMask		U32	}
-		{	GroupMask		U32	}
-		{	EveryoneMask	U32	}
-		{	NextOwnerMask	U32	}
-		{	OwnershipCost	S32	}
-		{	SaleType		U8	}   // U8 -> EForSale
-		{	SalePrice		S32	}
-		{	Category		U32	}	// LLCategory
-		{	LastOwnerID		LLUUID	}
-		{	Name			Variable	1	}
-		{	Description		Variable	1	}
-	}
+    ObjectPropertiesFamily Medium 10 Trusted Zerocoded
+    {
+        ObjectData Single
+        {   RequestFlags    U32         }
+        {   ObjectID        LLUUID      }
+        {   OwnerID         LLUUID      }
+        {   GroupID         LLUUID      }
+        {   BaseMask        U32         }
+        {   OwnerMask       U32         }
+        {   GroupMask       U32         }
+        {   EveryoneMask    U32         }
+        {   NextOwnerMask   U32         }
+        {   OwnershipCost   S32         }
+        {   SaleType        U8          }   // U8 -> EForSale
+        {   SalePrice       S32         }
+        {   Category        U32         }   // LLCategory
+        {   LastOwnerID     LLUUID      }
+        {   Name            Variable 1  }
+        {   Description     Variable 1  }
+    }
 }
 
 // RequestPayPrice
 // viewer -> sim
 {
-	RequestPayPrice Low 161 NotTrusted Unencoded
-	{
-		ObjectData		Single
-		{	ObjectID	LLUUID	}
-	}
+    RequestPayPrice Low 161 NotTrusted Unencoded
+    {
+        ObjectData Single
+        {   ObjectID    LLUUID  }
+    }
 }
 
 // PayPriceReply
 // sim -> viewer
 {
-	PayPriceReply Low 162 Trusted Unencoded
-	{
-		ObjectData		Single
-		{	ObjectID	LLUUID }
-		{	DefaultPayPrice	S32	}
-	}
-	{
-		ButtonData		Variable
-		
-		{	PayButton	S32	}
-	}
+    PayPriceReply Low 162 Trusted Unencoded
+    {
+        ObjectData Single
+        {   ObjectID        LLUUID  }
+        {   DefaultPayPrice S32     }
+    }
+    {
+        ButtonData Variable
+        {   PayButton   S32 }
+    }
 }
 
 // KickUser
@@ -3760,29 +3792,29 @@ version 2.0
 // ROUTED dataserver -> userserver -> spaceserver -> simulator -> viewer
 // reliable, but that may not matter if a system component is quitting
 {
-	KickUser Low 163 Trusted Unencoded
-	{
-		TargetBlock			Single
-		{	TargetIP		IPADDR	}	// U32 encoded IP
-		{	TargetPort		IPPORT	}
-	}
-	{
-		UserInfo		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	Reason		Variable	2	}	// string
-	}
+    KickUser Low 163 Trusted Unencoded
+    {
+        TargetBlock Single
+        {   TargetIP    IPADDR  }   // U32 encoded IP
+        {   TargetPort  IPPORT  }
+    }
+    {
+        UserInfo Single
+        {   AgentID     LLUUID      }
+        {   SessionID   LLUUID      }
+        {   Reason      Variable 2  }   // string
+    }
 }
 
 // ack sent from the simulator up to the main database so that login
 // can continue.
 {
-	KickUserAck Low 164 Trusted Unencoded
-	{
-		UserInfo		Single
-		{	SessionID	LLUUID	}
-		{	Flags		U32		}
-	}
+    KickUserAck Low 164 Trusted Unencoded
+    {
+        UserInfo Single
+        {   SessionID   LLUUID  }
+        {   Flags       U32     }
+    }
 }
 
 // GodKickUser
@@ -3790,42 +3822,42 @@ version 2.0
 // viewer -> sim
 // reliable
 {
-	GodKickUser Low 165 NotTrusted Unencoded
-	{
-		UserInfo		Single
-		{	GodID			LLUUID	}
-		{	GodSessionID	LLUUID	}
-		{	AgentID			LLUUID	}
-		{	KickFlags		U32	}
-		{	Reason			Variable	2	}	// string
-	}
+    GodKickUser Low 165 NotTrusted Unencoded
+    {
+        UserInfo Single
+        {   GodID           LLUUID  }
+        {   GodSessionID    LLUUID  }
+        {   AgentID         LLUUID  }
+        {   KickFlags       U32     }
+        {   Reason      Variable 2  }   // string
+    }
 }
 
 // SystemKickUser
 // user->space, reliable
 {
-	SystemKickUser	Low	166 Trusted Unencoded
-	{
-		AgentInfo	Variable
-		{	AgentID	LLUUID	}
-	}
+    SystemKickUser Low 166 Trusted Unencoded
+    {
+        AgentInfo Variable
+        {   AgentID LLUUID  }
+    }
 }
 
 // EjectUser
 // viewer -> sim
 // reliable
 {
-	EjectUser	Low	167 	NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		Data		Single
-		{	TargetID	LLUUID	}
-		{	Flags		U32		}
-	}
+    EjectUser Low 167 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   TargetID    LLUUID  }
+        {   Flags       U32     }
+    }
 }
 
 // FreezeUser
@@ -3833,17 +3865,17 @@ version 2.0
 // viewer -> sim
 // reliable
 {
-	FreezeUser	Low	168 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		Data		Single
-		{	TargetID	LLUUID	}
-		{	Flags		U32		}
-	}
+    FreezeUser Low 168 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   TargetID    LLUUID  }
+        {   Flags       U32     }
+    }
 }
 
 
@@ -3851,68 +3883,68 @@ version 2.0
 // viewer -> simulator
 // reliable
 {
-	AvatarPropertiesRequest Low 169 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-		{	AvatarID		LLUUID	}
-	}
+    AvatarPropertiesRequest Low 169 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   AvatarID    LLUUID  }
+    }
 }
 
 // AvatarPropertiesRequestBackend
 // simulator -> dataserver
 // reliable
 {
-	AvatarPropertiesRequestBackend Low 170 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	AvatarID		LLUUID	}
-		{	GodLevel		U8		}
-		{	WebProfilesDisabled		BOOL	}
-	}
+    AvatarPropertiesRequestBackend Low 170 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID             LLUUID  }
+        {   AvatarID            LLUUID  }
+        {   GodLevel            U8      }
+        {   WebProfilesDisabled BOOL    }
+    }
 }
 // AvatarPropertiesReply
 // dataserver -> simulator
 // simulator -> viewer
 // reliable
 {
-	AvatarPropertiesReply Low 171 Trusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID		}	// your id
-		{	AvatarID		LLUUID		}	// avatar you're asking about
-	}
-	{
-		PropertiesData		Single
-		{	ImageID			LLUUID		}
-		{	FLImageID		LLUUID		}
-		{	PartnerID		LLUUID		}
-		{	AboutText		Variable 2	}	// string, up to 512
-		{	FLAboutText		Variable 1	}	// string
-		{	BornOn			Variable 1	}	// string
-		{	ProfileURL		Variable 1	}	// string
-		{	CharterMember	Variable 1	}	// special - usually U8
-		{	Flags			U32			}
-	}
-}
-
-{
-	AvatarInterestsReply Low 172 Trusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID		}	// your id
-		{	AvatarID		LLUUID		}	// avatar you're asking about
-	}
-	{
-		PropertiesData		Single
-		{	WantToMask		U32			}
-		{	WantToText		Variable 1	}	// string
-		{	SkillsMask		U32			}
-		{	SkillsText		Variable 1	}	// string
-		{	LanguagesText	Variable 1	}	// string
-	}
+    AvatarPropertiesReply Low 171 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }   // your id
+        {   AvatarID    LLUUID  }   // avatar you're asking about
+    }
+    {
+        PropertiesData Single
+        {   ImageID         LLUUID      }
+        {   FLImageID       LLUUID      }
+        {   PartnerID       LLUUID      }
+        {   AboutText       Variable 2  }   // string, up to 512
+        {   FLAboutText     Variable 1  }   // string
+        {   BornOn          Variable 1  }   // string
+        {   ProfileURL      Variable 1  }   // string
+        {   CharterMember   Variable 1  }   // special - usually U8
+        {   Flags           U32         }
+    }
+}
+
+{
+    AvatarInterestsReply Low 172 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }   // your id
+        {   AvatarID    LLUUID  }   // avatar you're asking about
+    }
+    {
+        PropertiesData Single
+        {   WantToMask      U32         }
+        {   WantToText      Variable 1  }   // string
+        {   SkillsMask      U32         }
+        {   SkillsText      Variable 1  }   // string
+        {   LanguagesText   Variable 1  }   // string
+    }
 }
 
 // AvatarGroupsReply
@@ -3920,25 +3952,25 @@ version 2.0
 // simulator -> viewer
 // reliable
 {
-	AvatarGroupsReply Low 173 Trusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID		}	// your id
-		{	AvatarID		LLUUID		}	// avatar you're asking about
-	}
-	{
-		GroupData			Variable
-		{	GroupPowers			U64			}
-		{	AcceptNotices		BOOL		}
-		{	GroupTitle			Variable 1	}
-		{	GroupID				LLUUID		}
-		{	GroupName			Variable 1	}
-		{	GroupInsigniaID		LLUUID		}
-	}
-	{
-		NewGroupData		Single
-		{	ListInProfile	BOOL		}	// whether group displays in profile
-	}
+    AvatarGroupsReply Low 173 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }   // your id
+        {   AvatarID    LLUUID  }   // avatar you're asking about
+    }
+    {
+        GroupData Variable
+        {   GroupPowers     U64         }
+        {   AcceptNotices   BOOL        }
+        {   GroupTitle      Variable 1  }
+        {   GroupID         LLUUID      }
+        {   GroupName       Variable 1  }
+        {   GroupInsigniaID LLUUID      }
+    }
+    {
+        NewGroupData Single
+        {   ListInProfile   BOOL        }   // whether group displays in profile
+    }
 }
 
 
@@ -3946,42 +3978,42 @@ version 2.0
 // viewer -> simulator
 // reliable
 {
-	AvatarPropertiesUpdate Low 174 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		PropertiesData	Single
-		{	ImageID			LLUUID			}
-		{	FLImageID		LLUUID			}
-		{	AboutText		Variable	2	}	// string, up to 512
-		{	FLAboutText		Variable	1	}
-		{	AllowPublish		BOOL			}	// whether profile is externally visible or not
-		{	MaturePublish		BOOL		}	// profile is "mature"
-		{	ProfileURL		Variable	1	}	// string
-	}
+    AvatarPropertiesUpdate Low 174 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        PropertiesData Single
+        {   ImageID         LLUUID      }
+        {   FLImageID       LLUUID      }
+        {   AboutText       Variable 2  }   // string, up to 512
+        {   FLAboutText     Variable 1  }
+        {   AllowPublish    BOOL        }   // whether profile is externally visible or not
+        {   MaturePublish   BOOL        }   // profile is "mature"
+        {   ProfileURL      Variable 1  }   // string
+    }
 }
 
 // AvatarInterestsUpdate
 // viewer -> simulator
 // reliable
 {
-	AvatarInterestsUpdate Low 175 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		PropertiesData	Single
-		{	WantToMask		U32				}
-		{	WantToText		Variable	1	}	// string
-		{	SkillsMask		U32				}
-		{	SkillsText		Variable	1	}	// string
-		{	LanguagesText	Variable	1	}	// string	
-	}
+    AvatarInterestsUpdate Low 175 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        PropertiesData Single
+        {   WantToMask      U32         }
+        {   WantToText      Variable 1  }   // string
+        {   SkillsMask      U32         }
+        {   SkillsText      Variable 1  }   // string
+        {   LanguagesText   Variable 1  }   // string
+    }
 }
 
 
@@ -3991,16 +4023,16 @@ version 2.0
 // simulator -> viewer
 // reliable
 {
-	AvatarNotesReply Low 176 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID		}
-	}
-	{
-		Data		Single
-		{	TargetID		LLUUID		}
-		{	Notes			Variable 2	}	// string
-	}
+    AvatarNotesReply Low 176 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        Data Single
+        {   TargetID    LLUUID      }
+        {   Notes       Variable 2  }   // string
+    }
 }
 
 
@@ -4008,17 +4040,17 @@ version 2.0
 // viewer -> simulator -> dataserver
 // reliable
 {
-	AvatarNotesUpdate Low 177 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		Data		Single
-		{	TargetID		LLUUID		}
-		{	Notes			Variable 2	}	// string
-	}
+    AvatarNotesUpdate Low 177 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   TargetID    LLUUID      }
+        {   Notes       Variable 2  }   // string
+    }
 }
 
 
@@ -4028,17 +4060,17 @@ version 2.0
 // This fills in the tabs of the Picks panel.
 // reliable
 {
-	AvatarPicksReply Low 178 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID		}
-		{	TargetID		LLUUID		}
-	}
-	{
-		Data			Variable
-		{	PickID			LLUUID		}
-		{	PickName		Variable 1	}	// string
-	}
+    AvatarPicksReply Low 178 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   TargetID    LLUUID  }
+    }
+    {
+        Data Variable
+        {   PickID      LLUUID      }
+        {   PickName    Variable 1  }   // string
+    }
 }
 
 
@@ -4047,16 +4079,16 @@ version 2.0
 // simulator -> dataserver
 // reliable
 {
-	EventInfoRequest Low 179 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		EventData		Single
-		{	EventID		U32	}
-	}
+    EventInfoRequest Low 179 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        EventData Single
+        {   EventID U32 }
+    }
 }
 
 
@@ -4065,27 +4097,27 @@ version 2.0
 // simulator -> viewer
 // reliable
 {
-	EventInfoReply Low 180 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-	}
-	{
-		EventData		Single
-		{	EventID		U32				}
-		{	Creator		Variable	1	}
-		{	Name		Variable	1	}
-		{	Category	Variable	1	}
-		{	Desc		Variable	2	}
-		{	Date		Variable	1	}
-		{	DateUTC		U32				}
-		{	Duration	U32				}
-		{	Cover		U32				}
-		{	Amount		U32				}
-		{	SimName		Variable	1	}
-		{	GlobalPos	LLVector3d		}
-		{	EventFlags	U32				}
-	}
+    EventInfoReply Low 180 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        EventData Single
+        {   EventID     U32         }
+        {   Creator     Variable 1  }
+        {   Name        Variable 1  }
+        {   Category    Variable 1  }
+        {   Desc        Variable 2  }
+        {   Date        Variable 1  }
+        {   DateUTC     U32         }
+        {   Duration    U32         }
+        {   Cover       U32         }
+        {   Amount      U32         }
+        {   SimName     Variable 1  }
+        {   GlobalPos   LLVector3d  }
+        {   EventFlags  U32         }
+    }
 }
 
 
@@ -4094,16 +4126,16 @@ version 2.0
 // simulator -> dataserver
 // reliable
 {
-	EventNotificationAddRequest Low 181 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		EventData		Single
-		{	EventID		U32		}
-	}
+    EventNotificationAddRequest Low 181 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        EventData Single
+        {   EventID U32 }
+    }
 }
 
 
@@ -4112,16 +4144,16 @@ version 2.0
 // simulator -> dataserver
 // reliable
 {
-	EventNotificationRemoveRequest Low 182 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		EventData		Single
-		{	EventID		U32		}
-	}
+    EventNotificationRemoveRequest Low 182 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        EventData Single
+        {   EventID U32 }
+    }
 }
 
 // EventGodDelete
@@ -4130,23 +4162,23 @@ version 2.0
 // QueryData is used to resend a search result after the deletion
 // reliable
 {
-	EventGodDelete Low 183 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		EventData		Single
-		{	EventID			U32		}
-	}
-	{
-		QueryData		Single
-		{	QueryID		LLUUID		}
-		{	QueryText	Variable 1	}
-		{	QueryFlags	U32			}
-		{	QueryStart	S32			}	// prev/next page support
-	}
+    EventGodDelete Low 183 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        EventData Single
+        {   EventID U32 }
+    }
+    {
+        QueryData Single
+        {   QueryID     LLUUID      }
+        {   QueryText   Variable 1  }
+        {   QueryFlags  U32         }
+        {   QueryStart  S32         }   // prev/next page support
+    }
 }
 
 
@@ -4155,26 +4187,26 @@ version 2.0
 // simulator -> viewer
 // reliable
 {
-	PickInfoReply Low 184 Trusted Unencoded
+    PickInfoReply Low 184 Trusted Unencoded
     {
-        AgentData    Single
-        {    AgentID        LLUUID    }
+        AgentData Single
+        {    AgentID    LLUUID  }
     }
     {
-		Data        Single
-		{	PickID			LLUUID		}
-		{	CreatorID		LLUUID		}
-		{	TopPick			BOOL		}
-		{	ParcelID		LLUUID		}
-		{	Name			Variable 1	}
-        {	Desc			Variable 2	}
-        {	SnapshotID		LLUUID		}
-        {	User			Variable 1	}
-        {	OriginalName	Variable 1	}
-        {	SimName			Variable 1	}
-        {	PosGlobal		LLVector3d	}
-        {	SortOrder		S32			}
-        {	Enabled			BOOL		}
+        Data Single
+        {   PickID          LLUUID      }
+        {   CreatorID       LLUUID      }
+        {   TopPick         BOOL        }
+        {   ParcelID        LLUUID      }
+        {   Name            Variable 1  }
+        {   Desc            Variable 2  }
+        {   SnapshotID      LLUUID      }
+        {   User            Variable 1  }
+        {   OriginalName    Variable 1  }
+        {   SimName         Variable 1  }
+        {   PosGlobal       LLVector3d  }
+        {   SortOrder       S32         }
+        {   Enabled         BOOL        }
     }
 }
 
@@ -4187,25 +4219,25 @@ version 2.0
 // viewer -> simulator -> dataserver
 // reliable
 {
-	PickInfoUpdate Low 185 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-	}
-	{
-		Data		Single
-		{	PickID			LLUUID		}
-		{	CreatorID		LLUUID		}
-		{	TopPick			BOOL		}
-		{	ParcelID		LLUUID		}
-		{	Name			Variable 1	}
-		{	Desc			Variable 2	}
-		{	SnapshotID		LLUUID		}
-		{	PosGlobal		LLVector3d	}
-        {	SortOrder		S32			}
-        {	Enabled			BOOL		}
-	}
+    PickInfoUpdate Low 185 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID         LLUUID      }
+        {   SessionID       LLUUID      }
+    }
+    {
+        Data Single
+        {   PickID      LLUUID      }
+        {   CreatorID   LLUUID      }
+        {   TopPick     BOOL        }
+        {   ParcelID    LLUUID      }
+        {   Name        Variable 1  }
+        {   Desc        Variable 2  }
+        {   SnapshotID  LLUUID      }
+        {   PosGlobal   LLVector3d  }
+        {   SortOrder   S32         }
+        {   Enabled     BOOL        }
+    }
 }
 
 
@@ -4214,92 +4246,92 @@ version 2.0
 // viewer -> simulator -> dataserver
 // reliable
 {
-	PickDelete Low 186 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-	}
-	{
-		Data	Single
-		{	PickID			LLUUID		}
-	}
+    PickDelete Low 186 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   PickID  LLUUID  }
+    }
 }
 
 // PickGodDelete
 // Delete a pick from the database.
-// QueryID is needed so database can send a repeat list of 
+// QueryID is needed so database can send a repeat list of
 // picks.
 // viewer -> simulator -> dataserver
 // reliable
 {
-	PickGodDelete Low 187 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID		}
-		{	SessionID		LLUUID		}
-	}
-	{
-		Data	Single
-		{	PickID			LLUUID		}
-		{	QueryID			LLUUID		}
-	}
+    PickGodDelete Low 187 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   PickID  LLUUID  }
+        {   QueryID LLUUID  }
+    }
 }
 
 
 // ScriptQuestion
 // reliable
 {
-	ScriptQuestion Low 188 Trusted Unencoded
-	{
-		Data	Single
-		{	TaskID			LLUUID	}
-		{	ItemID			LLUUID	}
-		{	ObjectName		Variable	1	}
-		{	ObjectOwner		Variable	1	}
-		{	Questions		S32	}
-	}
-	{
-		Experience	Single
-		{	ExperienceID	LLUUID	}
-	}
+    ScriptQuestion Low 188 Trusted Unencoded
+    {
+        Data Single
+        {   TaskID      LLUUID      }
+        {   ItemID      LLUUID      }
+        {   ObjectName  Variable 1  }
+        {   ObjectOwner Variable 1  }
+        {   Questions   S32         }
+    }
+    {
+    Experience Single
+        {   ExperienceID    LLUUID  }
+    }
 }
 
 // ScriptControlChange
 // reliable
 {
-	ScriptControlChange Low 189 Trusted Unencoded
-	{
-		Data	Variable
-		{	TakeControls	BOOL 	}
-		{	Controls		U32		}
-		{	PassToAgent		BOOL	}
-	}
+    ScriptControlChange Low 189 Trusted Unencoded
+    {
+        Data Variable
+        {   TakeControls    BOOL    }
+        {   Controls        U32     }
+        {   PassToAgent     BOOL    }
+    }
 }
 
 // ScriptDialog
 // sim -> viewer
 // reliable
 {
-	ScriptDialog Low 190 Trusted Zerocoded
-	{
-		Data	Single
-		{	ObjectID	LLUUID			}
-		{	FirstName	Variable	1	}
-		{	LastName	Variable	1	}
-		{	ObjectName	Variable	1	}
-		{	Message		Variable	2	}
-		{	ChatChannel	S32				}
-		{	ImageID		LLUUID			}
-	}
-	{
-		Buttons	Variable
-		{	ButtonLabel		Variable	1	}
-	}
-	{
-		OwnerData Variable
-		{	OwnerID		LLUUID	}
-	}
+    ScriptDialog Low 190 Trusted Zerocoded
+    {
+        Data Single
+        {   ObjectID    LLUUID      }
+        {   FirstName   Variable 1  }
+        {   LastName    Variable 1  }
+        {   ObjectName  Variable 1  }
+        {   Message     Variable 2  }
+        {   ChatChannel S32         }
+        {   ImageID     LLUUID      }
+    }
+    {
+        Buttons Variable
+        {   ButtonLabel Variable 1  }
+    }
+    {
+        OwnerData Variable
+        {   OwnerID LLUUID  }
+    }
 }
 
 
@@ -4307,47 +4339,47 @@ version 2.0
 // viewer -> sim
 // reliable
 {
-	ScriptDialogReply Low 191 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		Data	Single
-		{	ObjectID	LLUUID			}
-		{	ChatChannel	S32				}
-		{	ButtonIndex	S32				}
-		{	ButtonLabel	Variable 1		}
-	}
+    ScriptDialogReply Low 191 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   ObjectID    LLUUID      }
+        {   ChatChannel S32         }
+        {   ButtonIndex S32         }
+        {   ButtonLabel Variable 1  }
+    }
 }
 
 
 // ForceScriptControlRelease
 // reliable
 {
-	ForceScriptControlRelease Low 192 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
+    ForceScriptControlRelease Low 192 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
 }
 
 // RevokePermissions
 // reliable
 {
-	RevokePermissions Low 193 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		Data	Single
-		{ ObjectID				LLUUID }
-		{ ObjectPermissions		U32 }
-	}
+    RevokePermissions Low 193 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        { ObjectID          LLUUID  }
+        { ObjectPermissions U32     }
+    }
 }
 
 // LoadURL
@@ -4355,29 +4387,36 @@ version 2.0
 // Ask the user if they would like to load a URL
 // reliable
 {
-	LoadURL Low 194 Trusted Unencoded
-	{
-		Data	Single
-		{	ObjectName		Variable	1	}
-		{	ObjectID		LLUUID			}
-		{	OwnerID			LLUUID			}
-		{	OwnerIsGroup	BOOL			}
-		{	Message			Variable	1	}
-		{	URL				Variable	1	}
-	}
+    LoadURL Low 194 Trusted Unencoded
+    {
+        Data Single
+        {   ObjectName      Variable 1  }
+        {   ObjectID        LLUUID      }
+        {   OwnerID         LLUUID      }
+        {   OwnerIsGroup    BOOL        }
+        {   Message         Variable 1  }
+        {   URL             Variable 1  }
+    }
 }
 
 // ScriptTeleportRequest
+// Interestingly, this message does not actually "Request a Teleport"
+// on the viewer. Instead it opens the world map and places a beacon
+// at the indicated location.
 // reliable
 {
-	ScriptTeleportRequest Low 195 Trusted Unencoded
-	{
-		Data	Single
-		{	ObjectName		Variable	1	}
-		{	SimName			Variable	1	}
-		{	SimPosition		LLVector3		}
-		{	LookAt			LLVector3		}
-	}
+    ScriptTeleportRequest Low 195 Trusted Unencoded
+    {
+        Data Single
+        {   ObjectName  Variable 1  }
+        {   SimName     Variable 1  }
+        {   SimPosition LLVector3   }
+        {   LookAt      LLVector3   }
+    }
+    {
+        Options Variable
+        {   Flags           U32 }
+    }
 }
 
 
@@ -4395,12 +4434,12 @@ version 2.0
 // sim -> viewer
 // reliable
 {
-	ParcelOverlay Low 196 Trusted Zerocoded
-	{
-		ParcelData		Single
-		{	SequenceID	S32				}	// 0...3, which piece of region
-		{	Data		Variable	2	}	// packed bit-field, (grids*grids)/N
-	}
+    ParcelOverlay Low 196 Trusted Zerocoded
+    {
+        ParcelData Single
+        {   SequenceID  S32         }   // 0...3, which piece of region
+        {   Data        Variable 2  }   // packed bit-field, (grids*grids)/N
+    }
 }
 
 
@@ -4410,38 +4449,38 @@ version 2.0
 // viewer -> sim
 // reliable
 {
-	ParcelPropertiesRequest Medium 11 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ParcelData			Single
-		{	SequenceID	S32	}
-		{	West		F32	}
-		{	South		F32	}
-		{	East		F32	}
-		{	North		F32	}
-		{	SnapSelection	BOOL	}
-	}
+    ParcelPropertiesRequest Medium 11 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ParcelData Single
+        {   SequenceID      S32     }
+        {   West            F32     }
+        {   South           F32     }
+        {   East            F32     }
+        {   North           F32     }
+        {   SnapSelection   BOOL    }
+    }
 }
 
 // ParcelPropertiesRequestByID
 // viewer -> sim
 // reliable
 {
-	ParcelPropertiesRequestByID Low 197 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ParcelData		Single
-		{	SequenceID	S32		}
-		{	LocalID		S32		}
-	}
+    ParcelPropertiesRequestByID Low 197 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ParcelData Single
+        {   SequenceID  S32 }
+        {   LocalID     S32 }
+    }
 }
 
 // ParcelProperties
@@ -4454,68 +4493,69 @@ version 2.0
 // WARNING: This packet is potentially large.  With max length name,
 // description, music URL and media URL, it is 1526 + sizeof ( LLUUID ) bytes.
 {
-	ParcelProperties High 23 Trusted Zerocoded
-	{
-		ParcelData			Single
-		{	RequestResult	S32				}
-		{	SequenceID		S32				}
-		{	SnapSelection	BOOL			}
-		{	SelfCount		S32				}
-		{	OtherCount		S32				}
-		{	PublicCount		S32				}
-		{	LocalID			S32				}
-		{	OwnerID			LLUUID			}
-		{	IsGroupOwned	BOOL			}
-		{	AuctionID		U32				}
-		{	ClaimDate		S32				}	// time_t
-		{	ClaimPrice		S32				}
-		{	RentPrice		S32				}
-		{	AABBMin			LLVector3		}
-		{	AABBMax			LLVector3		}
-		{	Bitmap			Variable	2	}	// packed bit-field
-		{	Area			S32				}
-		{	Status			U8	}  // owned vs. pending
-		{	SimWideMaxPrims		S32			}
-		{	SimWideTotalPrims	S32			}
-		{	MaxPrims		S32				}
-		{	TotalPrims		S32				}
-		{	OwnerPrims		S32				}
-		{	GroupPrims		S32				}
-		{	OtherPrims		S32				}
-		{	SelectedPrims	S32				}
-		{	ParcelPrimBonus	F32				}
-
-		{	OtherCleanTime	S32				}
-
-		{	ParcelFlags		U32				}
-		{	SalePrice		S32				}
-		{	Name			Variable	1	}	// string
-		{	Desc			Variable	1	}	// string
-		{	MusicURL		Variable	1	}	// string
-		{	MediaURL		Variable	1	}	// string
-		{	MediaID			LLUUID			}
-		{	MediaAutoScale	U8				}
-		{	GroupID			LLUUID			}
-		{	PassPrice		S32				}
-		{	PassHours		F32				}
-		{	Category		U8				}
-		{	AuthBuyerID		LLUUID			}
-		{	SnapshotID		LLUUID			}
-		{	UserLocation	LLVector3		}
-		{	UserLookAt		LLVector3		}
-		{	LandingType		U8				}
-		{	RegionPushOverride	BOOL		}
-		{	RegionDenyAnonymous	BOOL		}
-		{	RegionDenyIdentified	BOOL		}
-		{	RegionDenyTransacted	BOOL		}
-	}
-	{
-		AgeVerificationBlock Single
-		{   RegionDenyAgeUnverified BOOL    }
-	}
+    ParcelProperties High 23 Trusted Zerocoded UDPDeprecated
+    {
+        ParcelData Single
+        {   RequestResult       S32         }
+        {   SequenceID          S32         }
+        {   SnapSelection       BOOL        }
+        {   SelfCount           S32         }
+        {   OtherCount          S32         }
+        {   PublicCount         S32         }
+        {   LocalID             S32         }
+        {   OwnerID             LLUUID      }
+        {   IsGroupOwned        BOOL        }
+        {   AuctionID           U32         }
+        {   ClaimDate           S32         }   // time_t
+        {   ClaimPrice          S32         }
+        {   RentPrice           S32         }
+        {   AABBMin             LLVector3   }
+        {   AABBMax             LLVector3   }
+        {   Bitmap              Variable 2  }   // packed bit-field
+        {   Area                S32         }
+        {   Status              U8          }   // owned vs. pending
+        {   SimWideMaxPrims     S32         }
+        {   SimWideTotalPrims   S32         }
+        {   MaxPrims            S32         }
+        {   TotalPrims          S32         }
+        {   OwnerPrims          S32         }
+        {   GroupPrims          S32         }
+        {   OtherPrims          S32         }
+        {   SelectedPrims       S32         }
+        {   ParcelPrimBonus     F32         }
+
+        {   OtherCleanTime      S32         }
+
+        {   ParcelFlags         U32         }
+        {   SalePrice           S32         }
+        {   Name                Variable 1  }   // string
+        {   Desc                Variable 1  }   // string
+        {   MusicURL            Variable 1  }   // string
+        {   MediaURL            Variable 1  }   // string
+        {   MediaID             LLUUID      }
+        {   MediaAutoScale      U8          }
+        {   GroupID             LLUUID      }
+        {   PassPrice           S32         }
+        {   PassHours           F32         }
+        {   Category            U8          }
+        {   AuthBuyerID         LLUUID      }
+        {   SnapshotID          LLUUID      }
+        {   UserLocation        LLVector3   }
+        {   UserLookAt          LLVector3   }
+        {   LandingType         U8          }
+        {   RegionPushOverride  BOOL        }
+        {   RegionDenyAnonymous BOOL        }
+        {   RegionDenyIdentified    BOOL    }
+        {   RegionDenyTransacted    BOOL    }
+        // in llsd message, SeeAVs, GroupAVSounds and AnyAVSounds BOOLs are also sent
+    }
+    {
+        AgeVerificationBlock Single
+        {   RegionDenyAgeUnverified BOOL    }
+    }
     {
         RegionAllowAccessBlock Single
-        {   RegionAllowAccessOverride BOOL  }  
+        {   RegionAllowAccessOverride   BOOL    }
     }
     {
         ParcelEnvironmentBlock Single
@@ -4528,77 +4568,77 @@ version 2.0
 // viewer -> sim
 // reliable
 {
-	ParcelPropertiesUpdate Low 198 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ParcelData			Single
-		{	LocalID			S32				}
-		{	Flags			U32				}
-
-		{	ParcelFlags		U32				}
-		{	SalePrice		S32				}
-		{	Name			Variable	1	}	// string
-		{	Desc			Variable	1	}	// string
-		{	MusicURL		Variable	1	}	// string
-		{	MediaURL		Variable	1	}	// string
-		{	MediaID			LLUUID			}
-		{	MediaAutoScale	U8				}
-		{	GroupID			LLUUID			}
-		{	PassPrice		S32				}
-		{	PassHours		F32				}
-		{	Category		U8				}
-		{	AuthBuyerID		LLUUID			}
-		{	SnapshotID		LLUUID			}
-		{	UserLocation	LLVector3		}
-		{	UserLookAt		LLVector3		}
-		{	LandingType		U8				}
-	}
+    ParcelPropertiesUpdate Low 198 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ParcelData Single
+        {   LocalID         S32         }
+        {   Flags           U32         }
+
+        {   ParcelFlags     U32         }
+        {   SalePrice       S32         }
+        {   Name            Variable 1  }   // string
+        {   Desc            Variable 1  }   // string
+        {   MusicURL        Variable 1  }   // string
+        {   MediaURL        Variable 1  }   // string
+        {   MediaID         LLUUID      }
+        {   MediaAutoScale  U8          }
+        {   GroupID         LLUUID      }
+        {   PassPrice       S32         }
+        {   PassHours       F32         }
+        {   Category        U8          }
+        {   AuthBuyerID     LLUUID      }
+        {   SnapshotID      LLUUID      }
+        {   UserLocation    LLVector3   }
+        {   UserLookAt      LLVector3   }
+        {   LandingType     U8          }
+    }
 }
 
 // ParcelReturnObjects
 // viewer -> sim
 // reliable
 {
-	ParcelReturnObjects Low 199 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ParcelData			Single
-		{	LocalID			S32				}
-		{	ReturnType		U32				}
-	}
-	{
-		TaskIDs			Variable
-		{	TaskID			LLUUID			}
-	}
-	{
-		OwnerIDs			Variable
-		{	OwnerID			LLUUID			}
-	}
+    ParcelReturnObjects Low 199 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ParcelData Single
+        {   LocalID     S32 }
+        {   ReturnType  U32 }
+    }
+    {
+        TaskIDs Variable
+        {   TaskID  LLUUID  }
+    }
+    {
+        OwnerIDs Variable
+        {   OwnerID LLUUID  }
+    }
 }
 
 // ParcelSetOtherCleanTime
 // viewer -> sim
 // reliable
 {
-	ParcelSetOtherCleanTime Low 200 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ParcelData			Single
-		{	LocalID			S32				}
-		{	OtherCleanTime	S32				}
-	}
+    ParcelSetOtherCleanTime Low 200 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ParcelData Single
+        {   LocalID         S32 }
+        {   OtherCleanTime  S32 }
+    }
 }
 
 
@@ -4607,25 +4647,25 @@ version 2.0
 // viewer -> sim
 // reliable
 {
-	ParcelDisableObjects Low 201 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ParcelData			Single
-		{	LocalID			S32				}
-		{	ReturnType		U32				}
-	}
-	{
-		TaskIDs			Variable
-		{	TaskID			LLUUID			}
-	}
-	{
-		OwnerIDs			Variable
-		{	OwnerID			LLUUID			}
-	}
+    ParcelDisableObjects Low 201 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ParcelData Single
+        {   LocalID     S32 }
+        {   ReturnType  U32 }
+    }
+    {
+        TaskIDs Variable
+        {   TaskID  LLUUID  }
+    }
+    {
+        OwnerIDs Variable
+        {   OwnerID LLUUID  }
+    }
 }
 
 
@@ -4633,21 +4673,21 @@ version 2.0
 // viewer -> sim
 // reliable
 {
-	ParcelSelectObjects Low 202 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ParcelData			Single
-		{	LocalID			S32				}
-		{	ReturnType		U32				}
-	}
-	{
-		ReturnIDs			Variable
-		{	ReturnID		LLUUID	}
-	}
+    ParcelSelectObjects Low 202 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ParcelData Single
+        {   LocalID     S32 }
+        {   ReturnType  U32 }
+    }
+    {
+        ReturnIDs Variable
+        {   ReturnID    LLUUID  }
+    }
 }
 
 
@@ -4656,11 +4696,11 @@ version 2.0
 // reliable
 {
     EstateCovenantRequest Low 203 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
 }
 
 // EstateCovenantReply
@@ -4668,12 +4708,12 @@ version 2.0
 // reliable
 {
     EstateCovenantReply Low 204 Trusted Unencoded
-	{
-		Data        Single
-		{	CovenantID		    LLUUID		    }
-		{	CovenantTimestamp	U32 		    }
-		{	EstateName		    Variable    1	}   // string
-        {   EstateOwnerID       LLUUID          }
+    {
+        Data Single
+        {   CovenantID          LLUUID      }
+        {   CovenantTimestamp   U32         }
+        {   EstateName          Variable 1  }   // string
+        {   EstateOwnerID       LLUUID      }
     }
 }
 
@@ -4682,15 +4722,15 @@ version 2.0
 // sim -> viewer
 // reliable
 {
-	ForceObjectSelect Low 205 Trusted Unencoded
-	{
-		Header				Single
-		{	ResetList		BOOL			}
-	}
-	{
-		Data				Variable
-		{	LocalID			U32				}
-	}
+    ForceObjectSelect Low 205 Trusted Unencoded
+    {
+        Header Single
+        {   ResetList   BOOL    }
+    }
+    {
+        Data Variable
+        {   LocalID U32 }
+    }
 }
 
 
@@ -4698,72 +4738,72 @@ version 2.0
 // viewer -> sim
 // reliable
 {
-	ParcelBuyPass	Low	206 	NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ParcelData			Single
-		{	LocalID			S32				}
-	}
+    ParcelBuyPass Low 206 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ParcelData Single
+        {   LocalID S32 }
+    }
 }
 
 // ParcelDeedToGroup - deed a patch of land to a group
 // viewer -> sim
 // reliable
 {
-	ParcelDeedToGroup Low 207 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		Data				Single
-		{	GroupID			LLUUID	}
-		{	LocalID			S32		}	// parcel id
-	}
+    ParcelDeedToGroup Low 207 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   GroupID LLUUID  }
+        {   LocalID S32     }   // parcel id
+    }
 }
 
 // reserved for when island owners force re-claim parcel
 {
-	ParcelReclaim Low 208 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		Data				Single
-		{	LocalID			S32		}	// parcel id
-	}
+    ParcelReclaim Low 208 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   LocalID S32 }   // parcel id
+    }
 }
 
 // ParcelClaim - change the owner of a patch of land
 // viewer -> sim
 // reliable
 {
-	ParcelClaim Low 209 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		Data				Single
-		{	GroupID			LLUUID	}
-		{	IsGroupOwned	BOOL 	}
-		{	Final			BOOL	} // true if buyer is in tier
-	}
-	{
-		ParcelData			Variable
-		{	West			F32		}
-		{	South			F32		}
-		{	East			F32		}
-		{	North			F32		}
-	}
+    ParcelClaim Low 209 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   GroupID         LLUUID  }
+        {   IsGroupOwned    BOOL    }
+        {   Final           BOOL    }   // true if buyer is in tier
+    }
+    {
+        ParcelData Variable
+        {   West    F32 }
+        {   South   F32 }
+        {   East    F32 }
+        {   North   F32 }
+    }
 }
 
 // ParcelJoin - Take all parcels which are owned by agent and inside
@@ -4771,19 +4811,19 @@ version 2.0
 // viewer -> sim
 // reliable
 {
-	ParcelJoin Low 210 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ParcelData			Single
-		{	West		F32		}
-		{	South		F32		}
-		{	East		F32		}
-		{	North		F32		}
-	}
+    ParcelJoin Low 210 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ParcelData Single
+        {   West    F32 }
+        {   South   F32 }
+        {   East    F32 }
+        {   North   F32 }
+    }
 }
 
 // ParcelDivide
@@ -4792,19 +4832,19 @@ version 2.0
 // viewer -> sim
 // reliable
 {
-	ParcelDivide Low 211 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ParcelData			Single
-		{	West		F32		}
-		{	South		F32		}
-		{	East		F32		}
-		{	North		F32		}
-	}
+    ParcelDivide Low 211 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ParcelData Single
+        {   West    F32 }
+        {   South   F32 }
+        {   East    F32 }
+        {   North   F32 }
+    }
 }
 
 // ParcelRelease
@@ -4812,178 +4852,178 @@ version 2.0
 // viewer -> sim
 // reliable
 {
-	ParcelRelease Low 212 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		Data			Single
-		{	LocalID			S32		}	// parcel ID
-	}
+    ParcelRelease Low 212 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   LocalID S32 }   // parcel ID
+    }
 }
 
 // ParcelBuy - change the owner of a patch of land.
 // viewer -> sim
 // reliable
 {
-	ParcelBuy Low 213 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		Data			Single
-		{	GroupID			LLUUID	}
-		{	IsGroupOwned	BOOL 	}
-		{	RemoveContribution BOOL	}
-		{	LocalID			S32		}
-		{	Final			BOOL	} // true if buyer is in tier
-	}
-	{
-		ParcelData		Single
-		{	Price			S32		}
-		{	Area			S32		}
-	}
+    ParcelBuy Low 213 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   GroupID             LLUUID  }
+        {   IsGroupOwned        BOOL    }
+        {   RemoveContribution  BOOL    }
+        {   LocalID             S32     }
+        {   Final               BOOL    }   // true if buyer is in tier
+    }
+    {
+        ParcelData Single
+        {   Price   S32 }
+        {   Area    S32 }
+    }
 }
 
 
 // ParcelGodForceOwner Unencoded
 {
-	ParcelGodForceOwner	Low	214 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		Data			Single
-		{	OwnerID			LLUUID	}
-		{	LocalID			S32		}	// parcel ID
-	}
+    ParcelGodForceOwner Low 214 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   OwnerID LLUUID  }
+        {   LocalID S32     }   // parcel ID
+    }
 }
 
 
 // viewer -> sim
 // ParcelAccessListRequest
 {
-	ParcelAccessListRequest Low 215 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		Data	Single
-		{	SequenceID		S32		}
-		{	Flags			U32		}
-		{	LocalID			S32		}
-	}
+    ParcelAccessListRequest Low 215 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   SequenceID  S32 }
+        {   Flags       U32 }
+        {   LocalID     S32 }
+    }
 }
 
 
 // sim -> viewer
 // ParcelAccessListReply
 {
-	ParcelAccessListReply Low 216 Trusted Zerocoded
-	{
-		Data	Single
-		{	AgentID			LLUUID	}
-		{	SequenceID		S32		}
-		{	Flags			U32		}
-		{	LocalID			S32		}
-	}
-	{
-		List	Variable
-		{	ID			LLUUID		}
-		{	Time		S32			} // time_t
-		{	Flags		U32			}
-	}
+    ParcelAccessListReply Low 216 Trusted Zerocoded
+    {
+        Data Single
+        {   AgentID     LLUUID  }
+        {   SequenceID  S32     }
+        {   Flags       U32     }
+        {   LocalID     S32     }
+    }
+    {
+        List Variable
+        {   ID      LLUUID  }
+        {   Time    S32     }   // time_t
+        {   Flags   U32     }
+    }
 }
 
 // viewer -> sim
 // ParcelAccessListUpdate
 {
-	ParcelAccessListUpdate Low 217 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		Data	Single
-		{	Flags			U32		}
-		{	LocalID			S32		}
-		{	TransactionID	LLUUID	}
-		{	SequenceID		S32		}
-		{	Sections		S32		}
-	}
-	{
-		List	Variable
-		{	ID			LLUUID		}
-		{	Time		S32			} // time_t
-		{	Flags		U32			}
-	}
+    ParcelAccessListUpdate Low 217 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   Flags           U32     }
+        {   LocalID         S32     }
+        {   TransactionID   LLUUID  }
+        {   SequenceID      S32     }
+        {   Sections        S32     }
+    }
+    {
+        List Variable
+        {   ID      LLUUID  }
+        {   Time    S32     }   // time_t
+        {   Flags   U32     }
+    }
 }
 
 
 // viewer -> sim -> dataserver
 // reliable
 {
-	ParcelDwellRequest Low 218 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID		}
-		{	SessionID	LLUUID		}
-	}
-	{
-		Data		Single
-		{	LocalID		S32			}
-		{	ParcelID	LLUUID		}	// filled in on sim
-	}
+    ParcelDwellRequest Low 218 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   LocalID     S32     }
+        {   ParcelID    LLUUID  }   // filled in on sim
+    }
 }
 
 
 // dataserver -> sim -> viewer
 // reliable
 {
-	ParcelDwellReply Low 219 Trusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID		}
-	}
-	{
-		Data		Single
-		{	LocalID		S32			}
-		{	ParcelID	LLUUID		}
-		{	Dwell		F32			}
-	}
+    ParcelDwellReply Low 219 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        Data Single
+        {   LocalID     S32     }
+        {   ParcelID    LLUUID  }
+        {   Dwell       F32     }
+    }
 }
 
 // sim -> dataserver
 // This message is used to check if a user can buy a parcel. If
 // successful, the transaction is approved through a money balance reply
-// with the same transaction id. 
-{
-	RequestParcelTransfer	Low	220 Trusted Zerocoded
-	{
-		Data	Single
-		{	TransactionID	LLUUID	}
-		{ 	TransactionTime	U32	} // utc seconds since epoch
-		{	SourceID		LLUUID  }
-		{	DestID			LLUUID	}
-		{	OwnerID			LLUUID	}
-		{	Flags			U8		}	// see lltransactiontypes.h
-		{	TransactionType	S32		}	// see lltransactiontypes.h
-		{	Amount			S32		}
-		{	BillableArea	S32		}
-		{	ActualArea		S32		}
-		{	Final			BOOL	}  // true if buyer should be in tier
-	}
-    {
-       RegionData Single  // included so region name shows up in transaction logs
+// with the same transaction id.
+{
+    RequestParcelTransfer Low 220 Trusted Zerocoded
+    {
+        Data Single
+        {   TransactionID   LLUUID  }
+        {   TransactionTime U32     }   // utc seconds since epoch
+        {   SourceID        LLUUID  }
+        {   DestID          LLUUID  }
+        {   OwnerID         LLUUID  }
+        {   Flags           U8      }   // see lltransactiontypes.h
+        {   TransactionType S32     }   // see lltransactiontypes.h
+        {   Amount          S32     }
+        {   BillableArea    S32     }
+        {   ActualArea      S32     }
+        {   Final           BOOL    }   // true if buyer should be in tier
+    }
+    {
+       RegionData       Single  // included so region name shows up in transaction logs
        {   RegionID   LLUUID }
        {   GridX      U32    }
        {   GridY      U32    }
@@ -4996,114 +5036,114 @@ version 2.0
 // If you add something here, you should probably also change the
 // simulator's database update query on startup.
 {
-	UpdateParcel Low 221 Trusted Zerocoded
-	{
-		ParcelData 		Single
-		{	ParcelID		LLUUID		}
-		{	RegionHandle	U64			}
-		{	OwnerID			LLUUID		}
-		{	GroupOwned		BOOL		}
-		{	Status			U8			}
-		{	Name			Variable 1	}
-		{	Description		Variable 1	}
-		{	MusicURL		Variable 1	}
-		{	RegionX			F32			}
-		{	RegionY			F32			}
-		{	ActualArea		S32			}
-		{	BillableArea	S32			}
-		{	ShowDir			BOOL		}
-		{	IsForSale		BOOL		}
-		{	Category		U8			}
-		{	SnapshotID		LLUUID		}
-		{	UserLocation	LLVector3	}
-		{	SalePrice		S32			}
-		{	AuthorizedBuyerID	LLUUID		}
-		{	AllowPublish	BOOL		}
-		{	MaturePublish	BOOL		}
-	}
+    UpdateParcel Low 221 Trusted Zerocoded
+    {
+        ParcelData Single
+        {   ParcelID            LLUUID      }
+        {   RegionHandle        U64         }
+        {   OwnerID             LLUUID      }
+        {   GroupOwned          BOOL        }
+        {   Status              U8          }
+        {   Name                Variable 1  }
+        {   Description         Variable 1  }
+        {   MusicURL            Variable 1  }
+        {   RegionX             F32         }
+        {   RegionY             F32         }
+        {   ActualArea          S32         }
+        {   BillableArea        S32         }
+        {   ShowDir             BOOL        }
+        {   IsForSale           BOOL        }
+        {   Category            U8          }
+        {   SnapshotID          LLUUID      }
+        {   UserLocation        LLVector3   }
+        {   SalePrice           S32         }
+        {   AuthorizedBuyerID   LLUUID      }
+        {   AllowPublish        BOOL        }
+        {   MaturePublish       BOOL        }
+    }
 }
 
 // sim -> dataserver or space ->sim
 // This message is used to tell the dataserver that a parcel has been
 // removed.
 {
-	RemoveParcel Low 222 Trusted Unencoded
-	{
-		ParcelData 		Variable
-		{	ParcelID	LLUUID	}
-	}
+    RemoveParcel Low 222 Trusted Unencoded
+    {
+        ParcelData Variable
+        {   ParcelID    LLUUID  }
+    }
 }
 
 // sim -> dataserver
 // Merges some of the database information for parcels (dwell).
 {
-	MergeParcel Low 223 Trusted Unencoded
-	{
-		MasterParcelData	Single
-		{	MasterID	LLUUID	}
-	}
-	{
-		SlaveParcelData 	Variable
-		{	SlaveID		LLUUID	}
-	}
+    MergeParcel Low 223 Trusted Unencoded
+    {
+        MasterParcelData Single
+        {   MasterID    LLUUID  }
+    }
+    {
+        SlaveParcelData Variable
+        {   SlaveID LLUUID  }
+    }
 }
 
 // sim -> dataserver
 {
-	LogParcelChanges	Low	224 Trusted	Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-	}
-	{
-		RegionData		Single
-		{	RegionHandle	U64		}
-	}
-	{
-		ParcelData		Variable
-		{	ParcelID		LLUUID	}
-		{	OwnerID			LLUUID	}
-		{	IsOwnerGroup	BOOL	}
-		{	ActualArea		S32		}
-		{	Action			S8		}
-		{	TransactionID	LLUUID	}
-	}
+    LogParcelChanges Low 224 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        RegionData Single
+        {   RegionHandle    U64 }
+    }
+    {
+        ParcelData Variable
+        {   ParcelID        LLUUID  }
+        {   OwnerID         LLUUID  }
+        {   IsOwnerGroup    BOOL    }
+        {   ActualArea      S32     }
+        {   Action          S8      }
+        {   TransactionID   LLUUID  }
+    }
 }
 
 // sim -> dataserver
 {
-	CheckParcelSales	Low	225 Trusted Unencoded
-	{
-		RegionData 		Variable
-		{	RegionHandle	U64	}
-	}
+    CheckParcelSales Low 225 Trusted Unencoded
+    {
+        RegionData Variable
+        {   RegionHandle    U64 }
+    }
 }
 
 // dataserver -> simulator
 // tell a particular simulator to finish parcel sale.
 {
-	ParcelSales	Low	226 Trusted Unencoded
-	{
-		ParcelData 		Variable
-		{	ParcelID		LLUUID	}
-		{	BuyerID			LLUUID	}
-	}
+    ParcelSales Low 226 Trusted Unencoded
+    {
+        ParcelData Variable
+        {   ParcelID    LLUUID  }
+        {   BuyerID     LLUUID  }
+    }
 }
 
 // viewer -> sim
 // mark parcel and double secret agent content on parcel as owned by
 // governor/maint and adjusts permissions approriately. Godlike request.
 {
-	ParcelGodMarkAsContent Low 227 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ParcelData	Single
-		{	LocalID		S32		}
-	}
+    ParcelGodMarkAsContent Low 227 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ParcelData Single
+        {   LocalID S32 }
+    }
 }
 
 
@@ -5112,82 +5152,82 @@ version 2.0
 // validates and fills in the rest of the information to start an auction
 // on a parcel. Processing currently requires that AgentID is a god.
 {
-	ViewerStartAuction	Low 228 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ParcelData	Single
-		{	LocalID		S32		}
-		{	SnapshotID	LLUUID	}
-	}
+    ViewerStartAuction Low 228 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ParcelData Single
+        {   LocalID     S32     }
+        {   SnapshotID  LLUUID  }
+    }
 }
 
 // sim -> dataserver
-// Once all of the data has been gathered, 
+// Once all of the data has been gathered,
 {
-	StartAuction	Low 229 Trusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-	}
-	{
-		ParcelData	Single
-		{	ParcelID	LLUUID	}
-		{	SnapshotID	LLUUID	}
-		{	Name		Variable	1	}	// string
-	}
+    StartAuction Low 229 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+    }
+    {
+        ParcelData Single
+        {   ParcelID    LLUUID      }
+        {   SnapshotID  LLUUID      }
+        {   Name        Variable 1  }   // string
+    }
 }
 
 // dataserver -> sim
 {
-	ConfirmAuctionStart	Low	230 Trusted	Unencoded
-	{
-		AuctionData	Single
-		{	ParcelID	LLUUID	}
-		{	AuctionID	U32		}
-	}
+    ConfirmAuctionStart Low 230 Trusted Unencoded
+    {
+        AuctionData Single
+        {   ParcelID    LLUUID  }
+        {   AuctionID   U32     }
+    }
 }
 
 // sim -> dataserver
 // Tell the dataserver that an auction has completed.
 {
-	CompleteAuction	Low	231 Trusted	Unencoded
-	{
-		ParcelData	Variable
-		{	ParcelID	LLUUID	}
-	}
+    CompleteAuction Low 231 Trusted Unencoded
+    {
+        ParcelData Variable
+        {   ParcelID    LLUUID  }
+    }
 }
 
 // Tell the dataserver that an auction has been canceled.
 {
-	CancelAuction	Low	232 Trusted	Unencoded
-	{
-		ParcelData	Variable
-		{	ParcelID	LLUUID	}
-	}
+    CancelAuction Low 232 Trusted Unencoded
+    {
+        ParcelData Variable
+        {   ParcelID    LLUUID  }
+    }
 }
 
 // sim -> dataserver
 {
-	CheckParcelAuctions	Low	233 Trusted Unencoded
-	{
-		RegionData 		Variable
-		{	RegionHandle	U64	}
-	}
+    CheckParcelAuctions Low 233 Trusted Unencoded
+    {
+        RegionData Variable
+        {   RegionHandle    U64 }
+    }
 }
 
 // dataserver -> sim
 // tell a particular simulator to finish parcel sale.
 {
-	ParcelAuctions	Low	234 Trusted Unencoded
-	{
-		ParcelData 		Variable
-		{	ParcelID		LLUUID	}
-		{	WinnerID		LLUUID	}
-	}
+    ParcelAuctions Low 234 Trusted Unencoded
+    {
+        ParcelData Variable
+        {   ParcelID    LLUUID  }
+        {   WinnerID    LLUUID  }
+    }
 }
 
 // ***************************************************************************
@@ -5197,44 +5237,44 @@ version 2.0
 // UUIDNameRequest
 // Translate a UUID into first and last names
 {
-	UUIDNameRequest Low 235 NotTrusted Unencoded
-	{
-		UUIDNameBlock	Variable
-		{	ID			LLUUID	}
-	}
+    UUIDNameRequest Low 235 NotTrusted Unencoded
+    {
+        UUIDNameBlock Variable
+        {   ID  LLUUID  }
+    }
 }
 
 // UUIDNameReply
 // Translate a UUID into first and last names
 {
-	UUIDNameReply Low 236 Trusted Unencoded
-	{
-		UUIDNameBlock	Variable
-		{	ID			LLUUID	}
-		{	FirstName	Variable	1	}
-		{	LastName	Variable	1	}
-	}
+    UUIDNameReply Low 236 Trusted Unencoded
+    {
+        UUIDNameBlock Variable
+        {   ID          LLUUID      }
+        {   FirstName   Variable 1  }
+        {   LastName    Variable 1  }
+    }
 }
 
 // UUIDGroupNameRequest
 // Translate a UUID into a group name
 {
-	UUIDGroupNameRequest Low 237 NotTrusted Unencoded
-	{
-		UUIDNameBlock	Variable
-		{	ID			LLUUID	}
-	}
+    UUIDGroupNameRequest Low 237 NotTrusted Unencoded
+    {
+        UUIDNameBlock Variable
+        {   ID  LLUUID  }
+    }
 }
 
 // UUIDGroupNameReply
 // Translate a UUID into a group name
 {
-	UUIDGroupNameReply Low 238 Trusted Unencoded
-	{ 
-		UUIDNameBlock	Variable
-		{	ID			LLUUID	}
-		{	GroupName	Variable	1	}
-	}
+    UUIDGroupNameReply Low 238 Trusted Unencoded
+    {
+        UUIDNameBlock Variable
+        {   ID          LLUUID      }
+        {   GroupName   Variable 1  }
+    }
 }
 
 // end uuid to name lookup
@@ -5248,43 +5288,47 @@ version 2.0
 // Chat is region local to receiving simulator.
 // Type is one of CHAT_TYPE_NORMAL, _WHISPER, _SHOUT
 {
-	ChatPass Low 239 Trusted Zerocoded
-	{
-		ChatData			Single
-		{	Channel			S32	}
-		{	Position		LLVector3	}
-		{	ID				LLUUID	}
-		{	OwnerID			LLUUID	}
-		{	Name			Variable	1	}
-		{	SourceType		U8	}
-		{	Type			U8	}
-		{	Radius			F32 }
-		{	SimAccess		U8	}
-		{	Message			Variable	2	}
-	}
+    ChatPass Low 239 Trusted Zerocoded
+    {
+        ChatData Single
+        {   Channel         S32 }
+        {   Position        LLVector3   }
+        {   ID              LLUUID  }
+        {   OwnerID         LLUUID  }
+        {   Name            Variable    1   }
+        {   SourceType      U8  }
+        {   Type            U8  }
+        {   Radius          F32 }
+        {   SimAccess       U8  }
+        {   Message         Variable    2   }
+    }
 }
 
 // Edge data - compressed edge data
 
 {
-	EdgeDataPacket High 24 Trusted Zerocoded
-	{
-		EdgeData			Single
-		{	LayerType		U8	}
-		{	Direction		U8	}
-		{	LayerData		Variable	2	}
-	}
+    EdgeDataPacket High 24 Trusted Zerocoded
+    {
+        EdgeData Single
+        {   LayerType   U8          }
+        {   Direction   U8          }
+        {   LayerData   Variable 2  }
+    }
 }
 
 // Sim status, condition of this sim
 // sent reliably, when dirty
 {
-	SimStatus Medium 12 Trusted Unencoded
-	{
-		SimStatus				Single
-		{	CanAcceptAgents		BOOL	}
-		{	CanAcceptTasks		BOOL	}
-	}
+    SimStatus Medium 12 Trusted Unencoded
+    {
+        SimStatus Single
+        {   CanAcceptAgents BOOL    }
+        {   CanAcceptTasks  BOOL    }
+    }
+    {
+        SimFlags Single
+        {   Flags   U64 }
+    }
 }
 
 // Child Agent Update - agents send child agents to neighboring simulators.
@@ -5292,136 +5336,140 @@ version 2.0
 // Can't send viewer IP and port between simulators -- the port may get remapped
 // if the viewer is behind a Network Address Translation (NAT) box.
 //
-// Note: some of the fields of this message really only need to be sent when an 
+// Note: some of the fields of this message really only need to be sent when an
 // agent crosses a region boundary and changes from a child to a main agent
 // (such as Head/BodyRotation, ControlFlags, Animations etc)
 // simulator -> simulator
 // reliable
 {
-	ChildAgentUpdate High 25 Trusted Zerocoded
-	{
-		AgentData				Single
-		
-		{	RegionHandle		U64	}
-		{	ViewerCircuitCode	U32	}
-		{	AgentID							LLUUID	}
-		{	SessionID						LLUUID	}
-		
-		{	AgentPos			LLVector3	}
-		{	AgentVel			LLVector3	}
-		{	Center				LLVector3	}
-		{ 	Size 				LLVector3 	}
-		{	AtAxis				LLVector3	}
-		{	LeftAxis			LLVector3	}
-		{	UpAxis				LLVector3	}
-		{	ChangedGrid			BOOL	}	// BOOL
-		 
-		{	Far					F32	}
-		{	Aspect				F32	}
-		{	Throttles			Variable 1	}
- 		{	LocomotionState		U32	}
-		{	HeadRotation		LLQuaternion	}
-		{	BodyRotation		LLQuaternion	}
-		{	ControlFlags		U32	}
-		{	EnergyLevel			F32	}
-		{	GodLevel			U8	}	// Changed from BOOL to U8, and renamed GodLevel (from Godlike)
-		{   AlwaysRun			BOOL	}
-		{	PreyAgent						LLUUID	}
-		{	AgentAccess		U8	}
-		{	AgentTextures		Variable	2	}
-		{	ActiveGroupID	        LLUUID	}	
-	}
-	{
-		GroupData			Variable
-		{	GroupID				LLUUID	}
-		{	GroupPowers			U64		}
-		{	AcceptNotices		BOOL	}
-	}
-	{	
-		AnimationData			Variable
-		{	Animation			LLUUID	}
-		{	ObjectID			LLUUID	}
-	}
-	{
-		GranterBlock			Variable
-		{	GranterID						LLUUID	}
-	}
-	{
-		NVPairData				Variable
-		{	NVPairs				Variable	2	}
-	}
-	{
-		VisualParam				Variable
-		{	ParamValue			U8	}
-	}
-	{
-		AgentAccess				Variable
-		{	AgentLegacyAccess		U8	}
-		{	AgentMaxAccess			U8	}
-	}
-	{
-		AgentInfo				Variable
-		{	Flags					U32	}
-	}
+    ChildAgentUpdate High 25 Trusted Zerocoded
+    {
+        AgentData Single
+
+        {   RegionHandle        U64             }
+        {   ViewerCircuitCode   U32             }
+        {   AgentID             LLUUID          }
+        {   SessionID           LLUUID          }
+
+        {   AgentPos            LLVector3       }
+        {   AgentVel            LLVector3       }
+        {   Center              LLVector3       }
+        {   Size                LLVector3       }
+        {   AtAxis              LLVector3       }
+        {   LeftAxis            LLVector3       }
+        {   UpAxis              LLVector3       }
+        {   ChangedGrid         BOOL            }
+
+        {   Far                 F32             }
+        {   Aspect              F32             }
+        {   Throttles           Variable 1      }
+        {   LocomotionState     U32             }
+        {   HeadRotation        LLQuaternion    }
+        {   BodyRotation        LLQuaternion    }
+        {   ControlFlags        U32             }
+        {   EnergyLevel         F32             }
+        {   GodLevel            U8              }   // Changed from BOOL to U8, and renamed GodLevel (from Godlike)
+        {   AlwaysRun           BOOL            }
+        {   PreyAgent           LLUUID          }
+        {   AgentAccess         U8              }
+        {   AgentTextures       Variable 2      }
+        {   ActiveGroupID       LLUUID          }
+    }
+    {
+        GroupData Variable
+        {   GroupID         LLUUID  }
+        {   GroupPowers     U64     }
+        {   AcceptNotices   BOOL    }
+    }
+    {
+        AnimationData Variable
+        {   Animation   LLUUID  }
+        {   ObjectID    LLUUID  }
+    }
+    {
+        GranterBlock Variable
+        {   GranterID   LLUUID  }
+    }
+    {
+        NVPairData Variable
+        {   NVPairs Variable 2  }
+    }
+    {
+        VisualParam Variable
+        {   ParamValue  U8  }
+    }
+    {
+        AgentAccess Variable
+        {   AgentLegacyAccess   U8  }
+        {   AgentMaxAccess      U8  }
+    }
+    {
+        AgentInfo Variable
+        {   Flags   U32 }
+    }
+    {
+        AgentInventoryHost Variable
+        {   InventoryHost   Variable 1  }   //String
+    }
 }
 
 // ChildAgentAlive
 // sent to child agents just to keep them alive
 {
-	ChildAgentAlive High 26 Trusted Unencoded
-	{
-		AgentData				Single
-		{	RegionHandle		U64	}
-		{	ViewerCircuitCode	U32	}
-		{	AgentID				LLUUID	}
-		{	SessionID			LLUUID	}
-	}
+    ChildAgentAlive High 26 Trusted Unencoded
+    {
+        AgentData Single
+        {   RegionHandle        U64 }
+        {   ViewerCircuitCode   U32 }
+        {   AgentID             LLUUID  }
+        {   SessionID           LLUUID  }
+    }
 }
 
 // ChildAgentPositionUpdate
 // sent to child agents just to keep them alive
 {
-	ChildAgentPositionUpdate High 27 Trusted Unencoded
-	{
-		AgentData				Single
-
-		{	RegionHandle		U64	}
-		{	ViewerCircuitCode	U32	}
-		{	AgentID				LLUUID	}
-		{	SessionID			LLUUID	}
-
-		{	AgentPos			LLVector3	}
-		{	AgentVel			LLVector3	}
-		{	Center				LLVector3	}
-		{ 	Size 				LLVector3 	}
-		{	AtAxis				LLVector3	}
-		{	LeftAxis			LLVector3	}
-		{	UpAxis				LLVector3	}
-		{	ChangedGrid			BOOL	}
-	}
+    ChildAgentPositionUpdate High 27 Trusted Unencoded
+    {
+        AgentData Single
+
+        {   RegionHandle        U64         }
+        {   ViewerCircuitCode   U32         }
+        {   AgentID             LLUUID      }
+        {   SessionID           LLUUID      }
+
+        {   AgentPos            LLVector3   }
+        {   AgentVel            LLVector3   }
+        {   Center              LLVector3   }
+        {   Size                LLVector3   }
+        {   AtAxis              LLVector3   }
+        {   LeftAxis            LLVector3   }
+        {   UpAxis              LLVector3   }
+        {   ChangedGrid         BOOL        }
+    }
 }
 
 
 // Obituary for child agents - make sure the parent know the child is dead
 // This way, children can be reliably restarted
 {
-	ChildAgentDying Low 240 Trusted Zerocoded
-	{
-		AgentData				Single
-		{	AgentID				LLUUID	}
-		{	SessionID			LLUUID	}
-	}
+    ChildAgentDying Low 240 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
 }
 
 
 // This is sent if a full child agent hasn't been accepted yet
 {
-	ChildAgentUnknown Low 241 Trusted Unencoded
-	{
-		AgentData				Single
-		{	AgentID				LLUUID	}
-		{	SessionID			LLUUID	}
-	}
+    ChildAgentUnknown Low 241 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
 }
 
 
@@ -5429,117 +5477,117 @@ version 2.0
 {
     AtomicPassObject High 28 Trusted Unencoded
     {
-		TaskData		Single
-		{	TaskID				LLUUID	}
-		{	AttachmentNeedsSave	BOOL	}	// true iff is attachment and needs asset saved
-	}
+        TaskData Single
+        {   TaskID              LLUUID  }
+        {   AttachmentNeedsSave BOOL    }   // true iff is attachment and needs asset saved
+    }
 }
 
 
 // KillChildAgents - A new agent has connected to the simulator . . . make sure that any old child cameras are blitzed
 {
-	KillChildAgents Low 242 Trusted Unencoded
-	{
-		IDBlock				Single
-		{	AgentID				LLUUID	}
-	}
+    KillChildAgents Low 242 Trusted Unencoded
+    {
+        IDBlock Single
+        {   AgentID LLUUID  }
+    }
 }
 
 
 // GetScriptRunning - asks if a script is running or not. the simulator
 // responds with ScriptRunningReply
 {
-	GetScriptRunning	Low	243 		NotTrusted Unencoded
-	{
-		Script			Single
-		{	ObjectID	LLUUID	}
-		{	ItemID	LLUUID	}
-	}
+    GetScriptRunning Low 243 NotTrusted Unencoded
+    {
+        Script Single
+        {   ObjectID    LLUUID  }
+        {   ItemID      LLUUID  }
+    }
 }
 
 // ScriptRunningReply - response from simulator to message above
 {
-	ScriptRunningReply		Low	244 		NotTrusted Unencoded UDPDeprecated
-	{
-		Script				Single
-		{	ObjectID		LLUUID	}
-		{	ItemID			LLUUID	}
-		{	Running			BOOL	}
-//		{	Mono			BOOL	} Added to LLSD message
-	}
+    ScriptRunningReply Low 244 NotTrusted Unencoded UDPDeprecated
+    {
+        Script Single
+        {   ObjectID    LLUUID  }
+        {   ItemID      LLUUID  }
+        {   Running     BOOL    }
+//        {   Mono        BOOL    } Added to LLSD message
+    }
 }
 
 
 // SetScriptRunning - makes a script active or inactive (Enable may be
 // true or false)
 {
-	SetScriptRunning	Low	245  	NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		Script			Single
-		{	ObjectID	LLUUID	}
-		{	ItemID		LLUUID	}
-		{	Running		BOOL	}
-	}
+    SetScriptRunning Low 245 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Script Single
+        {   ObjectID    LLUUID  }
+        {   ItemID      LLUUID  }
+        {   Running     BOOL    }
+    }
 }
 
 // ScriptReset - causes a script to reset
 {
-	ScriptReset Low 246 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		Script				Single
-		{	ObjectID		LLUUID	}
-		{	ItemID			LLUUID	}
-	}
+    ScriptReset Low 246 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Script Single
+        {   ObjectID    LLUUID  }
+        {   ItemID      LLUUID  }
+    }
 }
 
 // ScriptSensorRequest - causes the receiving sim to run a script sensor and return the results
 {
-	ScriptSensorRequest Low 247 Trusted Zerocoded
-	{
-		Requester			Single
-		{	SourceID		LLUUID	}
-		{	RequestID		LLUUID	}
-		{	SearchID		LLUUID	}
-		{	SearchPos		LLVector3	}
-		{	SearchDir		LLQuaternion	}
-		{	SearchName		Variable	1	}
-		{	Type			S32	}
-		{	Range			F32	}
-		{	Arc				F32	}
-		{	RegionHandle	U64	}
-		{	SearchRegions	U8	}
-	}
+    ScriptSensorRequest Low 247 Trusted Zerocoded
+    {
+        Requester Single
+        {   SourceID        LLUUID          }
+        {   RequestID       LLUUID          }
+        {   SearchID        LLUUID          }
+        {   SearchPos       LLVector3       }
+        {   SearchDir       LLQuaternion    }
+        {   SearchName      Variable 1      }
+        {   Type            S32             }
+        {   Range           F32             }
+        {   Arc             F32             }
+        {   RegionHandle    U64             }
+        {   SearchRegions   U8              }
+    }
 }
 
 // ScriptSensorReply - returns the request script search information back to the requester
 {
-	ScriptSensorReply Low 248 Trusted Zerocoded
-	{
-		Requester			Single
-		{	SourceID		LLUUID	}
-	}
-	{
-		SensedData			Variable
-		{	ObjectID		LLUUID	}
-		{	OwnerID			LLUUID	}
-		{	GroupID			LLUUID	}
-		{	Position		LLVector3	}
-		{	Velocity		LLVector3	}
-		{	Rotation		LLQuaternion	}
-		{	Name			Variable	1	}
-		{	Type			S32	}
-		{	Range			F32	}
-	}
+    ScriptSensorReply Low 248 Trusted Zerocoded
+    {
+        Requester Single
+        {   SourceID    LLUUID  }
+    }
+    {
+        SensedData Variable
+        {   ObjectID    LLUUID          }
+        {   OwnerID     LLUUID          }
+        {   GroupID     LLUUID          }
+        {   Position    LLVector3       }
+        {   Velocity    LLVector3       }
+        {   Rotation    LLQuaternion    }
+        {   Name        Variable 1      }
+        {   Type        S32             }
+        {   Range       F32             }
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -5550,34 +5598,34 @@ version 2.0
 // agent is coming into the region. The region should be expecting the
 // agent.
 {
-	CompleteAgentMovement Low 249 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-		{	CircuitCode		U32	}
-	}
+    CompleteAgentMovement Low 249 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   CircuitCode U32     }
+    }
 }
 
 // sim -> viewer
 {
-	AgentMovementComplete Low 250 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		Data			Single
-		{	Position		LLVector3 }
-		{	LookAt			LLVector3 }
-		{	RegionHandle	U64		}
-		{	Timestamp		U32	}
-	}
-	{
-		SimData			Single
-		{	ChannelVersion	Variable 2      }
-	}
+    AgentMovementComplete Low 250 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   Position        LLVector3   }
+        {   LookAt          LLVector3   }
+        {   RegionHandle    U64         }
+        {   Timestamp       U32         }
+    }
+    {
+        SimData Single
+        {   ChannelVersion  Variable 2  }
+    }
 }
 
 
@@ -5587,26 +5635,26 @@ version 2.0
 
 // userserver -> dataserver
 {
-	DataServerLogout Low 251 Trusted Unencoded
-	{
-		UserData			Single
-		{	AgentID			LLUUID	}
-		{	ViewerIP		IPADDR	}
-		{	Disconnect		BOOL	}
-		{	SessionID		LLUUID	}
-	}
+    DataServerLogout Low 251 Trusted Unencoded
+    {
+        UserData Single
+        {   AgentID     LLUUID  }
+        {   ViewerIP    IPADDR  }
+        {   Disconnect  BOOL    }
+        {   SessionID   LLUUID  }
+    }
 }
 
 // LogoutRequest
 // viewer -> sim
 // reliable
 {
-	LogoutRequest Low 252 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
+    LogoutRequest Low 252 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
 }
 
 
@@ -5616,16 +5664,16 @@ version 2.0
 // reliable
 // Includes inventory items to update with new asset ids
 {
-	LogoutReply Low 253 Trusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		InventoryData		Variable
-		{	ItemID			LLUUID	}  // null if list is actually empty (but has one entry 'cause it can't have none)
-	}
+    LogoutReply Low 253 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        InventoryData Variable
+        {   ItemID  LLUUID  }   // null if list is actually empty (but has one entry 'cause it can't have none)
+    }
 }
 
 
@@ -5638,61 +5686,70 @@ version 2.0
 // ParentEstateID: parent estate id of the source estate
 // RegionID: region id of the source of the IM.
 // Position: position of the sender in region local coordinates
-// Dialog	see llinstantmessage.h for values
-// ID		May be used by dialog. Interpretation depends on context.
+// Dialog   see llinstantmessage.h for values
+// ID       May be used by dialog. Interpretation depends on context.
 // BinaryBucket May be used by some dialog types
 // reliable
 {
-	ImprovedInstantMessage Low 254 NotTrusted Zerocoded
-	{
-		AgentData 		Single
-		{   AgentID     LLUUID  }
-		{	SessionID	LLUUID	}
-	}
-	{
-		MessageBlock		Single
-		{	FromGroup		BOOL	}
-		{	ToAgentID		LLUUID	}
-		{	ParentEstateID	U32	}
-		{   RegionID		LLUUID	}
-		{	Position		LLVector3	}
-		{	Offline			U8	}
-		{	Dialog			U8	}	// U8 - IM type
-		{	ID				LLUUID	}
-		{	Timestamp		U32	}
-		{	FromAgentName	Variable	1	}
-		{	Message			Variable	2	}
-		{	BinaryBucket	Variable	2	}
-	}
+    ImprovedInstantMessage Low 254 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        MessageBlock Single
+        {   FromGroup       BOOL        }
+        {   ToAgentID       LLUUID      }
+        {   ParentEstateID  U32         }
+        {   RegionID        LLUUID      }
+        {   Position        LLVector3   }
+        {   Offline         U8          }
+        {   Dialog          U8          }   // U8 - IM type
+        {   ID              LLUUID      }
+        {   Timestamp       U32         }
+        {   FromAgentName   Variable 1  }
+        {   Message         Variable 2  }
+        {   BinaryBucket    Variable 2  }
+    }
+    {
+        EstateBlock Single
+        {   EstateID    U32 }
+    }
+    {
+        MetaData Variable
+        {   Data    Variable    2   }
+    }
 }
 
 // RetrieveInstantMessages - used to get instant messages that
 // were persisted out to the database while the user was offline
+// Sent from viewer->simulator.   Also see RetrieveIMsExtended (back-end only)
 {
-	RetrieveInstantMessages Low 255 NotTrusted Unencoded
-	{
-		AgentData 		Single
-		{   AgentID     LLUUID  }
-		{	SessionID	LLUUID	}
-	}
+    RetrieveInstantMessages Low 255 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
 }
 
 // FindAgent - used to find an agent's global position. I used a
 // variable sized LocationBlock so that the message can be recycled with
 // minimum new messages and handlers.
 {
-	FindAgent Low 256 NotTrusted Unencoded
-	{
-		AgentBlock		Single
-		{	Hunter		LLUUID	}
-		{	Prey		LLUUID	}
-		{	SpaceIP		IPADDR	}
-	}
-	{
-		LocationBlock	Variable
-		{	GlobalX		F64	}
-		{	GlobalY		F64	}
-	}
+    FindAgent Low 256 NotTrusted Unencoded
+    {
+        AgentBlock Single
+        {   Hunter  LLUUID  }
+        {   Prey    LLUUID  }
+        {   SpaceIP IPADDR  }
+    }
+    {
+        LocationBlock Variable
+        {   GlobalX F64 }
+        {   GlobalY F64 }
+    }
 }
 
 // Set godlike to 1 if you want to become godlike.
@@ -5700,17 +5757,17 @@ version 2.0
 // viewer -> simulator -> dataserver
 // reliable
 {
-	RequestGodlikePowers Low 257 NotTrusted Unencoded
-	{
-		AgentData 		Single
-		{   AgentID     LLUUID  }
-		{	SessionID	LLUUID	}
-	}
-	{
-		RequestBlock	Single
-		{	Godlike		BOOL	}
-		{	Token		LLUUID	} // viewer packs a null, sim packs token
-	}
+    RequestGodlikePowers Low 257 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        RequestBlock Single
+        {   Godlike BOOL    }
+        {   Token   LLUUID  }   // viewer packs a null, sim packs token
+    }
 }
 
 // At the simulator, turn the godlike bit on.
@@ -5718,81 +5775,81 @@ version 2.0
 // dataserver -> simulator -> viewer
 // reliable
 {
-	GrantGodlikePowers	Low	258 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		GrantData		Single
-		{	GodLevel	U8		}
-		{	Token		LLUUID	} // checked on sim, ignored on viewer
-	}
+    GrantGodlikePowers Low 258 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        GrantData Single
+        {   GodLevel    U8      }
+        {   Token       LLUUID  }   // checked on sim, ignored on viewer
+    }
 }
 
 // GodlikeMessage - generalized construct for Gods to send messages
 // around the system. Each Request has it's own internal protocol.
 {
     GodlikeMessage Low 259 NotTrusted Zerocoded
-	{
-		AgentData 		Single
-		{   AgentID     LLUUID  }
-		{	SessionID	LLUUID		}
-		{	TransactionID	LLUUID	}
-	}
-	{
-		MethodData 	Single
-		{	Method		Variable 1 }
-		{	Invoice		LLUUID	}
-	}
-	{
-		ParamList		Variable
-		{	Parameter	Variable 1 }
-	}
+    {
+        AgentData Single
+        {   AgentID         LLUUID  }
+        {   SessionID       LLUUID  }
+        {   TransactionID   LLUUID  }
+    }
+    {
+        MethodData Single
+        {   Method  Variable 1  }
+        {   Invoice LLUUID      }
+    }
+    {
+        ParamList Variable
+        {   Parameter   Variable 1  }
+    }
 }
 
 // EstateOwnerMessage
 // format must be identical to above
 {
-    EstateOwnerMessage	Low 260 NotTrusted Zerocoded
-	{
-		AgentData 		Single
-		{   AgentID     LLUUID  	}
-		{	SessionID	LLUUID		}
-		{	TransactionID	LLUUID	}
-	}
-	{
-		MethodData 	Single
-		{	Method		Variable 1 }
-		{	Invoice		LLUUID	}
-	}
-	{
-		ParamList		Variable
-		{	Parameter	Variable 1 }
-	}
+    EstateOwnerMessage Low 260 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID         LLUUID  }
+        {   SessionID       LLUUID  }
+        {   TransactionID   LLUUID  }
+    }
+    {
+        MethodData Single
+        {   Method  Variable 1  }
+        {   Invoice LLUUID      }
+    }
+    {
+        ParamList Variable
+        {   Parameter   Variable 1  }
+    }
 }
 
 // GenericMessage
 // format must be identical to above
 // As above, but don't have to be god or estate owner to send.
 {
-    GenericMessage	Low 261 NotTrusted Zerocoded
-	{
-		AgentData 		Single
-		{   AgentID     LLUUID  	}
-		{	SessionID	LLUUID		}
-		{	TransactionID	LLUUID	}
-	}
-	{
-		MethodData 	Single
-		{	Method		Variable 1 }
-		{	Invoice		LLUUID	}
-	}
-	{
-		ParamList		Variable
-		{	Parameter	Variable 1 }
-	}
+    GenericMessage Low 261 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID         LLUUID  }
+        {   SessionID       LLUUID  }
+        {   TransactionID   LLUUID  }
+    }
+    {
+        MethodData Single
+        {   Method  Variable 1  }
+        {   Invoice LLUUID      }
+    }
+    {
+        ParamList Variable
+        {   Parameter   Variable 1  }
+    }
 }
 
 // GenericStreamingMessage
@@ -5810,29 +5867,29 @@ version 2.0
 
     {
         DataBlock Single
-        { Data Variable 2 }
+        { Data  Variable 2  }
     }
 }
 
 // LargeGenericMessage
-// Similar to the above messages, but can handle larger payloads and serialized 
-// LLSD.  Uses HTTP transport 
+// Similar to the above messages, but can handle larger payloads and serialized
+// LLSD.  Uses HTTP transport
 {
     LargeGenericMessage Low 430 NotTrusted Unencoded UDPDeprecated
     {
-		AgentData 		Single
-		{   AgentID     LLUUID  	}
-		{	SessionID	LLUUID		}
-		{	TransactionID	LLUUID	}
+        AgentData Single
+        {   AgentID         LLUUID  }
+        {   SessionID       LLUUID  }
+        {   TransactionID   LLUUID  }
     }
     {
         MethodData Single
-		{	Method		Variable 1 }
-		{	Invoice		LLUUID	}
+        {   Method  Variable 1  }
+        {   Invoice LLUUID      }
     }
     {
-		ParamList		Variable
-		{	Parameter	Variable 2 }
+        ParamList Variable
+        {   Parameter   Variable 2  }
     }
 }
 
@@ -5842,72 +5899,72 @@ version 2.0
 
 // request for mute list
 {
-	MuteListRequest Low 262 NotTrusted Unencoded
-	{
-		AgentData 		Single
-		{   AgentID     LLUUID  	}
-		{	SessionID	LLUUID		}
-	}
-	{
-		MuteData	Single
-		{	MuteCRC		U32		}
-	}
+    MuteListRequest Low 262 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        MuteData Single
+        {   MuteCRC U32 }
+    }
 }
 
 // update/add someone in the mute list
 {
-	UpdateMuteListEntry Low 263 NotTrusted Unencoded
-	{
-		AgentData 		Single
-		{   AgentID     LLUUID  	}
-		{	SessionID	LLUUID		}
-	}
-	{
-		MuteData	Single
-		{	MuteID		LLUUID		}
-		{	MuteName	Variable 1	}
-		{	MuteType	S32			}
-		{	MuteFlags	U32			}
-	}
+    UpdateMuteListEntry Low 263 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        MuteData Single
+        {   MuteID      LLUUID      }
+        {   MuteName    Variable 1  }
+        {   MuteType    S32         }
+        {   MuteFlags   U32         }
+    }
 }
 
 // Remove a mute list entry.
 {
-	RemoveMuteListEntry Low 264 NotTrusted Unencoded
-	{
-		AgentData 		Single
-		{   AgentID     LLUUID  	}
-		{	SessionID	LLUUID		}
-	}
-	{
-		MuteData	Single
-		{	MuteID		LLUUID		}
-		{	MuteName	Variable 1	}
-	}
+    RemoveMuteListEntry Low 264 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        MuteData Single
+        {   MuteID      LLUUID      }
+        {   MuteName    Variable 1  }
+    }
 }
 
 
-// 
-// Inventory update messages 
+//
+// Inventory update messages
 // UDP DEPRECATED - Now a viewer capability.
 
 {
-	CopyInventoryFromNotecard Low 265 NotTrusted Zerocoded UDPDeprecated
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		NotecardData		Single
-		{	NotecardItemID	LLUUID	}
-		{	ObjectID		LLUUID	}
-	}
-	{
-		InventoryData		Variable
-		{	ItemID			LLUUID	}
-		{	FolderID		LLUUID	}
-	}
+    CopyInventoryFromNotecard Low 265 NotTrusted Zerocoded UDPDeprecated
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        NotecardData Single
+        {   NotecardItemID  LLUUID  }
+        {   ObjectID        LLUUID  }
+    }
+    {
+        InventoryData Variable
+        {   ItemID      LLUUID  }
+        {   FolderID    LLUUID  }
+    }
 }
 
 //
@@ -5915,40 +5972,40 @@ version 2.0
 // THIS MESSAGE CAN NOT CREATE NEW INVENTORY ITEMS.
 //
 {
-	UpdateInventoryItem Low 266 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-		{	TransactionID	LLUUID	}
-	}
-	{
-		InventoryData		Variable
-		{	ItemID			LLUUID	}
-		{	FolderID		LLUUID	}
-		{	CallbackID		U32		} // Async Response
-		
-		{	CreatorID		LLUUID	}	// permissions
-		{	OwnerID			LLUUID	}	// permissions
-		{	GroupID			LLUUID	}	// permissions
-		{	BaseMask		U32	}	// permissions
-		{	OwnerMask		U32	}	// permissions
-		{	GroupMask		U32	}	// permissions
-		{	EveryoneMask	U32	}	// permissions
-		{	NextOwnerMask	U32	}	// permissions
-		{	GroupOwned		BOOL	}	// permissions
-
-		{	TransactionID	LLUUID	} // TransactionID: new assets only
-		{	Type			S8	}
-		{	InvType			S8	}
-		{	Flags			U32	}
-		{	SaleType		U8	}
-		{	SalePrice		S32	}
-		{	Name			Variable	1	}
-		{	Description		Variable	1	}
-		{	CreationDate	S32	}
-		{	CRC				U32	}
-	}
+    UpdateInventoryItem Low 266 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID         LLUUID  }
+        {   SessionID       LLUUID  }
+        {   TransactionID   LLUUID  }
+    }
+    {
+        InventoryData Variable
+        {   ItemID          LLUUID  }
+        {   FolderID        LLUUID  }
+        {   CallbackID      U32     }   // Async Response
+
+        {   CreatorID       LLUUID  }   // permissions
+        {   OwnerID         LLUUID  }   // permissions
+        {   GroupID         LLUUID  }   // permissions
+        {   BaseMask        U32     }   // permissions
+        {   OwnerMask       U32     }   // permissions
+        {   GroupMask       U32     }   // permissions
+        {   EveryoneMask    U32     }   // permissions
+        {   NextOwnerMask   U32     }   // permissions
+        {   GroupOwned      BOOL    }   // permissions
+
+        {   TransactionID   LLUUID  }   // TransactionID: new assets only
+        {   Type            S8      }
+        {   InvType         S8      }
+        {   Flags           U32     }
+        {   SaleType        U8      }
+        {   SalePrice       S32     }
+        {   Name        Variable 1  }
+        {   Description Variable 1  }
+        {   CreationDate    S32     }
+        {   CRC             U32     }
+    }
 }
 
 //
@@ -5956,106 +6013,106 @@ version 2.0
 // DO NOT ALLOW THIS FROM THE VIEWER.
 //
 {
-	UpdateCreateInventoryItem Low 267 Trusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SimApproved		BOOL	}
-		{	TransactionID	LLUUID	}
-	}
-	{
-		InventoryData		Variable
-		{	ItemID			LLUUID	}
-		{	FolderID		LLUUID	}
-		{	CallbackID		U32		} // Async Response
-
-		{	CreatorID		LLUUID	}	// permissions
-		{	OwnerID			LLUUID	}	// permissions
-		{	GroupID			LLUUID	}	// permissions
-		{	BaseMask		U32	}	// permissions
-		{	OwnerMask		U32	}	// permissions
-		{	GroupMask		U32	}	// permissions
-		{	EveryoneMask	U32	}	// permissions
-		{	NextOwnerMask	U32	}	// permissions
-		{	GroupOwned		BOOL	}	// permissions
-
-		{	AssetID			LLUUID	}
-		{	Type			S8	}
-		{	InvType			S8	}
-		{	Flags			U32	}
-		{	SaleType		U8	}
-		{	SalePrice		S32	}
-		{	Name			Variable	1	}
-		{	Description		Variable	1	}
-		{	CreationDate	S32	}
-		{	CRC				U32	}
-	}
-}
-
-{
-	MoveInventoryItem	Low	268 NotTrusted	Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	Stamp		BOOL	} // should the server re-timestamp?
-	}
-	{
-		InventoryData	Variable
-		{	ItemID		LLUUID	}
-		{	FolderID	LLUUID	}
-		{	NewName			Variable	1	}
-	}
-}
-
-// copy inventory item by item id to specified destination folder, 
+    UpdateCreateInventoryItem Low 267 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID         LLUUID  }
+        {   SimApproved     BOOL    }
+        {   TransactionID   LLUUID  }
+    }
+    {
+        InventoryData Variable
+        {   ItemID          LLUUID      }
+        {   FolderID        LLUUID      }
+        {   CallbackID      U32         }   // Async Response
+
+        {   CreatorID       LLUUID      }   // permissions
+        {   OwnerID         LLUUID      }   // permissions
+        {   GroupID         LLUUID      }   // permissions
+        {   BaseMask        U32         }   // permissions
+        {   OwnerMask       U32         }   // permissions
+        {   GroupMask       U32         }   // permissions
+        {   EveryoneMask    U32         }   // permissions
+        {   NextOwnerMask   U32         }   // permissions
+        {   GroupOwned      BOOL        }   // permissions
+
+        {   AssetID         LLUUID      }
+        {   Type            S8          }
+        {   InvType         S8          }
+        {   Flags           U32         }
+        {   SaleType        U8          }
+        {   SalePrice       S32         }
+        {   Name            Variable 1  }
+        {   Description     Variable 1  }
+        {   CreationDate    S32         }
+        {   CRC             U32         }
+    }
+}
+
+{
+    MoveInventoryItem Low 268 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   Stamp       BOOL    }   // should the server re-timestamp?
+    }
+    {
+        InventoryData Variable
+        {   ItemID      LLUUID      }
+        {   FolderID    LLUUID      }
+        {   NewName     Variable 1  }
+    }
+}
+
+// copy inventory item by item id to specified destination folder,
 // send out bulk inventory update when done.
 //
 // Inventory items are only unique for {agent, inv_id} pairs;
 // the OldItemID needs to be paired with the OldAgentID to
 // produce a unique inventory item.
 {
-	CopyInventoryItem	Low	269 NotTrusted	Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		InventoryData		Variable
-		{	CallbackID	U32			} // Async response
-		{	OldAgentID		LLUUID	}
-		{	OldItemID		LLUUID	}
-		{	NewFolderID		LLUUID	}
-		{	NewName			Variable	1	}
-	}
-}
-
-{
-	RemoveInventoryItem Low 270 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		InventoryData	Variable
-		{	ItemID		LLUUID	}
-	}
-}
-
-{
-	ChangeInventoryItemFlags Low 271 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		InventoryData	Variable
-		{	ItemID		LLUUID	}
-		{	Flags		U32	}
-	}
+    CopyInventoryItem Low 269 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        InventoryData Variable
+        {   CallbackID  U32         }   // Async response
+        {   OldAgentID  LLUUID      }
+        {   OldItemID   LLUUID      }
+        {   NewFolderID LLUUID      }
+        {   NewName     Variable 1  }
+    }
+}
+
+{
+    RemoveInventoryItem Low 270 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        InventoryData Variable
+        {   ItemID  LLUUID  }
+    }
+}
+
+{
+    ChangeInventoryItemFlags Low 271 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        InventoryData Variable
+        {   ItemID  LLUUID  }
+        {   Flags   U32     }
+    }
 }
 
 //
@@ -6064,235 +6121,235 @@ version 2.0
 // This message is currently only uses objects, so the viewer ignores
 // the asset id.
 {
-	SaveAssetIntoInventory Low 272 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-	}
-	{
-		InventoryData		Single
-		{	ItemID			LLUUID	}
-		{	NewAssetID		LLUUID	}
-	}
-}
-
-{
-	CreateInventoryFolder	Low 273 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		FolderData			Single
-		{	FolderID		LLUUID	}
-		{	ParentID		LLUUID	}
-		{	Type			S8	}
-		{	Name			Variable	1	}
-	}
-}
-
-{
-	UpdateInventoryFolder Low 274 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		FolderData			Variable
-		{	FolderID		LLUUID	}
-		{	ParentID		LLUUID	}
-		{	Type			S8	}
-		{	Name			Variable	1	}
-	}
-}
-
-{
-	MoveInventoryFolder	Low	275 NotTrusted	Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	Stamp		BOOL	} // should the server re-timestamp children
-	}
-	{
-		InventoryData	Variable
-		{	FolderID	LLUUID	}
-		{	ParentID	LLUUID	}
-	}
-}
-
-{
-	RemoveInventoryFolder Low 276 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		FolderData			Variable
-		{	FolderID		LLUUID	}
-	}
+    SaveAssetIntoInventory Low 272 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        InventoryData Single
+        {   ItemID      LLUUID  }
+        {   NewAssetID  LLUUID  }
+    }
+}
+
+{
+    CreateInventoryFolder Low 273 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        FolderData Single
+        {   FolderID    LLUUID      }
+        {   ParentID    LLUUID      }
+        {   Type        S8          }
+        {   Name        Variable 1  }
+    }
+}
+
+{
+    UpdateInventoryFolder Low 274 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        FolderData Variable
+        {   FolderID    LLUUID      }
+        {   ParentID    LLUUID      }
+        {   Type        S8          }
+        {   Name        Variable 1  }
+    }
+}
+
+{
+    MoveInventoryFolder Low 275 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   Stamp       BOOL    }   // should the server re-timestamp children
+    }
+    {
+        InventoryData Variable
+        {   FolderID    LLUUID  }
+        {   ParentID    LLUUID  }
+    }
+}
+
+{
+    RemoveInventoryFolder Low 276 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        FolderData Variable
+        {   FolderID    LLUUID  }
+    }
 }
 
 // Get inventory segment.
 {
-	FetchInventoryDescendents Low 277 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		InventoryData	Single
-		{	FolderID	LLUUID	}
-		{	OwnerID		LLUUID	}
-		{	SortOrder	S32		} // 0 = name, 1 = time
-		{	FetchFolders	BOOL	} // false will omit folders in query
-		{	FetchItems		BOOL	} // false will omit items in query
-	}
-}
-
-// return inventory segment. 
+    FetchInventoryDescendents Low 277 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        InventoryData Single
+        {   FolderID        LLUUID  }
+        {   OwnerID         LLUUID  }
+        {   SortOrder       S32     }   // 0 = name, 1 = time
+        {   FetchFolders    BOOL    }   // false will omit folders in query
+        {   FetchItems      BOOL    }   // false will omit items in query
+    }
+}
+
+// return inventory segment.
 // *NOTE: This could be compressed more since we already know the
 // parent_id for folders and the folder_id for items, but this is
 // reasonable until we heve server side inventory.
 {
-	InventoryDescendents Low 278 Trusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	FolderID		LLUUID	}
-		{	OwnerID			LLUUID	} // owner of the folders creatd.
-		{	Version			S32		} // version of the folder for caching
-		{	Descendents		S32		} // count to help with caching
-	}
-	{
-		FolderData		Variable
-		{	FolderID		LLUUID	}
-		{	ParentID		LLUUID	}
-		{	Type			S8	}
-		{	Name			Variable	1	}
-	}
-	{
-		ItemData		Variable
-		{	ItemID			LLUUID	}
-		{	FolderID		LLUUID	}
-		{	CreatorID		LLUUID	}	// permissions
-		{	OwnerID			LLUUID	}	// permissions
-		{	GroupID			LLUUID	}	// permissions
-		{	BaseMask		U32	}	// permissions
-		{	OwnerMask		U32	}	// permissions
-		{	GroupMask		U32	}	// permissions
-		{	EveryoneMask	U32	}	// permissions
-		{	NextOwnerMask	U32	}	// permissions
-		{	GroupOwned		BOOL	}	// permissions
-		{	AssetID			LLUUID	}
-		{	Type			S8	}
-		{	InvType			S8	}
-		{	Flags			U32	}
-		{	SaleType		U8	}
-		{	SalePrice		S32	}
-		{	Name			Variable	1	}
-		{	Description		Variable	1	}
-		{	CreationDate	S32	}
-		{	CRC				U32	}
-	}
+    InventoryDescendents Low 278 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   FolderID    LLUUID  }
+        {   OwnerID     LLUUID  }   // owner of the folders creatd.
+        {   Version     S32     }   // version of the folder for caching
+        {   Descendents S32     }   // count to help with caching
+    }
+    {
+        FolderData Variable
+        {   FolderID    LLUUID      }
+        {   ParentID    LLUUID      }
+        {   Type        S8          }
+        {   Name        Variable 1  }
+    }
+    {
+        ItemData Variable
+        {   ItemID          LLUUID      }
+        {   FolderID        LLUUID      }
+        {   CreatorID       LLUUID      }   // permissions
+        {   OwnerID         LLUUID      }   // permissions
+        {   GroupID         LLUUID      }   // permissions
+        {   BaseMask        U32         }   // permissions
+        {   OwnerMask       U32         }   // permissions
+        {   GroupMask       U32         }   // permissions
+        {   EveryoneMask    U32         }   // permissions
+        {   NextOwnerMask   U32         }   // permissions
+        {   GroupOwned      BOOL        }   // permissions
+        {   AssetID         LLUUID      }
+        {   Type            S8          }
+        {   InvType         S8          }
+        {   Flags           U32         }
+        {   SaleType        U8          }
+        {   SalePrice       S32         }
+        {   Name            Variable 1  }
+        {   Description     Variable 1  }
+        {   CreationDate    S32         }
+        {   CRC             U32         }
+    }
 }
 
 // Get inventory item(s) - response comes through FetchInventoryReply
 {
-	FetchInventory	Low	279 NotTrusted	Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		InventoryData	Variable
-		{	OwnerID		LLUUID	}
-		{	ItemID		LLUUID	}
-	}
+    FetchInventory Low 279 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        InventoryData Variable
+        {   OwnerID LLUUID  }
+        {   ItemID  LLUUID  }
+    }
 }
 
 // response to fetch inventory
 {
-	FetchInventoryReply	Low	280 Trusted	Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-	}
-	{
-		InventoryData		Variable
-		{	ItemID			LLUUID	}
-		{	FolderID		LLUUID	}
-
-		{	CreatorID		LLUUID	}	// permissions
-		{	OwnerID			LLUUID	}	// permissions
-		{	GroupID			LLUUID	}	// permissions
-		{	BaseMask		U32	}	// permissions
-		{	OwnerMask		U32	}	// permissions
-		{	GroupMask		U32	}	// permissions
-		{	EveryoneMask	U32	}	// permissions
-		{	NextOwnerMask	U32	}	// permissions
-		{	GroupOwned		BOOL	}	// permissions
-
-		{	AssetID			LLUUID	}
-		{	Type			S8	}
-		{	InvType			S8	}
-		{	Flags			U32	}
-		{	SaleType		U8	}
-		{	SalePrice		S32	}
-		{	Name			Variable	1	}
-		{	Description		Variable	1	}
-		{	CreationDate	S32	}
-		{	CRC				U32	}
-	}
+    FetchInventoryReply Low 280 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        InventoryData Variable
+        {   ItemID          LLUUID      }
+        {   FolderID        LLUUID      }
+
+        {   CreatorID       LLUUID      }   // permissions
+        {   OwnerID         LLUUID      }   // permissions
+        {   GroupID         LLUUID      }   // permissions
+        {   BaseMask        U32         }   // permissions
+        {   OwnerMask       U32         }   // permissions
+        {   GroupMask       U32         }   // permissions
+        {   EveryoneMask    U32         }   // permissions
+        {   NextOwnerMask   U32         }   // permissions
+        {   GroupOwned      BOOL        }   // permissions
+
+        {   AssetID         LLUUID      }
+        {   Type            S8          }
+        {   InvType         S8          }
+        {   Flags           U32         }
+        {   SaleType        U8          }
+        {   SalePrice       S32         }
+        {   Name            Variable 1  }
+        {   Description     Variable 1  }
+        {   CreationDate    S32         }
+        {   CRC             U32         }
+    }
 }
 
 // Can only fit around 7 items per packet - that's the way it goes. At
 // least many bulk updates can be packed.
 // Only from dataserver->sim->viewer
 {
-	BulkUpdateInventory Low 281 Trusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	TransactionID	LLUUID	}
-	}
-	{
-		FolderData		Variable
-		{	FolderID		LLUUID	}
-		{	ParentID		LLUUID	}
-		{	Type			S8	}
-		{	Name			Variable	1	}
-	}
-	{
-		ItemData		Variable
-		{	ItemID			LLUUID	}
-		{	CallbackID		U32		}	// Async Response
-		{	FolderID		LLUUID	}
-		{	CreatorID		LLUUID	}	// permissions
-		{	OwnerID			LLUUID	}	// permissions
-		{	GroupID			LLUUID	}	// permissions
-		{	BaseMask		U32	}	// permissions
-		{	OwnerMask		U32	}	// permissions
-		{	GroupMask		U32	}	// permissions
-		{	EveryoneMask	U32	}	// permissions
-		{	NextOwnerMask	U32	}	// permissions
-		{	GroupOwned		BOOL	}	// permissions
-		{	AssetID			LLUUID	}
-		{	Type			S8	}
-		{	InvType			S8	}
-		{	Flags			U32	}
-		{	SaleType		U8	}
-		{	SalePrice		S32	}
-		{	Name			Variable	1	}
-		{	Description		Variable	1	}
-		{	CreationDate	S32	}
-		{	CRC				U32	}
-	}
+    BulkUpdateInventory Low 281 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID         LLUUID  }
+        {   TransactionID   LLUUID  }
+    }
+    {
+        FolderData Variable
+        {   FolderID    LLUUID      }
+        {   ParentID    LLUUID      }
+        {   Type        S8          }
+        {   Name        Variable 1  }
+    }
+    {
+        ItemData Variable
+        {   ItemID          LLUUID      }
+        {   CallbackID      U32         }   // Async Response
+        {   FolderID        LLUUID      }
+        {   CreatorID       LLUUID      }   // permissions
+        {   OwnerID         LLUUID      }   // permissions
+        {   GroupID         LLUUID      }   // permissions
+        {   BaseMask        U32         }   // permissions
+        {   OwnerMask       U32         }   // permissions
+        {   GroupMask       U32         }   // permissions
+        {   EveryoneMask    U32         }   // permissions
+        {   NextOwnerMask   U32         }   // permissions
+        {   GroupOwned      BOOL        }   // permissions
+        {   AssetID         LLUUID      }
+        {   Type            S8          }
+        {   InvType         S8          }
+        {   Flags           U32         }
+        {   SaleType        U8          }
+        {   SalePrice       S32         }
+        {   Name            Variable 1  }
+        {   Description     Variable 1  }
+        {   CreationDate    S32         }
+        {   CRC             U32         }
+    }
 }
 
 
@@ -6300,162 +6357,162 @@ version 2.0
 // request permissions for agent id to get the asset for owner_id's
 // item_id.
 {
-	RequestInventoryAsset	Low	282 Trusted Unencoded
-	{
-		QueryData	Single
-		{ QueryID		LLUUID	}
-		{ AgentID		LLUUID	}
-		{ OwnerID		LLUUID	}
-		{ ItemID		LLUUID	}
-	}
+    RequestInventoryAsset Low 282 Trusted Unencoded
+    {
+        QueryData Single
+        { QueryID   LLUUID  }
+        { AgentID   LLUUID  }
+        { OwnerID   LLUUID  }
+        { ItemID    LLUUID  }
+    }
 }
 
 // response to RequestInventoryAsset
 // lluuid will be null if agentid in the request above cannot read asset
 {
-	InventoryAssetResponse	Low	283 Trusted Unencoded
-	{
-		QueryData	Single
-		{ QueryID		LLUUID	}
-		{ AssetID		LLUUID	}
-		{ IsReadable	BOOL	}
-	}
+    InventoryAssetResponse Low 283 Trusted Unencoded
+    {
+        QueryData Single
+        { QueryID       LLUUID  }
+        { AssetID       LLUUID  }
+        { IsReadable    BOOL    }
+    }
 }
 
 // This is the new improved way to remove inventory items.  It is
 // currently only supported in viewer->userserver->dataserver
 // messages typically initiated by an empty trash method.
 {
-	RemoveInventoryObjects	Low	284 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		FolderData			Variable
-		{	FolderID		LLUUID	}
-	}
-	{
-		ItemData			Variable
-		{	ItemID			LLUUID	}
-	}
+    RemoveInventoryObjects Low 284 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        FolderData Variable
+        {   FolderID    LLUUID  }
+    }
+    {
+        ItemData Variable
+        {   ItemID  LLUUID  }
+    }
 }
 
 // This is how you remove inventory when you're not even sure what it
 // is - only it's parenting.
 {
-	PurgeInventoryDescendents Low 285 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		InventoryData	Single
-		{	FolderID	LLUUID	}
-	}
+    PurgeInventoryDescendents Low 285 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        InventoryData Single
+        {   FolderID    LLUUID  }
+    }
 }
 
 // These messages are viewer->simulator requests to update a task's
 // inventory.
 // if Key == 0, itemid is the key. if Key == 1, assetid is the key.
 {
-	UpdateTaskInventory Low 286 NotTrusted Zerocoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID  }
-	}
-	{
-		UpdateData			Single
-		{	LocalID			U32	}
-		{	Key				U8	}
-	}
-	{
-		InventoryData		Single
-		{	ItemID			LLUUID	}
-		{	FolderID		LLUUID	}
-		{	CreatorID		LLUUID	}	// permissions
-		{	OwnerID			LLUUID	}	// permissions
-		{	GroupID			LLUUID	}	// permissions
-		{	BaseMask		U32	}	// permissions
-		{	OwnerMask		U32	}	// permissions
-		{	GroupMask		U32	}	// permissions
-		{	EveryoneMask	U32	}	// permissions
-		{	NextOwnerMask	U32	}	// permissions
-		{	GroupOwned		BOOL	}	// permissions
-		{	TransactionID	LLUUID	}
-		{	Type			S8	}
-		{	InvType			S8	}
-		{	Flags			U32	}
-		{	SaleType		U8	}
-		{	SalePrice		S32	}
-		{	Name			Variable	1	}
-		{	Description		Variable	1	}
-		{	CreationDate	S32	}
-		{	CRC				U32	}
-	}
-}
-
-{
-	RemoveTaskInventory Low 287 NotTrusted Zerocoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID  }
-	}
-	{
-		InventoryData		Single
-		{	LocalID			U32	}
-		{	ItemID			LLUUID	}
-	}
-}
-
-{
-	MoveTaskInventory	Low	288 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID  }
-		{	FolderID	LLUUID	}
-	}
-	{
-		InventoryData	Single
-		{	LocalID		U32		}
-		{	ItemID		LLUUID	}
-	}
-}
-
-{
-	RequestTaskInventory Low 289 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID  }
-	}
-	{
-		InventoryData		Single
-		{	LocalID		U32	}
-	}
-}
-
-{
-	ReplyTaskInventory Low 290 Trusted Zerocoded
-	{
-		InventoryData		Single
-		{	TaskID			LLUUID	}
-		{	Serial			S16	}	// S16
-		{	Filename		Variable	1	}
-	}
+    UpdateTaskInventory Low 286 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        UpdateData Single
+        {   LocalID U32 }
+        {   Key     U8  }
+    }
+    {
+        InventoryData Single
+        {   ItemID          LLUUID      }
+        {   FolderID        LLUUID      }
+        {   CreatorID       LLUUID      }   // permissions
+        {   OwnerID         LLUUID      }   // permissions
+        {   GroupID         LLUUID      }   // permissions
+        {   BaseMask        U32         }   // permissions
+        {   OwnerMask       U32         }   // permissions
+        {   GroupMask       U32         }   // permissions
+        {   EveryoneMask    U32         }   // permissions
+        {   NextOwnerMask   U32         }   // permissions
+        {   GroupOwned      BOOL        }   // permissions
+        {   TransactionID   LLUUID      }
+        {   Type            S8          }
+        {   InvType         S8          }
+        {   Flags           U32         }
+        {   SaleType        U8          }
+        {   SalePrice       S32         }
+        {   Name            Variable 1  }
+        {   Description     Variable 1  }
+        {   CreationDate    S32         }
+        {   CRC             U32         }
+    }
+}
+
+{
+    RemoveTaskInventory Low 287 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        InventoryData Single
+        {   LocalID U32     }
+        {   ItemID  LLUUID  }
+    }
+}
+
+{
+    MoveTaskInventory Low 288 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   FolderID    LLUUID  }
+    }
+    {
+        InventoryData Single
+        {   LocalID U32     }
+        {   ItemID  LLUUID  }
+    }
+}
+
+{
+    RequestTaskInventory Low 289 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        InventoryData Single
+        {   LocalID U32 }
+    }
+}
+
+{
+    ReplyTaskInventory Low 290 Trusted Zerocoded
+    {
+        InventoryData Single
+        {   TaskID      LLUUID      }
+        {   Serial      S16         }   // S16
+        {   Filename    Variable 1  }
+    }
 }
 
 // These messages are viewer->simulator requests regarding objects
-// which are currently being simulated. The viewer will get an 
+// which are currently being simulated. The viewer will get an
 // UpdateInventoryItem response if a DeRez succeeds, and the object
 // will appear if a RezObject succeeds.
 // The Destination field tells where the derez should wind up, and the
-// meaning of DestinationID depends on it. For example, if the 
+// meaning of DestinationID depends on it. For example, if the
 // destination is a category, then the destination is the category id. If
 // the destination is a task inventory, then the destination id is the
 // task id.
@@ -6464,194 +6521,199 @@ version 2.0
 // just duplicated (it's not that much, and derezzes that span multiple
 // packets will be rare.)
 {
-	DeRezObject Low 291 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{  AgentID			LLUUID  }
-		{  SessionID		LLUUID  }
-	}
-	{
-		AgentBlock		Single
-		{  GroupID			LLUUID  }
-		{  Destination		U8	}
-		{  DestinationID	LLUUID	}	// see above
-		{  TransactionID	LLUUID	}
-		{  PacketCount		U8	}
-		{  PacketNumber		U8	}
-	}
-	{
-		ObjectData		Variable
-		{  ObjectLocalID	U32	}   // object id in world 
-	}
+    DeRezObject Low 291 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {  AgentID      LLUUID  }
+        {  SessionID    LLUUID  }
+    }
+    {
+        AgentBlock Single
+        {  GroupID          LLUUID  }
+        {  Destination      U8      }
+        {  DestinationID    LLUUID  }   // see above
+        {  TransactionID    LLUUID  }
+        {  PacketCount      U8      }
+        {  PacketNumber     U8      }
+    }
+    {
+        ObjectData Variable
+        {  ObjectLocalID    U32 }   // object id in world
+    }
 }
 
 // This message is sent when a derez succeeds, but there's no way to
 // know, since no inventory is created on the viewer. For example, when
 // saving into task inventory.
 {
-	DeRezAck Low 292 Trusted Unencoded
-	{
-		TransactionData			Single
-		{	TransactionID	LLUUID	}
-		{	Success			BOOL	}
-	}
+    DeRezAck Low 292 Trusted Unencoded
+    {
+        TransactionData Single
+        {   TransactionID   LLUUID  }
+        {   Success         BOOL    }
+    }
 }
 
 // This message is sent from viewer -> simulator when the viewer wants
 // to rez an object out of inventory.
 {
-	RezObject Low 293 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID  }
-		{	SessionID	LLUUID  }
-		{	GroupID		LLUUID	}
-	}
-	{
-		RezData			Single
-		{	FromTaskID				LLUUID	}
-		{	BypassRaycast			U8	}
-		{	RayStart				LLVector3	}
-		{	RayEnd					LLVector3	}
-		{	RayTargetID				LLUUID	}
-		{	RayEndIsIntersection	BOOL }
-		{   RezSelected				BOOL }
-		{	RemoveItem				BOOL }
-		{	ItemFlags				U32 }
-		{	GroupMask				U32 }
-		{	EveryoneMask			U32 }
-		{	NextOwnerMask			U32	}
-	}
-	{
-		InventoryData			Single
-		{	ItemID				LLUUID	}
-		{	FolderID			LLUUID	}
-		{	CreatorID			LLUUID	}	// permissions
-		{	OwnerID				LLUUID	}	// permissions
-		{	GroupID				LLUUID	}	// permissions
-		{	BaseMask			U32	}	// permissions
-		{	OwnerMask			U32	}	// permissions
-		{	GroupMask			U32	}	// permissions
-		{	EveryoneMask		U32	}	// permissions
-		{	NextOwnerMask		U32	}	// permissions
-		{	GroupOwned			BOOL	}	// permissions
-		{	TransactionID		LLUUID	}
-		{	Type				S8	}
-		{	InvType				S8	}
-		{	Flags				U32	}
-		{	SaleType			U8	}
-		{	SalePrice			S32	}
-		{	Name				Variable	1	}
-		{	Description			Variable	1	}
-		{	CreationDate		S32	}
-		{	CRC				U32	}
-	}
+    RezObject Low 293 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupID     LLUUID  }
+    }
+    {
+        RezData Single
+        {   FromTaskID              LLUUID      }
+        {   BypassRaycast           U8          }
+        {   RayStart                LLVector3   }
+        {   RayEnd                  LLVector3   }
+        {   RayTargetID             LLUUID      }
+        {   RayEndIsIntersection    BOOL        }
+        {   RezSelected             BOOL        }
+        {   RemoveItem              BOOL        }
+        {   ItemFlags               U32         }
+        {   GroupMask               U32         }
+        {   EveryoneMask            U32         }
+        {   NextOwnerMask           U32         }
+    }
+    {
+        InventoryData Single
+        {   ItemID          LLUUID      }
+        {   FolderID        LLUUID      }
+        {   CreatorID       LLUUID      }   // permissions
+        {   OwnerID         LLUUID      }   // permissions
+        {   GroupID         LLUUID      }   // permissions
+        {   BaseMask        U32         }   // permissions
+        {   OwnerMask       U32         }   // permissions
+        {   GroupMask       U32         }   // permissions
+        {   EveryoneMask    U32         }   // permissions
+        {   NextOwnerMask   U32         }   // permissions
+        {   GroupOwned      BOOL        }   // permissions
+        {   TransactionID   LLUUID      }
+        {   Type            S8          }
+        {   InvType         S8          }
+        {   Flags           U32         }
+        {   SaleType        U8          }
+        {   SalePrice       S32         }
+        {   Name            Variable 1  }
+        {   Description     Variable 1  }
+        {   CreationDate    S32         }
+        {   CRC             U32         }
+    }
 }
 
 // This message is sent from viewer -> simulator when the viewer wants
 // to rez an object from a notecard.
 {
-	RezObjectFromNotecard Low 294 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID  }
-		{	SessionID	LLUUID  }
-		{	GroupID		LLUUID	}
-	}
-	{
-		RezData			Single
-		{	FromTaskID				LLUUID	}
-		{	BypassRaycast			U8	}
-		{	RayStart				LLVector3	}
-		{	RayEnd					LLVector3	}
-		{	RayTargetID				LLUUID	}
-		{	RayEndIsIntersection	BOOL }
-		{   RezSelected				BOOL }
-		{	RemoveItem				BOOL }
-		{	ItemFlags				U32 }
-		{	GroupMask				U32 }
-		{	EveryoneMask			U32 }
-		{	NextOwnerMask			U32	}
-	}
-	{
-		NotecardData		Single
-		{	NotecardItemID	LLUUID	}
-		{	ObjectID		LLUUID	}
-	}
-	{
-		InventoryData		Variable
-		{	ItemID			LLUUID	}
-	}
+    RezObjectFromNotecard Low 294 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupID     LLUUID  }
+    }
+    {
+        RezData Single
+        {   FromTaskID              LLUUID      }
+        {   BypassRaycast           U8          }
+        {   RayStart                LLVector3   }
+        {   RayEnd                  LLVector3   }
+        {   RayTargetID             LLUUID      }
+        {   RayEndIsIntersection    BOOL        }
+        {   RezSelected             BOOL        }
+        {   RemoveItem              BOOL        }
+        {   ItemFlags               U32         }
+        {   GroupMask               U32         }
+        {   EveryoneMask            U32         }
+        {   NextOwnerMask           U32         }
+    }
+    {
+        NotecardData Single
+        {   NotecardItemID  LLUUID  }
+        {   ObjectID        LLUUID  }
+    }
+    {
+        InventoryData Variable
+        {   ItemID  LLUUID  }
+    }
 }
 
 
 // sim -> dataserver
 // sent during agent to agent inventory transfers
 {
-	TransferInventory Low 295 Trusted Zerocoded
-	{
-		InfoBlock			Single
-		{	SourceID		LLUUID	}
-		{	DestID			LLUUID	}
-		{	TransactionID	LLUUID	}
-	}
-	{
-		InventoryBlock		Variable
-		{	InventoryID		LLUUID	}
-		{	Type			S8	}
-	}
+    TransferInventory Low 295 Trusted Zerocoded
+    {
+        InfoBlock Single
+        {   SourceID        LLUUID  }
+        {   DestID          LLUUID  }
+        {   TransactionID   LLUUID  }
+    }
+    {
+        InventoryBlock Variable
+        {   InventoryID     LLUUID  }
+        {   Type            S8      }
+    }
+    {
+        ValidationBlock Single
+        {   NeedsValidation BOOL    }
+        {   EstateID        U32     }
+    }
 }
 
 // dataserver -> sim
 // InventoryID is the id of the inventory object that the end user
 // should discard if they deny the transfer.
 {
-	TransferInventoryAck	Low	296 Trusted	Zerocoded
-	{
-		InfoBlock			Single
-		{	TransactionID	LLUUID	}
-		{	InventoryID		LLUUID	}
-	}
+    TransferInventoryAck Low 296 Trusted Zerocoded
+    {
+        InfoBlock Single
+        {   TransactionID   LLUUID  }
+        {   InventoryID     LLUUID  }
+    }
 }
 
 
 {
-	AcceptFriendship Low 297 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID  }
-		{	SessionID	LLUUID  }
-	}
-	{
-		TransactionBlock	Single
-		{	TransactionID	LLUUID	}
-	}
-	{
-		FolderData			Variable
-		{	FolderID		LLUUID	} // place to put calling card.
-	}
+    AcceptFriendship Low 297 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        TransactionBlock Single
+        {   TransactionID   LLUUID  }
+    }
+    {
+        FolderData Variable
+        {   FolderID    LLUUID  }   // place to put calling card.
+    }
 }
 
 {
-	DeclineFriendship Low 298 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID  }
-		{	SessionID	LLUUID  }
-	}
-	{
-		TransactionBlock	Single
-		{	TransactionID	LLUUID	}
-	}
+    DeclineFriendship Low 298 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        TransactionBlock Single
+        {   TransactionID   LLUUID  }
+    }
 }
 
 {
-	FormFriendship	Low	299 Trusted	Unencoded
-	{
-		AgentBlock		Single
-		{ SourceID		LLUUID	}
-		{ DestID		LLUUID	}
-	}
+    FormFriendship Low 299 Trusted Unencoded
+    {
+        AgentBlock Single
+        { SourceID  LLUUID  }
+        { DestID    LLUUID  }
+    }
 }
 
 // Cancels user relationship
@@ -6660,281 +6722,281 @@ version 2.0
 // viewer -> userserver -> dataserver
 // reliable
 {
-	TerminateFriendship Low 300 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{ AgentID		LLUUID	}
-		{ SessionID		LLUUID	}
-	}
-	{
-		ExBlock			Single
-		{ OtherID		LLUUID	}
-	}
+    TerminateFriendship Low 300 NotTrusted Unencoded
+    {
+        AgentData Single
+        { AgentID   LLUUID  }
+        { SessionID LLUUID  }
+    }
+    {
+        ExBlock Single
+        { OtherID   LLUUID  }
+    }
 }
 
 // used to give someone a calling card.
 {
-	OfferCallingCard Low 301 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID  }
-		{	SessionID	LLUUID  }
-	}
-	{
-		AgentBlock			Single
-		{	DestID			LLUUID	}
-		{	TransactionID	LLUUID	}
-	}
-}
-
-{
-	AcceptCallingCard Low 302 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID  }
-		{	SessionID	LLUUID  }
-	}
-	{
-		TransactionBlock	Single
-		{	TransactionID	LLUUID	}
-	}
-	{
-		FolderData			Variable
-		{	FolderID		LLUUID	} // place to put calling card.
-	}
-}
-
-{
-	DeclineCallingCard Low 303 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID  }
-		{	SessionID	LLUUID  }
-	}
-	{
-		TransactionBlock	Single
-		{	TransactionID	LLUUID	}
-	}
+    OfferCallingCard Low 301 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        AgentBlock Single
+        {   DestID          LLUUID  }
+        {   TransactionID   LLUUID  }
+    }
+}
+
+{
+    AcceptCallingCard Low 302 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        TransactionBlock Single
+        {   TransactionID   LLUUID  }
+    }
+    {
+        FolderData Variable
+        {   FolderID    LLUUID  }   // place to put calling card.
+    }
+}
+
+{
+    DeclineCallingCard Low 303 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        TransactionBlock Single
+        {   TransactionID   LLUUID  }
+    }
 }
 
 
 // Rez a script onto an object
 {
-	RezScript Low 304 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{ AgentID		LLUUID	}
-		{ SessionID		LLUUID	}
-		{  GroupID			LLUUID	}
-	}
-	{
-		UpdateBlock			Single
-		{  ObjectLocalID	U32	}   // object id in world 
-		{  Enabled			BOOL	}	// is script rezzed in enabled?
-	}
-	{
-		InventoryBlock		Single
-		{	ItemID			LLUUID	}
-		{	FolderID		LLUUID	}
-		{	CreatorID		LLUUID	}	// permissions
-		{	OwnerID			LLUUID	}	// permissions
-		{	GroupID			LLUUID	}	// permissions
-		{	BaseMask		U32	}	// permissions
-		{	OwnerMask		U32	}	// permissions
-		{	GroupMask		U32	}	// permissions
-		{	EveryoneMask	U32	}	// permissions
-		{	NextOwnerMask	U32	}	// permissions
-		{	GroupOwned		BOOL	}	// permissions
-		{	TransactionID	LLUUID	}
-		{	Type			S8	}
-		{	InvType			S8	}
-		{	Flags			U32	}
-		{	SaleType		U8	}
-		{	SalePrice		S32	}
-		{	Name			Variable	1	}
-		{	Description		Variable	1	}
-		{	CreationDate	S32	}
-		{	CRC				U32	}
-	}
+    RezScript Low 304 NotTrusted Zerocoded
+    {
+        AgentData Single
+        { AgentID   LLUUID  }
+        { SessionID LLUUID  }
+        {  GroupID  LLUUID  }
+    }
+    {
+        UpdateBlock Single
+        {  ObjectLocalID    U32 }   // object id in world
+        {  Enabled          BOOL    }   // is script rezzed in enabled?
+    }
+    {
+        InventoryBlock Single
+        {   ItemID          LLUUID      }
+        {   FolderID        LLUUID      }
+        {   CreatorID       LLUUID      }   // permissions
+        {   OwnerID         LLUUID      }   // permissions
+        {   GroupID         LLUUID      }   // permissions
+        {   BaseMask        U32         }   // permissions
+        {   OwnerMask       U32         }   // permissions
+        {   GroupMask       U32         }   // permissions
+        {   EveryoneMask    U32         }   // permissions
+        {   NextOwnerMask   U32         }   // permissions
+        {   GroupOwned      BOOL        }   // permissions
+        {   TransactionID   LLUUID      }
+        {   Type            S8          }
+        {   InvType         S8          }
+        {   Flags           U32         }
+        {   SaleType        U8          }
+        {   SalePrice       S32         }
+        {   Name            Variable 1  }
+        {   Description     Variable 1  }
+        {   CreationDate    S32         }
+        {   CRC             U32         }
+    }
 }
 
 // Create inventory
 {
-	CreateInventoryItem Low 305 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-		{	SessionID	LLUUID		}
-	}
-	{	
-		InventoryBlock		Single
-		{	CallbackID	U32			} // Async Response
-		{	FolderID		LLUUID	}
-		{	TransactionID			LLUUID	} // Going to become TransactionID
-		{	NextOwnerMask	U32	}
-		{	Type			S8	}
-		{	InvType			S8	}
-		{	WearableType	U8	}
-		{	Name			Variable	1	}
-		{	Description		Variable	1	}
-	}
+    CreateInventoryItem Low 305 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID }
+        {   SessionID   LLUUID }
+    }
+    {
+        InventoryBlock Single
+        {   CallbackID      U32         }   // Async Response
+        {   FolderID        LLUUID      }
+        {   TransactionID   LLUUID      }   // Going to become TransactionID
+        {   NextOwnerMask   U32         }
+        {   Type            S8          }
+        {   InvType         S8          }
+        {   WearableType    U8          }
+        {   Name            Variable 1  }
+        {   Description     Variable 1  }
+    }
 }
 
 // give agent a landmark for an event.
 {
-	CreateLandmarkForEvent	Low	306 NotTrusted	Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-		{	SessionID	LLUUID		}
-	}
-	{
-		EventData		Single
-		{	EventID		U32		}
-	}
-	{	
-		InventoryBlock		Single
-		{	FolderID		LLUUID	}
-		{	Name			Variable	1	}
-	}
-}
-
-{
-	EventLocationRequest	Low	307 Trusted	Zerocoded
-	{
-		QueryData		Single
-		{	QueryID		LLUUID			}
-	}
-	{
-		EventData		Single
-		{	EventID		U32		}
-	}
-}
-
-{
-	EventLocationReply	Low	308 Trusted	Zerocoded
-	{
-		QueryData		Single
-		{	QueryID		LLUUID	}
-	}
-	{
-		EventData		Single
-		{	Success		BOOL	}
-		{	RegionID	LLUUID	}
-		{	RegionPos	LLVector3	}
-	}
+    CreateLandmarkForEvent Low 306 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        EventData Single
+        {   EventID U32 }
+    }
+    {
+        InventoryBlock Single
+        {   FolderID    LLUUID      }
+        {   Name        Variable 1  }
+    }
+}
+
+{
+    EventLocationRequest Low 307 Trusted Zerocoded
+    {
+        QueryData Single
+        {   QueryID LLUUID  }
+    }
+    {
+        EventData Single
+        {   EventID U32 }
+    }
+}
+
+{
+    EventLocationReply Low 308 Trusted Zerocoded
+    {
+        QueryData Single
+        {   QueryID LLUUID  }
+    }
+    {
+        EventData Single
+        {   Success     BOOL        }
+        {   RegionID    LLUUID      }
+        {   RegionPos   LLVector3   }
+    }
 }
 
 // get information about landmarks. Used by viewers for determining
 // the location of a landmark, and by simulators for teleport
 {
-	RegionHandleRequest Low 309 NotTrusted Unencoded
-	{
-		RequestBlock		Single
-		{	RegionID		LLUUID	}
-	}
+    RegionHandleRequest Low 309 NotTrusted Unencoded
+    {
+        RequestBlock Single
+        {   RegionID    LLUUID  }
+    }
 }
 
 {
-	RegionIDAndHandleReply Low 310 Trusted Unencoded
-	{
-		ReplyBlock			Single
-		{	RegionID		LLUUID	}
-		{	RegionHandle	U64		}
-	}
+    RegionIDAndHandleReply Low 310 Trusted Unencoded
+    {
+        ReplyBlock Single
+        {   RegionID        LLUUID  }
+        {   RegionHandle    U64     }
+    }
 }
 
 // Move money from one agent to another. Validation will happen at the
 // simulator, the dataserver will actually do the work. Dataserver
 // generates a MoneyBalance message in reply.  The simulator
 // will generate a MoneyTransferBackend in response to this.
-// viewer -> simulator -> dataserver 
-{
-	MoneyTransferRequest Low 311 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		MoneyData			Single
-		{	SourceID		LLUUID  }
-		{	DestID			LLUUID	}	// destination of the transfer
-		{	Flags			U8		}
-		{	Amount			S32		}
-		{	AggregatePermNextOwner	U8	}
-		{	AggregatePermInventory	U8	}
-		{	TransactionType	S32		}	// see lltransactiontypes.h
-		{	Description		Variable 1	}	// string, name of item for purchases
-	}
+// viewer -> simulator -> dataserver
+{
+    MoneyTransferRequest Low 311 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        MoneyData Single
+        {   SourceID                LLUUID      }
+        {   DestID                  LLUUID      }   // destination of the transfer
+        {   Flags                   U8          }
+        {   Amount                  S32         }
+        {   AggregatePermNextOwner  U8          }
+        {   AggregatePermInventory  U8          }
+        {   TransactionType         S32         }   // see lltransactiontypes.h
+        {   Description             Variable 1  }   // string, name of item for purchases
+    }
 }
 
 // And, the money transfer
 // *NOTE: Unused as of 2010-04-06, because all back-end money transactions
 // are done with web services via L$ API.  JC
 {
-	MoneyTransferBackend Low 312 Trusted Zerocoded
-	{
-		MoneyData			Single
-		{	TransactionID	LLUUID	}
-		{ 	TransactionTime	U32	} // utc seconds since epoch
-		{	SourceID		LLUUID  }
-		{	DestID			LLUUID	}	// destination of the transfer
-		{	Flags			U8		}
-		{	Amount			S32		}
-		{	AggregatePermNextOwner	U8	}
-		{	AggregatePermInventory	U8	}
-		{	TransactionType	S32		}	// see lltransactiontypes.h
-		{	RegionID		LLUUID		}	// region sending the request, for logging
-		{	GridX			U32			}	// *HACK: database doesn't have region_id in schema
-		{	GridY			U32			}	// *HACK: database doesn't have region_id in schema
-		{	Description		Variable 1	}	// string, name of item for purchases
-	}
+    MoneyTransferBackend Low 312 Trusted Zerocoded
+    {
+        MoneyData Single
+        {   TransactionID           LLUUID      }
+        {   TransactionTime         U32         }   // utc seconds since epoch
+        {   SourceID                LLUUID      }
+        {   DestID                  LLUUID      }   // destination of the transfer
+        {   Flags                   U8          }
+        {   Amount                  S32         }
+        {   AggregatePermNextOwner  U8          }
+        {   AggregatePermInventory  U8          }
+        {   TransactionType         S32         }   // see lltransactiontypes.h
+        {   RegionID                LLUUID      }   // region sending the request, for logging
+        {   GridX                   U32         }   // *HACK: database doesn't have region_id in schema
+        {   GridY                   U32         }   // *HACK: database doesn't have region_id in schema
+        {   Description             Variable 1  }   // string, name of item for purchases
+    }
 }
 
 
 // viewer -> userserver -> dataserver
 // Reliable
 {
-	MoneyBalanceRequest Low 313 NotTrusted Zerocoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		MoneyData			Single
-		{	TransactionID	LLUUID	}
-	}
+    MoneyBalanceRequest Low 313 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        MoneyData Single
+        {   TransactionID   LLUUID  }
+    }
 }
 
 
 // dataserver -> simulator -> viewer
 {
-	MoneyBalanceReply Low 314 Trusted Zerocoded
-	{
-		MoneyData			Single
-		{	AgentID				LLUUID  }
-		{	TransactionID		LLUUID	}
-		{	TransactionSuccess	BOOL	}	// BOOL
-		{	MoneyBalance		S32	}
-		{	SquareMetersCredit	S32	}
-		{	SquareMetersCommitted	S32	}
-		{	Description			Variable 1	}	// string
-	}
-	// For replies that are part of a transaction (buying something) provide
-	// metadata for localization.  If TransactionType is 0, the message is
-	// purely a balance update.  Added for server 1.40 and viewer 2.1.  JC
-	{
-		TransactionInfo		Single
-		{	TransactionType			S32			}	// lltransactiontype.h
-		{	SourceID				LLUUID		}
-		{	IsSourceGroup			BOOL		}
-		{	DestID					LLUUID		}
-		{	IsDestGroup				BOOL		}
-		{	Amount					S32			}
-		{	ItemDescription			Variable 1	}	// string
-	}
+    MoneyBalanceReply Low 314 Trusted Zerocoded
+    {
+        MoneyData Single
+        {   AgentID                 LLUUID      }
+        {   TransactionID           LLUUID      }
+        {   TransactionSuccess      BOOL        }
+        {   MoneyBalance            S32         }
+        {   SquareMetersCredit      S32         }
+        {   SquareMetersCommitted   S32         }
+        {   Description             Variable 1  }   // string
+    }
+    // For replies that are part of a transaction (buying something) provide
+    // metadata for localization.  If TransactionType is 0, the message is
+    // purely a balance update.  Added for server 1.40 and viewer 2.1.  JC
+    {
+        TransactionInfo Single
+        {   TransactionType S32         }   // lltransactiontype.h
+        {   SourceID        LLUUID      }
+        {   IsSourceGroup   BOOL        }
+        {   DestID          LLUUID      }
+        {   IsDestGroup     BOOL        }
+        {   Amount          S32         }
+        {   ItemDescription Variable 1  }   // string
+    }
 }
 
 
@@ -6945,33 +7007,33 @@ version 2.0
 // dataserver -> simulator -> spaceserver -> simulator -> viewer
 // reliable
 {
-	RoutedMoneyBalanceReply Low 315 Trusted Zerocoded
-	{
-		TargetBlock			Single
-		{	TargetIP		IPADDR	}	// U32 encoded IP
-		{	TargetPort		IPPORT	}
-	}
-	{
-		MoneyData			Single
-		{	AgentID				LLUUID  }
-		{	TransactionID		LLUUID	}
-		{	TransactionSuccess	BOOL	}	// BOOL
-		{	MoneyBalance		S32	}
-		{	SquareMetersCredit	S32	}
-		{	SquareMetersCommitted	S32	}
-		{	Description			Variable 1	}	// string
-	}
-	// See MoneyBalanceReply above.
-	{
-		TransactionInfo		Single
-		{	TransactionType			S32			}	// lltransactiontype.h
-		{	SourceID				LLUUID		}
-		{	IsSourceGroup			BOOL		}
-		{	DestID					LLUUID		}
-		{	IsDestGroup				BOOL		}
-		{	Amount					S32			}
-		{	ItemDescription			Variable 1	}	// string
-	}
+    RoutedMoneyBalanceReply Low 315 Trusted Zerocoded UDPDeprecated
+    {
+        TargetBlock Single
+        {   TargetIP    IPADDR  }   // U32 encoded IP
+        {   TargetPort  IPPORT  }
+    }
+    {
+        MoneyData Single
+        {   AgentID                 LLUUID      }
+        {   TransactionID           LLUUID      }
+        {   TransactionSuccess      BOOL        }
+        {   MoneyBalance            S32         }
+        {   SquareMetersCredit      S32         }
+        {   SquareMetersCommitted   S32         }
+        {   Description             Variable 1  }   // string
+    }
+    // See MoneyBalanceReply above.
+    {
+        TransactionInfo Single
+        {   TransactionType S32         }   // lltransactiontype.h
+        {   SourceID        LLUUID      }
+        {   IsSourceGroup   BOOL        }
+        {   DestID          LLUUID      }
+        {   IsDestGroup     BOOL        }
+        {   Amount          S32         }
+        {   ItemDescription Variable 1  }   // string
+    }
 }
 
 
@@ -6984,36 +7046,36 @@ version 2.0
 // Tell the database that some gestures are now active
 // viewer -> sim -> data
 {
-	ActivateGestures	Low	316 	NotTrusted	Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-		{	Flags			U32		}
-	}
-	{
-		Data			Variable
-		{	ItemID			LLUUID	}
-		{	AssetID			LLUUID	}
-		{	GestureFlags	U32		}
-	}
+    ActivateGestures Low 316 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   Flags       U32     }
+    }
+    {
+        Data Variable
+        {   ItemID          LLUUID  }
+        {   AssetID         LLUUID  }
+        {   GestureFlags    U32     }
+    }
 }
 
 // Tell the database some gestures are no longer active
 // viewer -> sim -> data
 {
-	DeactivateGestures	Low	317 	NotTrusted	Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-		{	Flags			U32		}
-	}
-	{
-		Data			Variable
-		{	ItemID			LLUUID	}
-		{	GestureFlags	U32		}
-	}
+    DeactivateGestures Low 317 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   Flags       U32     }
+    }
+    {
+        Data Variable
+        {   ItemID          LLUUID  }
+        {   GestureFlags    U32     }
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -7024,35 +7086,35 @@ version 2.0
 // could be sent as a result of spam
 // as well as in response to InventoryRequest
 //{
-//	InventoryUpdate Low Trusted Unencoded
-//	{
-//		AgentData		Single
-//		{	AgentID		LLUUID	}
-//	}
-//	{
-//		InventoryData	Single
-//		{	IsComplete	U8	}
-//		{	Filename	Variable	1	}
-//	}
+//    InventoryUpdate Low Trusted Unencoded
+//    {
+//        AgentData Single
+//        {   AgentID LLUUID  }
+//    }
+//    {
+//        InventoryData Single
+//        {   IsComplete  U8          }
+//        {   Filename    Variable 1  }
+//    }
 //}
 
 // dataserver-> userserver -> viewer to move around the mute list
 {
-	MuteListUpdate Low 318 Trusted Unencoded
-	{
-		MuteData	Single
-		{	AgentID		LLUUID	}
-		{	Filename	Variable	1	}
-	}
+    MuteListUpdate Low 318 Trusted Unencoded
+    {
+        MuteData Single
+        {   AgentID     LLUUID      }
+        {   Filename    Variable 1  }
+    }
 }
 
 // tell viewer to use the local mute cache
 {
-	UseCachedMuteList Low 319 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-	}
+    UseCachedMuteList Low 319 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
 }
 
 // Sent from viewer to simulator to set user rights. This message will be
@@ -7062,17 +7124,17 @@ version 2.0
 // agent-related and the same PUT will be issued to the sim host if
 // they are online.
 {
-	GrantUserRights Low 320 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		Rights			Variable
-		{	AgentRelated		LLUUID		}
-		{	RelatedRights		S32		}
-	}
+    GrantUserRights Low 320 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Rights Variable
+        {   AgentRelated    LLUUID  }
+        {   RelatedRights   S32     }
+    }
 }
 
 // This message is sent from the simulator to the viewer to indicate a
@@ -7081,69 +7143,69 @@ version 2.0
 // right. Adding/removing online status rights will show up as an
 // online/offline notification.
 {
-	ChangeUserRights Low 321 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-	}
-	{
-		Rights			Variable
-		{	AgentRelated		LLUUID		}
-		{	RelatedRights		S32		}
-	}
+    ChangeUserRights Low 321 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        Rights Variable
+        {   AgentRelated    LLUUID  }
+        {   RelatedRights   S32     }
+    }
 }
 
-// notification for login and logout. 
+// notification for login and logout.
 // source_sim -> dest_viewer
 {
-	OnlineNotification Low 322 Trusted Unencoded
-	{
-		AgentBlock		Variable
-		{	AgentID		LLUUID	}
-	}
+    OnlineNotification Low 322 Trusted Unencoded
+    {
+        AgentBlock Variable
+        {   AgentID LLUUID  }
+    }
 }
 {
-	OfflineNotification Low 323 Trusted Unencoded
-	{
-		AgentBlock		Variable
-		{	AgentID		LLUUID	}
-	}
+    OfflineNotification Low 323 Trusted Unencoded
+    {
+        AgentBlock Variable
+        {   AgentID LLUUID  }
+    }
 }
 
 
 // SetStartLocationRequest
-// viewer -> sim 
-// failure checked at sim and triggers ImprovedInstantMessage 
-// success triggers SetStartLocation 
-{
-	SetStartLocationRequest Low 324 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		StartLocationData	Single
-		{	SimName			Variable	1	}	// string
-		{	LocationID		U32	}
-		{	LocationPos		LLVector3	}		// region coords
-		{	LocationLookAt	LLVector3	}
-	}
+// viewer -> sim
+// failure checked at sim and triggers ImprovedInstantMessage
+// success triggers SetStartLocation
+{
+    SetStartLocationRequest Low 324 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        StartLocationData Single
+        {   SimName         Variable 1  }   // string
+        {   LocationID      U32         }
+        {   LocationPos     LLVector3   }   // region coords
+        {   LocationLookAt  LLVector3   }
+    }
 }
 
 // SetStartLocation
 // sim -> dataserver
 {
-	SetStartLocation Low 325 Trusted Zerocoded
-	{
-		StartLocationData	Single
-		{	AgentID			LLUUID	}
-		{	RegionID		LLUUID	}
-		{	LocationID		U32	}
-		{	RegionHandle	U64			}
-		{	LocationPos		LLVector3	}		// region coords
-		{	LocationLookAt	LLVector3	}
-	}
+    SetStartLocation Low 325 Trusted Zerocoded
+    {
+        StartLocationData Single
+        {   AgentID         LLUUID      }
+        {   RegionID        LLUUID      }
+        {   LocationID      U32         }
+        {   RegionHandle    U64         }
+        {   LocationPos     LLVector3   }       // region coords
+        {   LocationLookAt  LLVector3   }
+    }
 }
 
 
@@ -7155,21 +7217,21 @@ version 2.0
 // NetTest - This goes back and forth to the space server because of
 // problems determining the port
 {
-	NetTest Low 326 NotTrusted Unencoded
-	{
-		NetBlock			Single
-		{	Port		IPPORT	}
-	}
+    NetTest Low 326 NotTrusted Unencoded
+    {
+        NetBlock Single
+        {   Port    IPPORT  }
+    }
 }
 
 // SetChildCount - Sent to launcher to adjust nominal child count
 // Simulator sends this increase the sim/cpu ratio on startup
 {
-	SetCPURatio Low 327 NotTrusted Unencoded
-	{
-		Data	Single
-		{	Ratio		U8	}
-	}
+    SetCPURatio Low 327 NotTrusted Unencoded
+    {
+        Data Single
+        {   Ratio   U8  }
+    }
 }
 
 
@@ -7177,16 +7239,16 @@ version 2.0
 // SimCrashed - Sent to dataserver when the sim goes down.
 // Maybe we should notify the spaceserver as well?
 {
-	SimCrashed	Low 328 NotTrusted Unencoded
-	{
-		Data	Single
-		{	RegionX			U32 }
-		{	RegionY			U32 }
-	}
-	{
-		Users	Variable
-		{	AgentID			LLUUID	}
-	}
+    SimCrashed Low 328 NotTrusted Unencoded
+    {
+        Data Single
+        {   RegionX U32 }
+        {   RegionY U32 }
+    }
+    {
+        Users Variable
+        {   AgentID LLUUID  }
+    }
 }
 
 // ***************************************************************************
@@ -7195,28 +7257,28 @@ version 2.0
 
 // NameValuePair - if the specific task exists on simulator, add or replace this name value pair
 {
-	NameValuePair Low 329 Trusted Unencoded
-	{
-		TaskData			Single
-		{	ID				LLUUID	}
-	}
-	{
-		NameValueData		Variable
-		{	NVPair			Variable	2	}
-	}
+    NameValuePair Low 329 Trusted Unencoded
+    {
+        TaskData Single
+        {   ID  LLUUID  }
+    }
+    {
+        NameValueData Variable
+        {   NVPair  Variable    2   }
+    }
 }
 
 // NameValuePair - if the specific task exists on simulator or dataserver, remove the name value pair (value is ignored)
 {
-	RemoveNameValuePair Low 330 Trusted Unencoded
-	{
-		TaskData			Single
-		{	ID				LLUUID	}
-	}
-	{
-		NameValueData		Variable
-		{	NVPair			Variable	2	}
-	}
+    RemoveNameValuePair Low 330 Trusted Unencoded
+    {
+        TaskData Single
+        {   ID  LLUUID  }
+    }
+    {
+        NameValueData Variable
+        {   NVPair  Variable    2   }
+    }
 }
 
 
@@ -7225,66 +7287,66 @@ version 2.0
 // ***************************************************************************
 
 //
-// Simulator informs Dataserver of new attachment or attachment asset update 
+// Simulator informs Dataserver of new attachment or attachment asset update
 // DO NOT ALLOW THIS FROM THE VIEWER
 //
 {
-	UpdateAttachment Low 331 Trusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		AttachmentBlock		Single
-		{	AttachmentPoint	U8	}
-	}
-	{
-		OperationData		Single
-		{	AddItem			BOOL	}
-		{	UseExistingAsset BOOL	}
-	}
-	{
-		InventoryData		Single			// Standard inventory item block
-		{	ItemID			LLUUID	}
-		{	FolderID		LLUUID	}
-
-		{	CreatorID		LLUUID	}	// permissions
-		{	OwnerID			LLUUID	}	// permissions
-		{	GroupID			LLUUID	}	// permissions
-		{	BaseMask		U32	}	// permissions
-		{	OwnerMask		U32	}	// permissions
-		{	GroupMask		U32	}	// permissions
-		{	EveryoneMask	U32	}	// permissions
-		{	NextOwnerMask	U32	}	// permissions
-		{	GroupOwned		BOOL	}	// permissions
-
-		{	AssetID			LLUUID	}
-		{	Type			S8	}
-		{	InvType			S8	}
-		{	Flags			U32	}
-		{	SaleType		U8	}
-		{	SalePrice		S32	}
-		{	Name			Variable	1	}
-		{	Description		Variable	1	}
-		{	CreationDate	S32	}
-		{	CRC				U32	}
-	}
+    UpdateAttachment Low 331 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        AttachmentBlock Single
+        {   AttachmentPoint U8  }
+    }
+    {
+        OperationData Single
+        {   AddItem             BOOL    }
+        {   UseExistingAsset    BOOL    }
+    }
+    {
+        InventoryData Single          // Standard inventory item block
+        {   ItemID          LLUUID      }
+        {   FolderID        LLUUID      }
+
+        {   CreatorID       LLUUID      }   // permissions
+        {   OwnerID         LLUUID      }   // permissions
+        {   GroupID         LLUUID      }   // permissions
+        {   BaseMask        U32         }   // permissions
+        {   OwnerMask       U32         }   // permissions
+        {   GroupMask       U32         }   // permissions
+        {   EveryoneMask    U32         }   // permissions
+        {   NextOwnerMask   U32         }   // permissions
+        {   GroupOwned      BOOL        }   // permissions
+
+        {   AssetID         LLUUID      }
+        {   Type            S8          }
+        {   InvType         S8          }
+        {   Flags           U32         }
+        {   SaleType        U8          }
+        {   SalePrice       S32         }
+        {   Name            Variable 1  }
+        {   Description     Variable 1  }
+        {   CreationDate    S32         }
+        {   CRC             U32         }
+    }
 }
 
 // Simulator informs Dataserver that attachment has been taken off
 {
-	RemoveAttachment Low 332 NotTrusted Unencoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		AttachmentBlock		Single
-		{	AttachmentPoint	U8	}
-		{	ItemID			LLUUID	}
-	}
+    RemoveAttachment Low 332 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        AttachmentBlock Single
+        {   AttachmentPoint U8      }
+        {   ItemID          LLUUID  }
+    }
 }
 
 
@@ -7294,57 +7356,56 @@ version 2.0
 
 // SoundTrigger - Sent by simulator to viewer to trigger sound outside current region
 {
-	SoundTrigger High 29 NotTrusted Unencoded
-	{
-		SoundData			Single
-		{	SoundID			LLUUID		}
-		{	OwnerID			LLUUID		}
-		{	ObjectID		LLUUID		}
-		{	ParentID		LLUUID		}	// null if this object is the parent
-		{   Handle			U64			}	// region handle
-		{	Position		LLVector3	}	// region local
-		{	Gain			F32			}
-	}
+    SoundTrigger High 29 NotTrusted Unencoded
+    {
+        SoundData Single
+        {   SoundID     LLUUID      }
+        {   OwnerID     LLUUID      }
+        {   ObjectID    LLUUID      }
+        {   ParentID    LLUUID      }   // null if this object is the parent
+        {   Handle      U64         }   // region handle
+        {   Position    LLVector3   }   // region local
+        {   Gain        F32         }
+    }
 }
 
 // AttachedSound - Sent by simulator to viewer to play sound attached with an object
 {
-	AttachedSound Medium 13 Trusted Unencoded
-	{
-		DataBlock			Single
-		{	SoundID			LLUUID	}
-		{	ObjectID		LLUUID	}
-		{	OwnerID			LLUUID	}
-		{	Gain			F32	}
-		{	Flags			U8	}
-	}
+    AttachedSound Medium 13 Trusted Unencoded
+    {
+        DataBlock Single
+        {   SoundID     LLUUID  }
+        {   ObjectID    LLUUID  }
+        {   OwnerID     LLUUID  }
+        {   Gain        F32     }
+        {   Flags       U8      }
+    }
 }
 
 // AttachedSoundGainChange - Sent by simulator to viewer to change an attached sounds' volume
 
 {
-	AttachedSoundGainChange Medium 14 Trusted Unencoded
-	{
-		DataBlock			Single
-		{	ObjectID		LLUUID	}
-		{	Gain			F32	}
-	}
+    AttachedSoundGainChange Medium 14 Trusted Unencoded
+    {
+        DataBlock Single
+        {   ObjectID    LLUUID  }
+        {   Gain        F32     }
+    }
 }
 
 
 // PreloadSound - Sent by simulator to viewer to preload sound for an object
 
 {
-	PreloadSound Medium 15 Trusted Unencoded
-	{
-		DataBlock			Variable
-		{	ObjectID		LLUUID	}
-		{	OwnerID			LLUUID	}
-		{	SoundID			LLUUID	}
-	}
+    PreloadSound Medium 15 Trusted Unencoded
+    {
+        DataBlock Variable
+        {   ObjectID    LLUUID  }
+        {   OwnerID     LLUUID  }
+        {   SoundID     LLUUID  }
+    }
 }
 
-
 // *************************************************************************
 // Object animation messages
 // *************************************************************************
@@ -7356,16 +7417,16 @@ version 2.0
 // ObjectAnimation - Update animation state
 // simulator --> viewer
 {
-        ObjectAnimation High 30 Trusted Unencoded
-        {
-                Sender                  Single
-                {       ID                      LLUUID  }
-        }
-        {
-                AnimationList Variable
-                { AnimID                LLUUID }
-                { AnimSequenceID S32 }
-        }
+    ObjectAnimation High 30 Trusted Unencoded
+    {
+        Sender Single
+        {   ID  LLUUID  }
+    }
+    {
+        AnimationList Variable
+        { AnimID            LLUUID  }
+        { AnimSequenceID    S32     }
+    }
 }
 
 // *************************************************************************
@@ -7374,87 +7435,87 @@ version 2.0
 
 // current assumes an existing UUID, need to enhance for new assets
 {
-	AssetUploadRequest Low 333 NotTrusted Unencoded
-	{
-		AssetBlock		Single
-		{	TransactionID LLUUID	}
-		{	Type		S8	}
-		{	Tempfile	BOOL	}
-		{	StoreLocal	BOOL	}
-		{	AssetData	Variable	2	}  // Optional: the actual asset data if the whole thing will fit it this packet
-	}
+    AssetUploadRequest Low 333 NotTrusted Unencoded
+    {
+        AssetBlock Single
+        {   TransactionID   LLUUID      }
+        {   Type            S8          }
+        {   Tempfile        BOOL        }
+        {   StoreLocal      BOOL        }
+        {   AssetData       Variable 2  }   // Optional: the actual asset data if the whole thing will fit it this packet
+    }
 }
 
 {
-	AssetUploadComplete Low 334 NotTrusted Unencoded
-	{
-		AssetBlock		Single
-		{	UUID		LLUUID	}
-		{	Type		S8	}
-		{	Success		BOOL	}
-	}
+    AssetUploadComplete Low 334 NotTrusted Unencoded
+    {
+        AssetBlock Single
+        {   UUID    LLUUID  }
+        {   Type    S8      }
+        {   Success BOOL    }
+    }
 }
 
 
 // Script on simulator asks dataserver if there are any email messages
 // waiting.
 {
-	EmailMessageRequest Low 335 Trusted Unencoded
-	{
-		DataBlock			Single
-		{	ObjectID		LLUUID	}
-		{	FromAddress		Variable	1	}
-		{	Subject			Variable	1	}
-	}
+    EmailMessageRequest Low 335 Trusted Unencoded
+    {
+        DataBlock Single
+        {   ObjectID    LLUUID      }
+        {   FromAddress Variable 1  }
+        {   Subject     Variable 1  }
+    }
 }
 
 // Dataserver gives simulator the oldest email message in the queue, along with
 // how many messages are left in the queue.  And passes back the filter used to request emails.
 {
-	EmailMessageReply Low 336 Trusted Unencoded
-	{
-		DataBlock			Single
-		{	ObjectID		LLUUID	}
-		{	More			U32	} //U32
-		{	Time			U32	} //U32
-		{	FromAddress		Variable	1	}
-		{	Subject			Variable	1	}
-		{	Data			Variable	2	}
-		{	MailFilter		Variable	1	}
-	}
+    EmailMessageReply Low 336 Trusted Unencoded
+    {
+        DataBlock Single
+        {   ObjectID    LLUUID      }
+        {   More        U32         }
+        {   Time        U32         }
+        {   FromAddress Variable 1  }
+        {   Subject     Variable 1  }
+        {   Data        Variable 2  }
+        {   MailFilter  Variable 1  }
+    }
 }
 
 // Script on simulator sends mail to another script
 {
-	InternalScriptMail Medium 16 Trusted Unencoded
-	{
-		DataBlock			Single
-		{	From			Variable 	1	}
-		{	To				LLUUID			}
-		{	Subject			Variable 	1	}
-		{	Body			Variable 	2	}
-	}
+    InternalScriptMail Medium 16 Trusted Unencoded
+    {
+        DataBlock Single
+        {   From    Variable 1  }
+        {   To      LLUUID      }
+        {   Subject Variable 1  }
+        {   Body    Variable 2  }
+    }
 }
 
-// Script on simulator asks dataserver for information 
+// Script on simulator asks dataserver for information
 {
-	ScriptDataRequest Low 337 Trusted Unencoded
-	{
-		DataBlock			Variable
-		{	Hash			U64				}
-		{	RequestType		S8				}
-		{	Request			Variable	2	}
-	}
+    ScriptDataRequest Low 337 Trusted Unencoded
+    {
+        DataBlock Variable
+        {   Hash        U64         }
+        {   RequestType S8          }
+        {   Request     Variable 2  }
+    }
 }
 
 // Data server responds with data
 {
-	ScriptDataReply Low 338 Trusted Unencoded
-	{
-		DataBlock			Variable
-		{	Hash			U64				}		
-		{	Reply			Variable	2	}
-	}
+    ScriptDataReply Low 338 Trusted Unencoded
+    {
+        DataBlock Variable
+        {   Hash    U64         }
+        {   Reply   Variable 2  }
+    }
 }
 
 
@@ -7464,26 +7525,25 @@ version 2.0
 
 // CreateGroupRequest
 // viewer -> simulator
-// simulator -> dataserver
 // reliable
 {
-	CreateGroupRequest Low 339 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		GroupData		Single
-		{	Name			Variable	1	}	// string
-		{	Charter			Variable	2	}	// string
-		{	ShowInList		BOOL	}
-		{	InsigniaID		LLUUID	}
-		{	MembershipFee	S32				}	// S32		
-		{	OpenEnrollment	BOOL			}   // BOOL (U8)
-		{	AllowPublish	BOOL		}	// whether profile is externally visible or not
-		{	MaturePublish	BOOL		}	// profile is "mature"
-	}
+    CreateGroupRequest Low 339 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        GroupData Single
+        {   Name            Variable 1  }   // string
+        {   Charter         Variable 2  }   // string
+        {   ShowInList      BOOL        }
+        {   InsigniaID      LLUUID      }
+        {   MembershipFee   S32         }
+        {   OpenEnrollment  BOOL        }
+        {   AllowPublish    BOOL        }   // whether profile is externally visible or not
+        {   MaturePublish   BOOL        }   // profile is "mature"
+    }
 }
 
 // CreateGroupReply
@@ -7491,17 +7551,17 @@ version 2.0
 // simulator -> viewer
 // reliable
 {
-	CreateGroupReply Low 340 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-	}
-	{
-		ReplyData		Single
-		{	GroupID			LLUUID	}
-		{	Success			BOOL	}
-		{	Message			Variable	1	}	// string
-	}
+    CreateGroupReply Low 340 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        ReplyData Single
+        {   GroupID LLUUID      }
+        {   Success BOOL        }
+        {   Message Variable 1  }   // string
+    }
 }
 
 // UpdateGroupInfo
@@ -7509,73 +7569,73 @@ version 2.0
 // simulator -> dataserver
 // reliable
 {
-	UpdateGroupInfo Low 341 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		GroupData		Single
-		{	GroupID			LLUUID	}
-		{	Charter			Variable	2	}	// string
-		{	ShowInList		BOOL			}
-		{	InsigniaID		LLUUID	}
-		{	MembershipFee	S32				}
-		{	OpenEnrollment	BOOL			}
-		{	AllowPublish	BOOL	}
-		{	MaturePublish	BOOL	}
-	}
+    UpdateGroupInfo Low 341 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID         LLUUID      }
+        {   Charter         Variable 2  }   // string
+        {   ShowInList      BOOL        }
+        {   InsigniaID      LLUUID      }
+        {   MembershipFee   S32         }
+        {   OpenEnrollment  BOOL        }
+        {   AllowPublish    BOOL        }
+        {   MaturePublish   BOOL        }
+    }
 }
 
 // GroupRoleChanges
 // viewer -> simulator -> dataserver
 // reliable
 {
-	GroupRoleChanges	Low	342 NotTrusted	Unencoded
-	{
-		AgentData	Single
-		{	AgentID	LLUUID	}
-		{	SessionID	LLUUID	}
-		{	GroupID		LLUUID	}
-	}
-	{
-		RoleChange	Variable
-		{	RoleID		LLUUID	}
-		{	MemberID	LLUUID	}
-		{	Change		U32		}
-	}
+    GroupRoleChanges Low 342 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupID     LLUUID  }
+    }
+    {
+        RoleChange Variable
+        {   RoleID      LLUUID  }
+        {   MemberID    LLUUID  }
+        {   Change      U32     }
+    }
 }
 
 // JoinGroupRequest
 // viewer -> simulator -> dataserver
 // reliable
 {
-	JoinGroupRequest Low 343 NotTrusted Zerocoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		GroupData	Single
-		{	GroupID		LLUUID	}
-	}
+    JoinGroupRequest Low 343 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID LLUUID  }
+    }
 }
 
 // JoinGroupReply
 // dataserver -> simulator -> viewer
 {
-	JoinGroupReply Low 344 Trusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-	}
-	{
-		GroupData	Single
-		{	GroupID		LLUUID	}
-		{	Success		BOOL	}
-	}
+    JoinGroupReply Low 344 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID LLUUID  }
+        {   Success BOOL    }
+    }
 }
 
 
@@ -7583,152 +7643,156 @@ version 2.0
 // viewer -> simulator -> dataserver
 // reliable
 {
-	EjectGroupMemberRequest Low 345 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		GroupData		Single
-		{	GroupID		LLUUID	}
-	}
-	{
-		EjectData		Variable
-		{	EjecteeID	LLUUID	}
-	}
+    EjectGroupMemberRequest Low 345 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID LLUUID  }
+    }
+    {
+        EjectData Variable
+        {   EjecteeID   LLUUID  }
+    }
 }
 
 // EjectGroupMemberReply
 // dataserver -> simulator -> viewer
 // reliable
 {
-	EjectGroupMemberReply Low 346 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-	}
-	{
-		GroupData		Single
-		{	GroupID		LLUUID	}
-	}
-	{
-		EjectData		Single
-		{	Success		BOOL	}
-	}
+    EjectGroupMemberReply Low 346 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID LLUUID  }
+    }
+    {
+        EjectData Single
+        {   Success BOOL    }
+    }
 }
 
 // LeaveGroupRequest
 // viewer -> simulator -> dataserver
 // reliable
 {
-	LeaveGroupRequest Low 347 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		GroupData		Single
-		{	GroupID		LLUUID	}
-	}
+    LeaveGroupRequest Low 347 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID LLUUID  }
+    }
 }
 
 // LeaveGroupReply
 // dataserver -> simulator -> viewer
 {
-	LeaveGroupReply Low 348 Trusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-	}
-	{
-		GroupData	Single
-		{	GroupID		LLUUID	}
-		{	Success		BOOL	}
-	}
+    LeaveGroupReply Low 348 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID LLUUID  }
+        {   Success BOOL    }
+    }
 }
 
 // InviteGroupRequest
 // viewer -> simulator -> dataserver
 // reliable
 {
-	InviteGroupRequest Low 349 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}	// UUID of inviting agent
-		{	SessionID	LLUUID	}
-	}
-	{
-		GroupData	Single
-		{	GroupID		LLUUID	}
-	}
-	{
-		InviteData	Variable
-		{	InviteeID	LLUUID	}
-		{	RoleID		LLUUID	}
-	}
+    InviteGroupRequest Low 349 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }   // UUID of inviting agent
+        {   SessionID   LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID LLUUID  }
+    }
+    {
+        InviteData Variable
+        {   InviteeID   LLUUID  }
+        {   RoleID      LLUUID  }
+    }
 }
 
 // InviteGroupResponse
 // simulator -> dataserver
 // reliable
 {
-	InviteGroupResponse	Low	350 Trusted	Unencoded
-	{
-		InviteData	Single
-		{	AgentID		LLUUID	}
-		{	InviteeID	LLUUID	}
-		{	GroupID			LLUUID	}
-		{	RoleID		LLUUID	}
-		{	MembershipFee S32	}
-	}
+    InviteGroupResponse Low 350 Trusted Unencoded
+    {
+        InviteData Single
+        {   AgentID         LLUUID  }
+        {   InviteeID       LLUUID  }
+        {   GroupID         LLUUID  }
+        {   RoleID          LLUUID  }
+        {   MembershipFee   S32     }
+    }
+    {
+        GroupData Single
+        {   GroupLimit  S32 }   // Extra block for the agent's group limit
+    }
 }
 
 // GroupProfileRequest
 // viewer-> simulator -> dataserver
 // reliable
 {
-	GroupProfileRequest Low 351 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID			}
-		{	SessionID	LLUUID	}
-	}
-	{
-		GroupData	Single
-		{	GroupID			LLUUID			}
-	}
+    GroupProfileRequest Low 351 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID LLUUID  }
+    }
 }
 
 // GroupProfileReply
 // dataserver -> simulator -> viewer
 // reliable
 {
-	GroupProfileReply Low 352 Trusted Zerocoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID			}
-	}
-	{
-		GroupData		Single
-		{	GroupID			LLUUID			}
-		{	Name			Variable	1	}	// string
-		{	Charter			Variable	2	}	// string
-		{	ShowInList		BOOL	}
-		{	MemberTitle		Variable	1	}	// string
-		{	PowersMask		U64	}	// U32 mask
-		{	InsigniaID		LLUUID			}
-		{	FounderID		LLUUID			}
-		{	MembershipFee	S32				}
-		{	OpenEnrollment	BOOL			}   // BOOL (U8)
-		{	Money			S32	}
-		{	GroupMembershipCount	S32	}
-		{	GroupRolesCount			S32	}
-		{	AllowPublish	BOOL	}
-		{	MaturePublish	BOOL	}
-		{	OwnerRole		LLUUID	}
-	}
+    GroupProfileReply Low 352 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID                 LLUUID      }
+        {   Name                    Variable 1  }   // string
+        {   Charter                 Variable 2  }   // string
+        {   ShowInList              BOOL        }
+        {   MemberTitle             Variable 1  }   // string
+        {   PowersMask              U64         }
+        {   InsigniaID              LLUUID      }
+        {   FounderID               LLUUID      }
+        {   MembershipFee           S32         }
+        {   OpenEnrollment          BOOL        }
+        {   Money                   S32         }
+        {   GroupMembershipCount    S32         }
+        {   GroupRolesCount         S32         }
+        {   AllowPublish            BOOL        }
+        {   MaturePublish           BOOL        }
+        {   OwnerRole               LLUUID      }
+    }
 }
 
 // CurrentInterval = 0  =>  this period (week, day, etc.)
@@ -7736,287 +7800,287 @@ version 2.0
 // viewer -> simulator -> dataserver
 // reliable
 {
-	GroupAccountSummaryRequest Low 353 NotTrusted Zerocoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID			}
-		{	SessionID		LLUUID	}
-		{	GroupID			LLUUID	}
-	}
-	{
-		MoneyData			Single
-		{	RequestID		LLUUID	}
-		{	IntervalDays	S32	}
-		{	CurrentInterval	S32	}
-	}
+    GroupAccountSummaryRequest Low 353 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupID     LLUUID  }
+    }
+    {
+        MoneyData Single
+        {   RequestID       LLUUID  }
+        {   IntervalDays    S32     }
+        {   CurrentInterval S32     }
+    }
 }
 
 
 // dataserver -> simulator -> viewer
 // Reliable
 {
-	GroupAccountSummaryReply Low 354 Trusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	GroupID			LLUUID		}
-	}
-	{
-		MoneyData			Single
-		{	RequestID			LLUUID	}
-		{	IntervalDays		S32	}
-		{	CurrentInterval		S32	}
-		{	StartDate			Variable	1	}	// string
-		{	Balance				S32	}
-		{	TotalCredits		S32	}
-		{	TotalDebits			S32	}
-		{	ObjectTaxCurrent	S32	}
-		{	LightTaxCurrent		S32	}
-		{	LandTaxCurrent		S32	}
-		{	GroupTaxCurrent		S32	}
-		{	ParcelDirFeeCurrent	S32	}
-		{	ObjectTaxEstimate	S32	}
-		{	LightTaxEstimate	S32	}
-		{	LandTaxEstimate		S32	}
-		{	GroupTaxEstimate	S32	}
-		{	ParcelDirFeeEstimate	S32	}
-		{	NonExemptMembers	S32	}
-		{	LastTaxDate			Variable	1	}	// string
-		{	TaxDate				Variable	1	}	// string
-	}
+    GroupAccountSummaryReply Low 354 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+        {   GroupID LLUUID  }
+    }
+    {
+        MoneyData Single
+        {   RequestID               LLUUID      }
+        {   IntervalDays            S32         }
+        {   CurrentInterval         S32         }
+        {   StartDate               Variable 1  }   // string
+        {   Balance                 S32         }
+        {   TotalCredits            S32         }
+        {   TotalDebits             S32         }
+        {   ObjectTaxCurrent        S32         }
+        {   LightTaxCurrent         S32         }
+        {   LandTaxCurrent          S32         }
+        {   GroupTaxCurrent         S32         }
+        {   ParcelDirFeeCurrent     S32         }
+        {   ObjectTaxEstimate       S32         }
+        {   LightTaxEstimate        S32         }
+        {   LandTaxEstimate         S32         }
+        {   GroupTaxEstimate        S32         }
+        {   ParcelDirFeeEstimate    S32         }
+        {   NonExemptMembers        S32         }
+        {   LastTaxDate             Variable 1  }   // string
+        {   TaxDate                 Variable 1  }   // string
+    }
 }
 
 
 // Reliable
 {
-	GroupAccountDetailsRequest Low 355 NotTrusted Zerocoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-		{	GroupID			LLUUID	}
-	}
-	{
-		MoneyData			Single
-		{	RequestID		LLUUID	}
-		{	IntervalDays	S32	}
-		{	CurrentInterval	S32	}
-	}
+    GroupAccountDetailsRequest Low 355 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupID     LLUUID  }
+    }
+    {
+        MoneyData Single
+        {   RequestID       LLUUID  }
+        {   IntervalDays    S32     }
+        {   CurrentInterval S32     }
+    }
 }
 
 // Reliable
 {
-	GroupAccountDetailsReply Low 356 Trusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	GroupID			LLUUID		}
-	}
-	{
-		MoneyData			Single
-		{	RequestID		LLUUID	}
-		{	IntervalDays	S32	}
-		{	CurrentInterval	S32	}
-		{	StartDate		Variable	1	}	// string
-	}
-	{
-		HistoryData			Variable
-		{	Description		Variable	1	}	// string
-		{	Amount			S32	}
-	}
+    GroupAccountDetailsReply Low 356 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+        {   GroupID LLUUID  }
+    }
+    {
+        MoneyData Single
+        {   RequestID       LLUUID      }
+        {   IntervalDays    S32         }
+        {   CurrentInterval S32         }
+        {   StartDate       Variable 1  }   // string
+    }
+    {
+        HistoryData Variable
+        {   Description Variable 1  }   // string
+        {   Amount      S32         }
+    }
 }
 
 
 // Reliable
 {
-	GroupAccountTransactionsRequest Low 357 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-		{	GroupID			LLUUID		}
-	}
-	{
-		MoneyData			Single
-		{	RequestID		LLUUID	}
-		{	IntervalDays	S32	}
-		{	CurrentInterval	S32	}
-	}
+    GroupAccountTransactionsRequest Low 357 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupID     LLUUID  }
+    }
+    {
+        MoneyData Single
+        {   RequestID       LLUUID  }
+        {   IntervalDays    S32     }
+        {   CurrentInterval S32     }
+    }
 }
 
 // Reliable
 {
-	GroupAccountTransactionsReply Low 358 Trusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID			LLUUID	}
-		{	GroupID			LLUUID		}
-	}
-	{
-		MoneyData			Single
-		{	RequestID		LLUUID	}
-		{	IntervalDays	S32	}
-		{	CurrentInterval	S32	}
-		{	StartDate		Variable	1	}	// string
-	}
-	{
-		HistoryData			Variable
-		{	Time			Variable	1	}	// string
-		{	User			Variable	1	}	// string
-		{	Type			S32	}
-		{	Item			Variable	1	}	// string
-		{	Amount			S32	}
-	}
+    GroupAccountTransactionsReply Low 358 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+        {   GroupID LLUUID  }
+    }
+    {
+        MoneyData Single
+        {   RequestID       LLUUID      }
+        {   IntervalDays    S32         }
+        {   CurrentInterval S32         }
+        {   StartDate       Variable 1  }   // string
+    }
+    {
+        HistoryData Variable
+        {   Time    Variable 1  }   // string
+        {   User    Variable 1  }   // string
+        {   Type    S32         }
+        {   Item    Variable 1  }   // string
+        {   Amount  S32         }
+    }
 }
 
 // GroupActiveProposalsRequest
 // viewer -> simulator -> dataserver
 //reliable
 {
-	GroupActiveProposalsRequest Low 359 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID			}
-		{	SessionID		LLUUID			}
-	}
-	{
-		GroupData	Single
-		{	GroupID			LLUUID			}
-	}
-	{
-		TransactionData Single
-		{	TransactionID	LLUUID	}
-	}
+    GroupActiveProposalsRequest Low 359 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID LLUUID  }
+    }
+    {
+        TransactionData Single
+        {   TransactionID   LLUUID  }
+    }
 }
 
 // GroupActiveProposalItemReply
 // dataserver -> simulator -> viewer
 // reliable
 {
-	GroupActiveProposalItemReply Low 360 Trusted Zerocoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID			}
-		{	GroupID			LLUUID			}
-	}
-	{
-		TransactionData Single
-		{	TransactionID	LLUUID	}
-		{	TotalNumItems	U32		}
-	}
-	{
-		ProposalData	Variable
-		{	VoteID			LLUUID			}
-		{	VoteInitiator	LLUUID			}
-		{	TerseDateID		Variable	1	} // string
-		{	StartDateTime	Variable	1	}	// string
-		{	EndDateTime		Variable	1	}	// string
-		{	AlreadyVoted	BOOL			}
-		{	VoteCast		Variable	1	}	// string
-		{	Majority	F32		}
-		{	Quorum		S32		}
-		{	ProposalText	Variable	1	}	// string
-	}
+    GroupActiveProposalItemReply Low 360 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+        {   GroupID LLUUID  }
+    }
+    {
+        TransactionData Single
+        {   TransactionID   LLUUID  }
+        {   TotalNumItems   U32     }
+    }
+    {
+        ProposalData Variable
+        {   VoteID          LLUUID      }
+        {   VoteInitiator   LLUUID      }
+        {   TerseDateID     Variable 1  }   // string
+        {   StartDateTime   Variable 1  }   // string
+        {   EndDateTime     Variable 1  }   // string
+        {   AlreadyVoted    BOOL        }
+        {   VoteCast        Variable 1  }   // string
+        {   Majority        F32         }
+        {   Quorum          S32         }
+        {   ProposalText    Variable 1  }   // string
+    }
 }
 
 // GroupVoteHistoryRequest
 // viewer -> simulator -> dataserver
 //reliable
 {
-	GroupVoteHistoryRequest Low 361 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID			}
-		{	SessionID		LLUUID			}
-	}
-	{
-		GroupData	Single
-		{	GroupID			LLUUID			}
-	}
-	{
-		TransactionData Single
-		{	TransactionID	LLUUID	}
-	}
+    GroupVoteHistoryRequest Low 361 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID LLUUID  }
+    }
+    {
+        TransactionData Single
+        {   TransactionID   LLUUID  }
+    }
 }
 
 // GroupVoteHistoryItemReply
 // dataserver -> simulator -> viewer
 // reliable
 {
-	GroupVoteHistoryItemReply Low 362 Trusted Zerocoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID			}
-		{	GroupID			LLUUID			}
-	}
-	{
-		TransactionData Single
-		{	TransactionID	LLUUID	}
-		{	TotalNumItems	U32		}
-	}
-	{
-		HistoryItemData	Single
-		{	VoteID			LLUUID			}
-		{	TerseDateID		Variable	1	} // string
-		{	StartDateTime	Variable	1	}	// string
-		{	EndDateTime		Variable	1	}	// string
-		{	VoteInitiator	LLUUID			}
-		{	VoteType		Variable	1	}	// string
-		{	VoteResult		Variable	1	}	// string
-		{	Majority	F32		}
-		{	Quorum		S32		}
-		{	ProposalText	Variable	2	}	// string
-	}
-	{
-		VoteItem	Variable
-		{	CandidateID		LLUUID		}
-		{	VoteCast		Variable	1	}	// string
-		{	NumVotes		S32		}
-	}
+    GroupVoteHistoryItemReply Low 362 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+        {   GroupID LLUUID  }
+    }
+    {
+        TransactionData Single
+        {   TransactionID   LLUUID  }
+        {   TotalNumItems   U32     }
+    }
+    {
+        HistoryItemData Single
+        {   VoteID          LLUUID      }
+        {   TerseDateID     Variable 1  }   // string
+        {   StartDateTime   Variable 1  }   // string
+        {   EndDateTime     Variable 1  }   // string
+        {   VoteInitiator   LLUUID      }
+        {   VoteType        Variable 1  }   // string
+        {   VoteResult      Variable 1  }   // string
+        {   Majority        F32         }
+        {   Quorum          S32         }
+        {   ProposalText    Variable 2  }   // string
+    }
+    {
+        VoteItem Variable
+        {   CandidateID LLUUID      }
+        {   VoteCast    Variable 1  }   // string
+        {   NumVotes    S32         }
+    }
 }
 
 // StartGroupProposal
 // viewer -> simulator -> dataserver
 // reliable
 {
-	StartGroupProposal Low 363 NotTrusted Zerocoded UDPDeprecated
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ProposalData		Single
-		{	GroupID			LLUUID			}
-		{	Quorum			S32				}
-		{	Majority		F32				}	// F32
-		{	Duration		S32				}	// S32, seconds
-		{	ProposalText	Variable	1	}	// string
-	}
+    StartGroupProposal Low 363 NotTrusted Zerocoded UDPDeprecated
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ProposalData Single
+        {   GroupID         LLUUID      }
+        {   Quorum          S32         }
+        {   Majority        F32         }
+        {   Duration        S32         }   // seconds
+        {   ProposalText    Variable 1  }   // string
+    }
 }
 
 // GroupProposalBallot
 // viewer -> simulator -> dataserver
 // reliable
 {
-	GroupProposalBallot Low 364 NotTrusted Unencoded UDPDeprecated
-	{
-		AgentData		Single
-		{	AgentID		LLUUID			}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ProposalData		Single
-		{	ProposalID		LLUUID			}
-		{	GroupID			LLUUID			}
-		{	VoteCast		Variable	1	}	// string
-	}
+    GroupProposalBallot Low 364 NotTrusted Unencoded UDPDeprecated
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ProposalData Single
+        {   ProposalID  LLUUID      }
+        {   GroupID     LLUUID      }
+        {   VoteCast    Variable 1  }   // string
+    }
 }
 
 // TallyVotes userserver -> dataserver
 // reliable
 {
-	TallyVotes	Low	365 Trusted Unencoded
+    TallyVotes Low 365 Trusted Unencoded
 }
 
 
@@ -8026,17 +8090,17 @@ version 2.0
 // simulator -> dataserver
 // reliable
 {
-	GroupMembersRequest Low 366 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		GroupData		Single
-		{	GroupID		LLUUID	}
-		{   RequestID	LLUUID	}
-	}
+    GroupMembersRequest Low 366 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID     LLUUID  }
+        {   RequestID   LLUUID  }
+    }
 }
 
 // GroupMembersReply
@@ -8044,88 +8108,88 @@ version 2.0
 // dataserver -> simulator
 // reliable
 {
-	GroupMembersReply Low 367 Trusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-	}
-	{
-		GroupData		Single
-		{	GroupID		LLUUID	}
-		{   RequestID	LLUUID	}
-		{	MemberCount	S32		}
-	}
-	{
-		MemberData		Variable
-		{	AgentID		LLUUID	}
-		{	Contribution	S32	}
-		{	OnlineStatus	Variable	1	}	// string
-		{	AgentPowers		U64	}
-		{	Title			Variable	1	}	// string
-		{	IsOwner			BOOL	}
-	}
+    GroupMembersReply Low 367 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID     LLUUID  }
+        {   RequestID   LLUUID  }
+        {   MemberCount S32     }
+    }
+    {
+        MemberData Variable
+        {   AgentID         LLUUID      }
+        {   Contribution    S32         }
+        {   OnlineStatus    Variable 1  }   // string
+        {   AgentPowers     U64         }
+        {   Title           Variable 1  }   // string
+        {   IsOwner         BOOL        }
+    }
 }
 
 // used to switch an agent's currently active group.
 // viewer -> simulator -> dataserver -> AgentDataUpdate...
 {
-	ActivateGroup	Low	368 NotTrusted Zerocoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	GroupID		LLUUID	}
-	}
+    ActivateGroup Low 368 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupID     LLUUID  }
+    }
 }
 
 // viewer -> simulator -> dataserver
 {
-	SetGroupContribution Low 369 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		Data	Single
-		{	GroupID		LLUUID	}
-		{	Contribution	S32	}
-	}
+    SetGroupContribution Low 369 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   GroupID         LLUUID  }
+        {   Contribution    S32     }
+    }
 }
 
 // viewer -> simulator -> dataserver
 {
-	SetGroupAcceptNotices Low 370 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		Data	Single
-		{	GroupID		LLUUID	}
-		{	AcceptNotices	BOOL	}
-	}
-	{
-		NewData				Single
-		{	ListInProfile	BOOL	}
-	}
+    SetGroupAcceptNotices Low 370 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Data Single
+        {   GroupID         LLUUID  }
+        {   AcceptNotices   BOOL    }
+    }
+    {
+        NewData Single
+        {   ListInProfile   BOOL    }
+    }
 }
 
 // GroupRoleDataRequest
 // viewer -> simulator -> dataserver
 {
-	GroupRoleDataRequest Low	371 NotTrusted	Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		GroupData	Single
-		{	GroupID		LLUUID	}
-		{	RequestID	LLUUID	}
-	}
+    GroupRoleDataRequest Low 371 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID     LLUUID  }
+        {   RequestID   LLUUID  }
+    }
 }
 
 
@@ -8133,152 +8197,152 @@ version 2.0
 // All role data for this group
 // dataserver -> simulator -> agent
 {
-	GroupRoleDataReply Low	372 Trusted	Unencoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID			}
-	}
-	{
-		GroupData		Single
-		{	GroupID			LLUUID	}
-		{	RequestID	LLUUID	}
-		{	RoleCount	S32		}
-	}
-	{
-		RoleData	Variable
-		{	RoleID		LLUUID	}
-		{	Name		Variable	1	}
-		{	Title		Variable	1	}
-		{	Description	Variable	1	}
-		{	Powers		U64		}
-		{	Members		U32		}
-	}
+    GroupRoleDataReply Low 372 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID     LLUUID  }
+        {   RequestID   LLUUID  }
+        {   RoleCount   S32     }
+    }
+    {
+        RoleData Variable
+        {   RoleID      LLUUID      }
+        {   Name        Variable 1  }
+        {   Title       Variable 1  }
+        {   Description Variable 1  }
+        {   Powers      U64         }
+        {   Members     U32         }
+    }
 }
 
 // GroupRoleMembersRequest
 // viewer -> simulator -> dataserver
 {
-	GroupRoleMembersRequest Low	373 NotTrusted	Unencoded
-	{
-		AgentData	Single
-		{	AgentID			LLUUID			}
-		{	SessionID	LLUUID	}
-	}
-	{
-		GroupData		Single
-		{	GroupID		LLUUID	}
-		{	RequestID	LLUUID	}
-	}
+    GroupRoleMembersRequest Low 373 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        GroupData Single
+        {   GroupID     LLUUID  }
+        {   RequestID   LLUUID  }
+    }
 }
 
 // GroupRoleMembersReply
 // All role::member pairs for this group.
 // dataserver -> simulator -> agent
 {
-	GroupRoleMembersReply Low	374 Trusted	Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	GroupID		LLUUID	}
-		{	RequestID	LLUUID	}
-		{	TotalPairs	U32		}
-	}
-	{
-		MemberData		Variable
-		{	RoleID		LLUUID	}
-		{	MemberID	LLUUID	}
-	}
+    GroupRoleMembersReply Low 374 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   GroupID     LLUUID  }
+        {   RequestID   LLUUID  }
+        {   TotalPairs  U32     }
+    }
+    {
+        MemberData Variable
+        {   RoleID      LLUUID  }
+        {   MemberID    LLUUID  }
+    }
 }
 
 // GroupTitlesRequest
 // viewer -> simulator -> dataserver
 {
-	GroupTitlesRequest Low	375 NotTrusted	Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	GroupID		LLUUID	}
-		{	RequestID	LLUUID	}
-	}
+    GroupTitlesRequest Low 375 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupID     LLUUID  }
+        {   RequestID   LLUUID  }
+    }
 }
 
 
 // GroupTitlesReply
 // dataserver -> simulator -> viewer
 {
-	GroupTitlesReply Low 376 Trusted	Zerocoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	GroupID		LLUUID	}
-		{	RequestID	LLUUID	}
-	}
-	{
-		GroupData	Variable
-		{	Title		Variable	1	} // string
-		{	RoleID		LLUUID			}
-		{	Selected	BOOL			}
-	}
+    GroupTitlesReply Low 376 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   GroupID     LLUUID  }
+        {   RequestID   LLUUID  }
+    }
+    {
+        GroupData Variable
+        {   Title       Variable 1  }   // string
+        {   RoleID      LLUUID      }
+        {   Selected    BOOL        }
+    }
 }
 
 // GroupTitleUpdate
 // viewer -> simulator -> dataserver
 {
-	GroupTitleUpdate	Low	377 NotTrusted	Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	GroupID		LLUUID	}
-		{	TitleRoleID	LLUUID	}
-	}
+    GroupTitleUpdate Low 377 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupID     LLUUID  }
+        {   TitleRoleID LLUUID  }
+    }
 }
 
 // GroupRoleUpdate
 // viewer -> simulator -> dataserver
 {
-	GroupRoleUpdate		Low	378 NotTrusted	Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	GroupID		LLUUID	}
-	}
-	{
-		RoleData	Variable
-		{	RoleID		LLUUID	}
-		{	Name		Variable	1	}
-		{	Description	Variable	1	}
-		{	Title		Variable	1	}
-		{	Powers		U64		}
-		{	UpdateType	U8		}
-	}
-}
-			
+    GroupRoleUpdate Low 378 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupID     LLUUID  }
+    }
+    {
+        RoleData Variable
+        {   RoleID      LLUUID      }
+        {   Name        Variable 1  }
+        {   Description Variable 1  }
+        {   Title       Variable 1  }
+        {   Powers      U64         }
+        {   UpdateType  U8          }
+    }
+}
+
 
 
 // Request the members of the live help group needed for requesting agent.
 // userserver -> dataserver
 {
-	LiveHelpGroupRequest Low 379 Trusted Unencoded
-	{
-		RequestData 	Single
-		{	RequestID	LLUUID	}
-		{	AgentID		LLUUID	}
-	}
+    LiveHelpGroupRequest Low 379 Trusted Unencoded
+    {
+        RequestData Single
+        {   RequestID   LLUUID  }
+        {   AgentID     LLUUID  }
+    }
 }
 
 // Send down the group
 // dataserver -> userserver
 {
-	LiveHelpGroupReply Low 380 Trusted Unencoded
-	{
-		ReplyData	 	Single
-		{	RequestID	LLUUID	}
-		{	GroupID		LLUUID	}
-		{	Selection	Variable 	1	} // selection criteria all or active
-	}
+    LiveHelpGroupReply Low 380 Trusted Unencoded
+    {
+        ReplyData Single
+        {   RequestID   LLUUID      }
+        {   GroupID     LLUUID      }
+        {   Selection   Variable 1  }   // selection criteria all or active
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -8290,12 +8354,12 @@ version 2.0
 // viewer -> simulator -> dataserver
 // reliable
 {
-	AgentWearablesRequest Low 381 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
+    AgentWearablesRequest Low 381 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
 }
 
 // AgentWearablesUpdate
@@ -8304,19 +8368,19 @@ version 2.0
 // reliable
 // NEVER from viewer to sim
 {
-	AgentWearablesUpdate Low 382 Trusted Zerocoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	SerialNum	U32	}	// U32, Increases every time the wearables change for a given agent.  Used to avoid processing out of order packets.
-	}
-	{
-		WearableData	Variable
-		{	ItemID		LLUUID	}
-		{	AssetID		LLUUID	}
-		{	WearableType U8	}	// U8, LLWearable::EWearType
-	}
+    AgentWearablesUpdate Low 382 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   SerialNum   U32     }   // Increases every time the wearables change for a given agent.  Used to avoid processing out of order packets.
+    }
+    {
+        WearableData Variable
+        {   ItemID          LLUUID  }
+        {   AssetID         LLUUID  }
+        {   WearableType    U8      }   // LLWearable::EWearType
+    }
 }
 
 //
@@ -8325,37 +8389,37 @@ version 2.0
 // viewer->sim->dataserver
 // reliable
 {
-	AgentIsNowWearing	Low	383 NotTrusted	Zerocoded
-	{
-		AgentData Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		WearableData	Variable
-		{	ItemID		LLUUID	}
-		{	WearableType	U8	}
-	}
+    AgentIsNowWearing Low 383 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        WearableData Variable
+        {   ItemID          LLUUID  }
+        {   WearableType    U8      }
+    }
 }
-		
+
 
 // AgentCachedTexture
 // viewer queries for cached textures on dataserver (via simulator)
 // viewer -> simulator -> dataserver
 // reliable
 {
-	AgentCachedTexture Low 384 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-		{	SessionID	LLUUID		}
-		{	SerialNum	S32			}
-	}
-	{
-		WearableData	Variable
-		{	ID				LLUUID	}
-		{	TextureIndex	U8 }
-	}
+    AgentCachedTexture Low 384 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   SerialNum   S32     }
+    }
+    {
+        WearableData Variable
+        {   ID              LLUUID  }
+        {   TextureIndex    U8      }
+    }
 }
 
 // AgentCachedTextureResponse
@@ -8363,29 +8427,29 @@ version 2.0
 // dataserver -> simulator -> viewer
 // reliable
 {
-	AgentCachedTextureResponse Low 385 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-		{	SessionID	LLUUID		}
-		{	SerialNum	S32			}
-	}
-	{
-		WearableData	Variable
-		{	TextureID		LLUUID	}
-		{	TextureIndex	U8 }
-		{	HostName		Variable	1 }
-	}
+    AgentCachedTextureResponse Low 385 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   SerialNum   S32     }
+    }
+    {
+        WearableData Variable
+        {   TextureID       LLUUID      }
+        {   TextureIndex    U8          }
+        {   HostName        Variable 1  }
+    }
 }
 
 // Request an AgentDataUpdate without changing any agent data.
 {
-	AgentDataUpdateRequest Low 386 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
+    AgentDataUpdateRequest Low 386 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
 }
 
 // AgentDataUpdate
@@ -8394,17 +8458,17 @@ version 2.0
 // dataserver -> simulator -> viewer
 // reliable
 {
-	AgentDataUpdate Low 387 Trusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID				LLUUID	}
-		{	FirstName	        Variable	1	}   // string
-		{	LastName	        Variable	1	}   // string
-		{	GroupTitle			Variable	1	}	// string
-		{	ActiveGroupID		LLUUID	}	// active group
-		{	GroupPowers			U64	}
-		{	GroupName			Variable	1	}	// string
-	}
+    AgentDataUpdate Low 387 Trusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID         LLUUID      }
+        {   FirstName       Variable 1  }   // string
+        {   LastName        Variable 1  }   // string
+        {   GroupTitle      Variable 1  }   // string
+        {   ActiveGroupID   LLUUID      }   // active group
+        {   GroupPowers     U64         }
+        {   GroupName       Variable 1  }   // string
+    }
 }
 
 
@@ -8412,35 +8476,35 @@ version 2.0
 // This is a bunch of group data that needs to be appropriatly routed based on presence info.
 // dataserver -> simulator
 {
-	GroupDataUpdate	Low	388 Trusted	Zerocoded
-	{
-		AgentGroupData		Variable
-		{	AgentID			LLUUID	}
-		{	GroupID			LLUUID	}
-		{	AgentPowers		U64		}
-		{	GroupTitle		Variable	1	}
-	}
+    GroupDataUpdate Low 388 Trusted Zerocoded
+    {
+        AgentGroupData Variable
+        {   AgentID     LLUUID      }
+        {   GroupID     LLUUID      }
+        {   AgentPowers U64         }
+        {   GroupTitle  Variable 1  }
+    }
 }
 
 // AgentGroupDataUpdate
-// Updates a viewer or simulator's impression of the groups an agent is in. 
+// Updates a viewer or simulator's impression of the groups an agent is in.
 // dataserver -> simulator -> viewer
 // reliable
 {
-	AgentGroupDataUpdate Low 389 Trusted Zerocoded UDPDeprecated
-	{
-		AgentData			Single
-		{	AgentID				LLUUID	}
-	}
-	{
-		GroupData			Variable
-		{	GroupID				LLUUID	}
-		{	GroupPowers			U64		}	
-		{	AcceptNotices		BOOL	}
-		{	GroupInsigniaID		LLUUID	}
-		{	Contribution		S32		}
-		{	GroupName			Variable	1	}	// string
-	}
+    AgentGroupDataUpdate Low 389 Trusted Zerocoded UDPDeprecated
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        GroupData Variable
+        {   GroupID         LLUUID      }
+        {   GroupPowers     U64         }
+        {   AcceptNotices   BOOL        }
+        {   GroupInsigniaID LLUUID      }
+        {   Contribution    S32         }
+        {   GroupName       Variable 1  }   // string
+    }
 }
 
 // AgentDropGroup
@@ -8449,12 +8513,12 @@ version 2.0
 // dataserver -> userserver
 // reliable
 {
-	AgentDropGroup Low 390 Trusted Zerocoded UDPDeprecated
-	{
-		AgentData			Single
-		{	AgentID				LLUUID	}
-		{	GroupID				LLUUID	}
-	}
+    AgentDropGroup Low 390 Trusted Zerocoded UDPDeprecated
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+        {   GroupID LLUUID  }
+    }
 }
 
 // LogTextMessage
@@ -8462,16 +8526,16 @@ version 2.0
 // chat and IM log table.
 // Sent from userserver (IM logging) and simulator (chat logging).
 {
-	LogTextMessage Low 391 Trusted Zerocoded
-	{
-		DataBlock	Variable
-		{ FromAgentId	LLUUID }
-		{ ToAgentId	LLUUID }
-		{ GlobalX	F64 }
-		{ GlobalY	F64 }
-		{ Time		U32	} // utc seconds since epoch
-		{ Message	Variable	2 } // string
-	}
+    LogTextMessage Low 391 Trusted Zerocoded
+    {
+        DataBlock Variable
+        { FromAgentId   LLUUID      }
+        { ToAgentId     LLUUID      }
+        { GlobalX       F64         }
+        { GlobalY       F64         }
+        { Time          U32         }   // utc seconds since epoch
+        { Message       Variable 2  }   // string
+    }
 }
 
 // ViewerEffect
@@ -8480,21 +8544,21 @@ version 2.0
 // sim-->viewer (multiple effects that can be seen by viewer)
 // the AgentData block used for authentication for viewer-->sim messages
 {
-	ViewerEffect Medium 17 NotTrusted Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		Effect Variable
-		{	ID			LLUUID	} // unique UUID of the effect
-		{	AgentID		LLUUID	} // yes, pack AgentID again (note this block is variable)
-		{	Type		U8	} // Type of the effect
-		{	Duration	F32	} // F32 time (seconds)
-		{	Color		Fixed		4	} // Color4U
-		{	TypeData	Variable	1	} // Type specific data
-	}
+    ViewerEffect Medium 17 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        Effect Variable
+        {   ID          LLUUID      }   // unique UUID of the effect
+        {   AgentID     LLUUID      }   // yes, pack AgentID again (note this block is variable)
+        {   Type        U8          }   // Type of the effect
+        {   Duration    F32         }   // F32 time (seconds)
+        {   Color       Fixed    4  }   // Color4U
+        {   TypeData    Variable 1  }   // Type specific data
+    }
 }
 
 
@@ -8502,12 +8566,12 @@ version 2.0
 // Sent to establish a trust relationship between two components.
 // Only sent in response to a DenyTrustedCircuit message.
 {
-	CreateTrustedCircuit Low 392 NotTrusted Unencoded
-	{
-		DataBlock Single
-		{ EndPointID	LLUUID }
-		{ Digest        Fixed 32 } // 32 hex digits == 1 MD5 Digest
-	}
+    CreateTrustedCircuit Low 392 NotTrusted Unencoded
+    {
+        DataBlock Single
+        { EndPointID    LLUUID }
+        { Digest        Fixed 32 }   // 32 hex digits == 1 MD5 Digest
+    }
 }
 
 // DenyTrustedCircuit
@@ -8517,97 +8581,97 @@ version 2.0
 // - the reception of a trusted message on a non-trusted circuit
 // This allows us to re-auth a circuit if it gets closed due to timeouts or network failures.
 {
-	DenyTrustedCircuit Low 393 NotTrusted Unencoded
-	{
-		DataBlock Single
-		{ EndPointID	LLUUID }
-	}
+    DenyTrustedCircuit Low 393 NotTrusted Unencoded
+    {
+        DataBlock Single
+        { EndPointID    LLUUID }
+    }
 }
 
 // RequestTrustedCircuit
 // If the destination does not trust the sender, a Deny is sent back.
 {
-	RequestTrustedCircuit Low 394 Trusted Unencoded
-}
-
-
-{
-	RezSingleAttachmentFromInv Low 395 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}
-	{
-		ObjectData			Single
-		{	ItemID			LLUUID	}
-		{	OwnerID			LLUUID	}
-		{	AttachmentPt	U8		}	// 0 for default
-		{	ItemFlags		U32		}
-		{	GroupMask		U32		}
-		{	EveryoneMask	U32		}
-		{	NextOwnerMask	U32		}
-		{	Name			Variable	1	}
-		{	Description		Variable	1	}
-	}
-}
-
-{
-	RezMultipleAttachmentsFromInv Low 396 NotTrusted Zerocoded
-	{
-		AgentData			Single
-		{	AgentID			LLUUID	}
-		{	SessionID		LLUUID	}
-	}	
-	{
-		HeaderData			Single
-		{	CompoundMsgID			LLUUID  }	// All messages a single "compound msg" must have the same id
-		{	TotalObjects			U8	}
-		{	FirstDetachAll			BOOL	}
-	}
-	{
-		ObjectData			Variable		// 1 to 4 of these per packet
-		{	ItemID					LLUUID	}
-		{	OwnerID					LLUUID	}
-		{	AttachmentPt			U8	}	// 0 for default
-		{	ItemFlags				U32 }
-		{	GroupMask				U32 }
-		{	EveryoneMask			U32 }
-		{	NextOwnerMask			U32	}
-		{	Name					Variable	1	}
-		{	Description				Variable	1	}
-	}
-}
-
-
-{
-	DetachAttachmentIntoInv Low 397 NotTrusted Unencoded
-	{
-		ObjectData			Single
-		{	AgentID					LLUUID  }
-		{	ItemID					LLUUID	}
-	}
+    RequestTrustedCircuit Low 394 Trusted Unencoded
+}
+
+
+{
+    RezSingleAttachmentFromInv Low 395 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Single
+        {   ItemID          LLUUID      }
+        {   OwnerID         LLUUID      }
+        {   AttachmentPt    U8          }   // 0 for default
+        {   ItemFlags       U32         }
+        {   GroupMask       U32         }
+        {   EveryoneMask    U32         }
+        {   NextOwnerMask   U32         }
+        {   Name            Variable 1  }
+        {   Description     Variable 1  }
+    }
+}
+
+{
+    RezMultipleAttachmentsFromInv Low 396 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        HeaderData Single
+        {   CompoundMsgID   LLUUID  }   // All messages a single "compound msg" must have the same id
+        {   TotalObjects    U8      }
+        {   FirstDetachAll  BOOL    }
+    }
+    {
+        ObjectData Variable // 1 to 4 of these per packet
+        {   ItemID          LLUUID      }
+        {   OwnerID         LLUUID      }
+        {   AttachmentPt    U8          }   // 0 for default
+        {   ItemFlags       U32         }
+        {   GroupMask       U32         }
+        {   EveryoneMask    U32         }
+        {   NextOwnerMask   U32         }
+        {   Name            Variable 1  }
+        {   Description     Variable 1  }
+    }
+}
+
+
+{
+    DetachAttachmentIntoInv Low 397 NotTrusted Unencoded
+    {
+        ObjectData Single
+        {   AgentID LLUUID  }
+        {   ItemID  LLUUID  }
+    }
 }
 
 
 // Viewer -> Sim
 // Used in "Make New Outfit"
 {
-	CreateNewOutfitAttachments  Low 398 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		HeaderData			Single
-		{	NewFolderID			LLUUID	}
-	}
-	{
-		ObjectData			Variable
-		{	OldItemID			LLUUID	}
-		{	OldFolderID			LLUUID	}
-	}
+    CreateNewOutfitAttachments Low 398 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        HeaderData Single
+        {   NewFolderID LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   OldItemID   LLUUID  }
+        {   OldFolderID LLUUID  }
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -8615,40 +8679,40 @@ version 2.0
 //-----------------------------------------------------------------------------
 
 {
-	UserInfoRequest	Low	399 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
+    UserInfoRequest Low 399 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
 }
 
 {
-	UserInfoReply	Low	400 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID	LLUUID	}
-	}
-	{
-		UserData	Single
-		{	IMViaEMail	BOOL	}
-		{	DirectoryVisibility	Variable 1	}
-		{	EMail		Variable	2	}
-	}
+    UserInfoReply Low 400 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        UserData Single
+        {   IMViaEMail          BOOL        }
+        {   DirectoryVisibility Variable 1  }
+        {   EMail               Variable 2  }
+    }
 }
 
 {
-	UpdateUserInfo	Low	401 NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		UserData	Single
-		{	IMViaEMail	BOOL	}
-		{	DirectoryVisibility	Variable 1	}
-	}
+    UpdateUserInfo Low 401 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        UserData Single
+        {   IMViaEMail          BOOL        }
+        {   DirectoryVisibility Variable 1  }
+    }
 }
 
 
@@ -8660,44 +8724,44 @@ version 2.0
 // spaceserver -> sim
 // tell a particular simulator to rename a parcel
 {
-	ParcelRename	Low	402 Trusted Unencoded
-	{
-		ParcelData 		Variable
-		{	ParcelID		LLUUID	}
-		{	NewName			Variable	1	}	// string
-	}
+    ParcelRename Low 402 Trusted Unencoded
+    {
+        ParcelData Variable
+        {   ParcelID    LLUUID      }
+        {   NewName     Variable 1  }   // string
+    }
 }
 
 
 // sim -> viewer
 // initiate upload. primarily used for uploading raw files.
 {
-	InitiateDownload	Low	403 	NotTrusted Unencoded
-	{
-		AgentData	Single
-		{	AgentID		LLUUID	}
-	}
-	{
-		FileData	Single
-		{	SimFilename		Variable	1	}	// string
-		{	ViewerFilename	Variable	1	}	// string
-	}
+    InitiateDownload Low 403 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+    }
+    {
+        FileData Single
+        {   SimFilename     Variable 1  }   // string
+        {   ViewerFilename  Variable 1  }   // string
+    }
 }
 
 // Generalized system message. Each Requst has its own protocol for
 // the StringData block format and contents.
 {
     SystemMessage Low 404 Trusted Zerocoded
-	{
-		MethodData	 	Single
-		{	Method		Variable 1	}
-		{	Invoice		LLUUID		}
-		{	Digest		Fixed 32	} // 32 hex digits == 1 MD5 Digest
-	}
-	{
-		ParamList		Variable
-		{	Parameter	Variable 1 }
-	}
+    {
+        MethodData Single
+        {   Method  Variable 1  }
+        {   Invoice LLUUID      }
+        {   Digest  Fixed 32    }   // 32 hex digits == 1 MD5 Digest
+    }
+    {
+        ParamList Variable
+        {   Parameter   Variable 1  }
+    }
 }
 
 
@@ -8711,33 +8775,33 @@ version 2.0
 // of all map layers and NULL-layer sims.
 // Returns: MapLayerReply and MapBlockReply
 {
-	MapLayerRequest	Low	405 	NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	Flags		U32		}
-		{	EstateID	U32		}	// filled in on sim
-		{	Godlike		BOOL	}	// filled in on sim
-	}
+    MapLayerRequest Low 405 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   Flags       U32     }
+        {   EstateID    U32     }   // filled in on sim
+        {   Godlike     BOOL    }   // filled in on sim
+    }
 }
 
 // sim -> viewer
 {
-	MapLayerReply Low	406 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	Flags		U32		}
-	}
-	{
-		LayerData		Variable
-		{	Left		U32		}
-		{	Right		U32		}
-		{	Top			U32		}
-		{	Bottom		U32		}
-		{	ImageID		LLUUID	}
-	}
+    MapLayerReply Low 406 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+        {   Flags   U32     }
+    }
+    {
+        LayerData Variable
+        {   Left    U32     }
+        {   Right   U32     }
+        {   Top     U32     }
+        {   Bottom  U32     }
+        {   ImageID LLUUID  }
+    }
 }
 
 // viewer -> sim
@@ -8745,22 +8809,22 @@ version 2.0
 // of the sims in a specified region.
 // Returns: MapBlockReply
 {
-	MapBlockRequest Low	407 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	Flags		U32		}
-		{	EstateID	U32		}	// filled in on sim
-		{	Godlike		BOOL	}	// filled in on sim
-	}
-	{
-		PositionData	Single
-		{	MinX		U16		}	// in region-widths
-		{	MaxX		U16		}	// in region-widths
-		{	MinY		U16		}	// in region-widths
-		{	MaxY		U16		}	// in region-widths
-	}
+    MapBlockRequest Low 407 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   Flags       U32     }
+        {   EstateID    U32     }   // filled in on sim
+        {   Godlike     BOOL    }   // filled in on sim
+    }
+    {
+        PositionData Single
+        {   MinX    U16 }   // in region-widths
+        {   MaxX    U16 }   // in region-widths
+        {   MinY    U16 }   // in region-widths
+        {   MaxY    U16 }   // in region-widths
+    }
 }
 
 // viewer -> sim
@@ -8768,40 +8832,40 @@ version 2.0
 // of the sims with a given name.
 // Returns: MapBlockReply
 {
-	MapNameRequest Low	408 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	Flags		U32		}
-		{	EstateID	U32		}	// filled in on sim
-		{	Godlike		BOOL	}	// filled in on sim
-	}
-	{
-		NameData		Single
-		{	Name		Variable	1	}	// string
-	}
+    MapNameRequest Low 408 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   Flags       U32     }
+        {   EstateID    U32     }   // filled in on sim
+        {   Godlike     BOOL    }   // filled in on sim
+    }
+    {
+        NameData Single
+        {   Name    Variable 1  }   // string
+    }
 }
 
 // sim -> viewer
 {
-	MapBlockReply Low	409 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	Flags		U32		}
-	}
-	{	
-		Data			Variable
-		{	X			U16				}	// in region-widths
-		{	Y			U16				}	// in region-widths
-		{	Name		Variable	1	}	// string
-		{	Access		U8				}	// PG, mature, etc.
-		{	RegionFlags	U32				}
-		{	WaterHeight	U8				}	// meters
-		{	Agents		U8				}
-		{	MapImageID	LLUUID			}
-	}
+    MapBlockReply Low 409 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+        {   Flags   U32     }
+    }
+    {
+        Data Variable
+        {   X           U16         }   // in region-widths
+        {   Y           U16         }   // in region-widths
+        {   Name        Variable 1  }   // string
+        {   Access      U8          }   // PG, mature, etc.
+        {   RegionFlags U32         }
+        {   WaterHeight U8          }   // meters
+        {   Agents      U8          }
+        {   MapImageID  LLUUID      }
+    }
 }
 
 // viewer -> sim
@@ -8810,43 +8874,43 @@ version 2.0
 // Used for Telehubs, Agents, Events, Popular Places, etc.
 // Returns: MapBlockReply
 {
-	MapItemRequest Low	410 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-		{	Flags		U32		}
-		{	EstateID	U32		}	// filled in on sim
-		{	Godlike		BOOL	}	// filled in on sim
-	}
-	{
-		RequestData		Single
-		{	ItemType		U32		}
-		{	RegionHandle	U64		} // filled in on sim
-	}
+    MapItemRequest Low 410 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   Flags       U32     }
+        {   EstateID    U32     }   // filled in on sim
+        {   Godlike     BOOL    }   // filled in on sim
+    }
+    {
+        RequestData Single
+        {   ItemType        U32 }
+        {   RegionHandle    U64 }   // filled in on sim
+    }
 }
 
 // sim -> viewer
 {
-	MapItemReply Low	411 Trusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	Flags		U32		}
-	}
-	{
-		RequestData		Single
-		{	ItemType	U32		}
-	}
-	{	
-		Data			Variable
-		{	X			U32				}	// global position
-		{	Y			U32				}	// global position
-		{	ID			LLUUID			}	// identifier id
-		{	Extra		S32				}	// extra information
-		{	Extra2		S32				}	// extra information
-		{	Name		Variable	1	}	// identifier string
-	}
+    MapItemReply Low 411 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }
+        {   Flags   U32     }
+    }
+    {
+        RequestData Single
+        {   ItemType    U32 }
+    }
+    {
+        Data Variable
+        {   X       U32         }   // global position
+        {   Y       U32         }   // global position
+        {   ID      LLUUID      }   // identifier id
+        {   Extra   S32         }   // extra information
+        {   Extra2  S32         }   // extra information
+        {   Name    Variable 1  }   // identifier string
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -8854,21 +8918,21 @@ version 2.0
 //-----------------------------------------------------------------------------
 // reliable
 {
-	SendPostcard   	Low	412 	NotTrusted Unencoded
-	{
-		AgentData	Single
-		{   AgentID		LLUUID		}
-		{	SessionID	LLUUID		}
-		{	AssetID		LLUUID		}
-		{	PosGlobal	LLVector3d	}	// Where snapshot was taken
-		{	To			Variable 1	}   // dest email address(es)
-		{	From		Variable 1	}   // src email address(es)
-		{	Name		Variable 1	}   // src name
-		{	Subject		Variable 1	}   // mail subject
-		{	Msg			Variable 2	}   // message text
-		{	AllowPublish	BOOL		}	// Allow publishing on the web.
-		{	MaturePublish	BOOL		}	// profile is "mature"
-	}
+    SendPostcard Low 412 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID         LLUUID      }
+        {   SessionID       LLUUID      }
+        {   AssetID         LLUUID      }
+        {   PosGlobal       LLVector3d  }   // Where snapshot was taken
+        {   To              Variable 1  }   // dest email address(es)
+        {   From            Variable 1  }   // src email address(es)
+        {   Name            Variable 1  }   // src name
+        {   Subject         Variable 1  }   // mail subject
+        {   Msg             Variable 2  }   // message text
+        {   AllowPublish    BOOL        }   // Allow publishing on the web.
+        {   MaturePublish   BOOL        }   // profile is "mature"
+    }
 }
 
 // RPC messages
@@ -8877,11 +8941,11 @@ version 2.0
 {
     RpcChannelRequest Low 413 Trusted Unencoded
     {
-		DataBlock		Single
-		{	GridX		U32 }
-		{	GridY		U32 }
-        {   TaskID      LLUUID }
-        {   ItemID		LLUUID }
+        DataBlock Single
+        {   GridX   U32     }
+        {   GridY   U32     }
+        {   TaskID  LLUUID  }
+        {   ItemID  LLUUID  }
     }
 }
 
@@ -8891,9 +8955,9 @@ version 2.0
 {
     RpcChannelReply Low 414 Trusted Unencoded
     {
-        DataBlock   Single
+        DataBlock Single
         {   TaskID      LLUUID }
-        {   ItemID		LLUUID }
+        {   ItemID      LLUUID }
         {   ChannelID   LLUUID }
     }
 }
@@ -8903,175 +8967,175 @@ version 2.0
 // RpcScriptRequestInboundForward: spaceserver -> simulator
 // reply: simulator -> rpcserver
 {
-	RpcScriptRequestInbound Low 415 NotTrusted Unencoded
-	{
-		TargetBlock Single
-		{	GridX		U32 }
-		{	GridY		U32	}
-	}
-	{
-		DataBlock Single
-		{	TaskID		LLUUID }
-		{	ItemID		LLUUID }
-		{	ChannelID	LLUUID }
-		{	IntValue	U32 }
-		{	StringValue Variable 2 } // string
-	}
+    RpcScriptRequestInbound Low 415 NotTrusted Unencoded
+    {
+        TargetBlock Single
+        {   GridX   U32 }
+        {   GridY   U32 }
+    }
+    {
+        DataBlock Single
+        {   TaskID      LLUUID }
+        {   ItemID      LLUUID }
+        {   ChannelID   LLUUID }
+        {   IntValue    U32 }
+        {   StringValue Variable 2 }   // string
+    }
 }
 
 // spaceserver -> simulator
 {
-	RpcScriptRequestInboundForward Low 416 Trusted Unencoded UDPDeprecated
-	{
-		DataBlock Single
-		{	RPCServerIP	IPADDR }
-		{	RPCServerPort	IPPORT }
-		{	TaskID		LLUUID }
-		{	ItemID		LLUUID }
-		{	ChannelID	LLUUID }
-		{	IntValue	U32 }
-		{	StringValue Variable 2 } // string
-	}	
+    RpcScriptRequestInboundForward Low 416 Trusted Unencoded UDPDeprecated
+    {
+        DataBlock Single
+        {   RPCServerIP     IPADDR      }
+        {   RPCServerPort   IPPORT      }
+        {   TaskID          LLUUID      }
+        {   ItemID          LLUUID      }
+        {   ChannelID       LLUUID      }
+        {   IntValue        U32         }
+        {   StringValue     Variable 2  }   // string
+    }
 }
 
 // simulator -> rpcserver
 // Not trusted because trust establishment doesn't work here.
 {
-	RpcScriptReplyInbound Low 417 NotTrusted Unencoded
-	{
-		DataBlock Single
-		{	TaskID		LLUUID }
-		{	ItemID		LLUUID }
-		{	ChannelID	LLUUID }
-		{	IntValue	U32 }
-		{	StringValue Variable 2 } // string
-	}
+    RpcScriptReplyInbound Low 417 NotTrusted Unencoded
+    {
+        DataBlock Single
+        {   TaskID      LLUUID      }
+        {   ItemID      LLUUID      }
+        {   ChannelID   LLUUID      }
+        {   IntValue    U32         }
+        {   StringValue Variable 2  }   // string
+    }
 }
 
 
 // ScriptMailRegistration
 // Simulator -> dataserver
 {
-	ScriptMailRegistration Low 418 Trusted Unencoded
-	{
-		DataBlock Single
-		{	TargetIP		Variable 1	}	// String IP
-		{	TargetPort		IPPORT	}
-		{	TaskID			LLUUID	}
-		{	Flags			U32	}
-	}
+    ScriptMailRegistration Low 418 Trusted Unencoded
+    {
+        DataBlock Single
+        {   TargetIP    Variable 1  }   // String IP
+        {   TargetPort  IPPORT      }
+        {   TaskID      LLUUID      }
+        {   Flags       U32         }
+    }
 }
 
 // ParcelMediaCommandMessage
 // Sends a parcel media command
 {
-	ParcelMediaCommandMessage Low 419 Trusted Unencoded
-	{
-		CommandBlock Single
-		{	Flags		U32	}
-		{	Command		U32	}
-		{	Time		F32	}
-	}
+    ParcelMediaCommandMessage Low 419 Trusted Unencoded
+    {
+        CommandBlock Single
+        {   Flags   U32 }
+        {   Command U32 }
+        {   Time    F32 }
+    }
 }
 
 // ParcelMediaUpdate
 // Sends a parcel media update to a single user
 // For global updates use the parcel manager.
 {
-	ParcelMediaUpdate Low 420 Trusted Unencoded
-	{
-		DataBlock Single
-		{	MediaURL		Variable	1	}	// string
-		{	MediaID			LLUUID			}
-		{	MediaAutoScale	U8				}
-	}
-	{
-		DataBlockExtended Single
-		{   MediaType       Variable    1   }
-		{   MediaDesc       Variable    1   }
-		{   MediaWidth      S32             }
-		{   MediaHeight     S32             }
-		{   MediaLoop       U8              }
-	}
+    ParcelMediaUpdate Low 420 Trusted Unencoded
+    {
+        DataBlock Single
+        {   MediaURL        Variable 1  }   // string
+        {   MediaID         LLUUID      }
+        {   MediaAutoScale  U8          }
+    }
+    {
+        DataBlockExtended Single
+        {   MediaType   Variable 1  }
+        {   MediaDesc   Variable 1  }
+        {   MediaWidth  S32         }
+        {   MediaHeight S32         }
+        {   MediaLoop   U8          }
+    }
 }
 
 // LandStatRequest
 // Sent by the viewer to request collider/script information for a parcel
 {
-	LandStatRequest Low 421 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID		}
-		{	SessionID	LLUUID		}
-	}
-	{
-		RequestData Single
-		{	ReportType		U32				}
-		{	RequestFlags	U32				}
-		{	Filter			Variable	1	}
-		{	ParcelLocalID	S32	}
-	}
+    LandStatRequest Low 421 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        RequestData Single
+        {   ReportType      U32         }
+        {   RequestFlags    U32         }
+        {   Filter          Variable 1  }
+        {   ParcelLocalID   S32         }
+    }
 }
 
 // LandStatReply
 // Sent by the simulator in response to LandStatRequest
 {
-	LandStatReply Low 422 Trusted Unencoded UDPDeprecated
-	{
-		RequestData	Single
-		{	ReportType			U32				}
-		{	RequestFlags		U32				}
-		{	TotalObjectCount	U32				}
-	}
-	{	
-		ReportData	Variable
-		{	TaskLocalID			U32				}
-		{	TaskID				LLUUID			}
-		{	LocationX			F32				}
-		{	LocationY			F32				}
-		{	LocationZ			F32				}
-		{	Score				F32				}
-		{	TaskName			Variable	1	}
-		{	OwnerName			Variable	1	}
-	}
+    LandStatReply Low 422 Trusted Unencoded UDPDeprecated
+    {
+        RequestData Single
+        {   ReportType          U32 }
+        {   RequestFlags        U32 }
+        {   TotalObjectCount    U32 }
+    }
+    {
+        ReportData Variable
+        {   TaskLocalID U32         }
+        {   TaskID      LLUUID      }
+        {   LocationX   F32         }
+        {   LocationY   F32         }
+        {   LocationZ   F32         }
+        {   Score       F32         }
+        {   TaskName    Variable 1  }
+        {   OwnerName   Variable 1  }
+    }
 }
 
 // Generic Error -- this is used for sending an error message
 // to a UDP recipient. The lowest common denominator is to at least
 // log the message. More sophisticated receivers can do something
-// smarter, for example, a money transaction failure can put up a 
+// smarter, for example, a money transaction failure can put up a
 // more user visible UI widget.
 {
-	Error Low 423 NotTrusted Zerocoded
-	{
-		AgentData Single
-		{	AgentID		LLUUID	}				// will forward to agentid if coming from trusted circuit
-	}
-	{
-		Data Single
-		{	 Code		S32		}				// matches http status codes
-		{	 Token		Variable	1	}		// some specific short string based message
-		{	 ID			LLUUID	}				// the transactionid/uniqueid/sessionid whatever.
-		{	 System		Variable	1	} 		// The hierarchical path to the system, eg, "message/handler"
-		{	 Message	Variable	2	}		// Human readable message
-		{	 Data		Variable	2	}		// Binary serialized LLSD for extra info.
-	}
+    Error Low 423 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID LLUUID  }   // will forward to agentid if coming from trusted circuit
+    }
+    {
+        Data Single
+        {    Code       S32         }   // matches http status codes
+        {    Token      Variable 1  }   // some specific short string based message
+        {    ID         LLUUID      }   // the transactionid/uniqueid/sessionid whatever.
+        {    System     Variable 1  }   // The hierarchical path to the system, eg, "message/handler"
+        {    Message    Variable 2  }   // Human readable message
+        {    Data       Variable 2  }   // Binary serialized LLSD for extra info.
+    }
 }
 
 // ObjectIncludeInSearch
 // viewer -> simulator
 {
-	ObjectIncludeInSearch Low 424 NotTrusted Unencoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		ObjectData		Variable
-		{	ObjectLocalID	U32		}
-		{	IncludeInSearch	BOOL	}
-	}
+    ObjectIncludeInSearch Low 424 NotTrusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        ObjectData Variable
+        {   ObjectLocalID   U32     }
+        {   IncludeInSearch BOOL    }
+    }
 }
 
 
@@ -9079,57 +9143,145 @@ version 2.0
 // to rez an object out of inventory back to its position before it
 // last moved into the inventory
 {
-	RezRestoreToWorld Low 425 NotTrusted Unencoded UDPDeprecated
-	{
-		AgentData		Single
-		{	AgentID		LLUUID  }
-		{	SessionID	LLUUID	}
-	}
-	{
-		InventoryData			Single
-		{	ItemID				LLUUID	}
-		{	FolderID			LLUUID	}
-		{	CreatorID			LLUUID	}	// permissions
-		{	OwnerID				LLUUID	}	// permissions
-		{	GroupID				LLUUID	}	// permissions
-		{	BaseMask			U32	}	// permissions
-		{	OwnerMask			U32	}	// permissions
-		{	GroupMask			U32	}	// permissions
-		{	EveryoneMask		U32	}	// permissions
-		{	NextOwnerMask		U32	}	// permissions
-		{	GroupOwned			BOOL	}	// permissions
-		{	TransactionID		LLUUID	}
-		{	Type				S8	}
-		{	InvType				S8	}
-		{	Flags				U32	}
-		{	SaleType			U8	}
-		{	SalePrice			S32	}
-		{	Name				Variable	1	}
-		{	Description			Variable	1	}
-		{	CreationDate		S32	}
-		{	CRC				U32	}
-	}
+    RezRestoreToWorld Low 425 NotTrusted Unencoded UDPDeprecated
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        InventoryData Single
+        {   ItemID          LLUUID      }
+        {   FolderID        LLUUID      }
+        {   CreatorID       LLUUID      }   // permissions
+        {   OwnerID         LLUUID      }   // permissions
+        {   GroupID         LLUUID      }   // permissions
+        {   BaseMask        U32         }   // permissions
+        {   OwnerMask       U32         }   // permissions
+        {   GroupMask       U32         }   // permissions
+        {   EveryoneMask    U32         }   // permissions
+        {   NextOwnerMask   U32         }   // permissions
+        {   GroupOwned      BOOL        }   // permissions
+        {   TransactionID   LLUUID      }
+        {   Type            S8          }
+        {   InvType         S8          }
+        {   Flags           U32         }
+        {   SaleType        U8          }
+        {   SalePrice       S32         }
+        {   Name            Variable 1  }
+        {   Description     Variable 1  }
+        {   CreationDate    S32         }
+        {   CRC             U32         }
+    }
 }
 
 // Link inventory
 {
-	LinkInventoryItem	Low	426 NotTrusted	Zerocoded
-	{
-		AgentData		Single
-		{	AgentID		LLUUID	}
-		{	SessionID	LLUUID	}
-	}
-	{
-		InventoryBlock		Single
-		{	CallbackID	U32			} // Async Response
-		{	FolderID		LLUUID	}
-		{	TransactionID			LLUUID	} // Going to become TransactionID
-		{	OldItemID		LLUUID	}
-		{	Type			S8	}
-		{	InvType			S8	}
-		{	Name			Variable	1	}
-		{	Description		Variable	1	}
-
-	}
+    LinkInventoryItem Low 426 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        InventoryBlock Single
+        {   CallbackID      U32         }   // Async Response
+        {   FolderID        LLUUID      }
+        {   TransactionID   LLUUID      }   // Going to become TransactionID
+        {   OldItemID       LLUUID      }
+        {   Type            S8          }
+        {   InvType         S8          }
+        {   Name            Variable 1  }
+        {   Description     Variable 1  }
+
+    }
+}
+
+// RetrieveIMsExtended - extended version of RetrieveInstantMessages,
+//  used to get instant messages that were persisted out to the database while the user was offline
+//  sent between the simulator and dataserver
+{
+    RetrieveIMsExtended Low 427 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   IsPremium   BOOL    }
+    }
+}
+
+// JoinGroupRequestExtended
+// Extends JoinGroupRequest from viewer and passed to dataserver
+// simulator -> dataserver
+// reliable
+{
+    JoinGroupRequestExtended Low 428 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+        {   GroupLimit  S32     }
+    }
+    {
+        GroupData Single
+        {   GroupID LLUUID  }
+    }
+}
+
+// CreateGroupRequestExtended
+// simulator -> dataserver, extends data from CreateGroupRequest
+// reliable
+{
+    CreateGroupRequestExtended Low 429 Trusted Unencoded
+    {
+        AgentData Single
+        {   AgentID         LLUUID  }
+        {   SessionID       LLUUID  }
+        {   GroupLimit      S32     }
+    }
+    {
+        GroupData Single
+        {   Name            Variable 1  }   // string
+        {   Charter         Variable 2  }   // string
+        {   ShowInList      BOOL        }
+        {   InsigniaID      LLUUID      }
+        {   MembershipFee   S32         }
+        {   OpenEnrollment  BOOL        }
+        {   AllowPublish    BOOL        }   // whether profile is externally visible or not
+        {   MaturePublish   BOOL        }   // profile is "mature"
+    }
+}
+
+// viewer -> simulator
+// GameControlInput - input from game controller
+// The main payload of this message is split into two Variable chunks:
+//
+//   AxisData = list of {Index:Value} pairs.  Value is an S16 that maps to range [-1, 1]
+//   ButtonData = list of indices of pressed buttons
+//
+// Any Axis ommitted from the message is assumed by the receiving Simulator to be unchanged
+// from its previously received value.
+//
+// Any Button omitted from the message is assumed by the receiving Simulator to be unpressed.
+//
+// GameControlInput messages are sent unreliably, but when input changes stop the last
+// message will be resent at a ever increasing period to make sure the server receives it.
+//
+{
+    GameControlInput High 32 NotTrusted Zerocoded
+    {
+        AgentData Single
+        {   AgentID     LLUUID  }
+        {   SessionID   LLUUID  }
+    }
+    {
+        AxisData Variable
+        { Index U8  }
+        { Value S16 }
+    }
+    {
+        ButtonData Variable
+        { Data  Variable 1  }
+    }
 }
 
diff --git a/scripts/messages/message_template.msg.sha1 b/scripts/messages/message_template.msg.sha1
index efa5f3cf48..baa4f3f12b 100755
--- a/scripts/messages/message_template.msg.sha1
+++ b/scripts/messages/message_template.msg.sha1
@@ -1 +1 @@
-d7915d67467e59287857630bd89bf9529d065199
\ No newline at end of file
+aaecaf01b6954c156662f572dc3ecaf26de0ca67
\ No newline at end of file