Merge tag 'Second_Life_Release#01823996-2025.08' into 2025.08

250 files changed, 4738 insertions, 1843 deletions

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8f89db0923..5a5628ede2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,6 +1,7 @@
 name: Build
 
 on:
+  workflow_dispatch:
   pull_request:
   push:
     branches: ["main", "release/*", "project/*"]
@@ -309,7 +310,7 @@ jobs:
     steps:
       - name: Sign and package Windows viewer
         if: env.AZURE_KEY_VAULT_URI && env.AZURE_CERT_NAME && env.AZURE_CLIENT_ID && env.AZURE_CLIENT_SECRET && env.AZURE_TENANT_ID
-        uses: secondlife/viewer-build-util/sign-pkg-windows@v2
+        uses: secondlife/viewer-build-util/sign-pkg-windows@v2.0.4
         with:
           vault_uri: "${{ env.AZURE_KEY_VAULT_URI }}"
           cert_name: "${{ env.AZURE_CERT_NAME }}"
diff --git a/README.md b/README.md
index c01630c305..b88e27e56b 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ $ megapahit
 ### Fedora
 
 ```
-$ sudo dnf install cmake gcc-c++ patch patchelf rpm-build perl-FindBin apr-util-devel boost-devel boost-url expat-devel fltk-devel glm-devel mesa-libGLU-devel hunspell-devel minizip-ng-compat-devel libnghttp2-devel nanosvg-devel openjpeg-devel pipewire-devel pulseaudio-libs-devel SDL2-devel vlc-devel libvorbis-devel libXcursor-devel libXfixes-devel libXinerama-devel xxhash-devel
+$ sudo dnf install cmake gcc-c++ patch patchelf rpm-build perl-FindBin apr-util-devel boost-devel boost-url expat-devel fltk-devel glm-devel mesa-libGLU-devel hunspell-devel minizip-ng-compat-devel libnghttp2-devel nanosvg-devel openjpeg-devel pipewire-devel pulseaudio-libs-devel SDL2-devel v-hacd-devel vlc-devel libvorbis-devel libXcursor-devel libXfixes-devel libXinerama-devel xxhash-devel
 $ export LL_BUILD="-O3 -std=c++20 -fPIC -DLL_LINUX=1"
 ```
 build with FMOD Studio: ([register with fmod to get linux package][fmod] and then place the `.tar.gz` in `~/Downloads`)
diff --git a/autobuild.xml b/autobuild.xml
index 26c3532170..fe83b6776f 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1472,41 +1472,19 @@
       <map>
         <key>platforms</key>
         <map>
-          <key>darwin64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>f290b000b31f9e36f2489946cbc99f5e</string>
-              <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/59995/563653/llphysicsextensions_stub-1.0.542456-darwin64-542456.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>darwin64</string>
-          </map>
-          <key>linux64</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>711f4ec769e4b5f59ba25ee43c11bcbc</string>
-              <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4724/14846/llphysicsextensions_stub-1.0.504712-linux64-504712.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>linux64</string>
-          </map>
-          <key>windows64</key>
+          <key>common</key>
           <map>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>2e5f1f7046a49d8b0bc295aa878116bc</string>
+              <string>bc41438b10ac6474cf5560465a3662a64f9e65a81342e4c33f18f6694581c7ee28c9ee6f091c36e80a0b1e10c68205be71eb5f8e40fef115d2c744fc2bbfcb43</string>
+              <key>hash_algorithm</key>
+              <string>blake2b</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/60043/564063/llphysicsextensions_stub-1.0.542456-windows-542456.tar.bz2</string>
+              <string>https://github.com/AlchemyViewer/llphysicsextensions_stub/releases/download/v1.0-cb4900e/llphysicsextensions_stub-1.0-common-17836965684.tar.zst</string>
             </map>
             <key>name</key>
-            <string>windows64</string>
+            <string>common</string>
           </map>
         </map>
         <key>license</key>
@@ -1516,7 +1494,7 @@
         <key>copyright</key>
         <string>Copyright (c) 2010, Linden Research, Inc.</string>
         <key>version</key>
-        <string>1.0.542456</string>
+        <string>1.0</string>
         <key>name</key>
         <string>llphysicsextensions_stub</string>
       </map>
@@ -2947,6 +2925,38 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
         <key>description</key>
         <string>Discord Social SDK</string>
       </map>
+      <key>vhacd</key>
+      <map>
+        <key>platforms</key>
+        <map>
+          <key>common</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>140d8fc952a10edb5f2d72ab405336019ef32cadfa64f0cfce76c9de4bc6268cbc87cc8cd89d3417fb78b531d441701afc8d016bafe4bd275df2707f7daf1387</string>
+              <key>hash_algorithm</key>
+              <string>blake2b</string>
+              <key>url</key>
+              <string>https://github.com/AlchemyViewer/3p-vhacd/releases/download/v4.1.0-r2/vhacd-4.1.0-r2-common-18166921729.tar.zst</string>
+            </map>
+            <key>name</key>
+            <string>common</string>
+          </map>
+        </map>
+        <key>license</key>
+        <string>BSD</string>
+        <key>license_file</key>
+        <string>LICENSES/vhacd.txt</string>
+        <key>copyright</key>
+        <string>Copyright (c) 2011, Khaled Mamou</string>
+        <key>version</key>
+        <string>4.1.0-r2</string>
+        <key>name</key>
+        <string>vhacd</string>
+        <key>description</key>
+        <string>Voxelized Hierarchical Approximate Convex Decomposition</string>
+      </map>
     </map>
     <key>package_description</key>
     <map>
diff --git a/build.sh b/build.sh
index 6707b40f82..762eeeba67 100755
--- a/build.sh
+++ b/build.sh
@@ -70,7 +70,7 @@ installer_Darwin()
 {
   local package_name="$1"
   local package_dir="$(build_dir_Darwin)/newview/"
-  local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_x86_64\\.dmg\$"
+  local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_universal\\.dmg\$"
   # since the additional packages are built after the base package,
   # sorting oldest first ensures that the unqualified package is returned
   # even if someone makes a qualified name that duplicates the last word of the base name
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index adf30de2b5..ccc4b08447 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -61,6 +61,9 @@ add_subdirectory(cmake)
 add_subdirectory(${LIBS_OPEN_PREFIX}llaudio)
 add_subdirectory(${LIBS_OPEN_PREFIX}llappearance)
 add_subdirectory(${LIBS_OPEN_PREFIX}llcharacter)
+if (NOT HAVOK AND NOT HAVOK_TPV)
+  add_subdirectory(${LIBS_OPEN_PREFIX}llconvexdecomposition)
+endif ()
 add_subdirectory(${LIBS_OPEN_PREFIX}llcommon)
 add_subdirectory(${LIBS_OPEN_PREFIX}llcorehttp)
 add_subdirectory(${LIBS_OPEN_PREFIX}llimage)
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 4ce0d47f7f..22e94f2c8f 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -45,3 +45,8 @@ if(DARWIN)
 endif()
 
 target_include_directories(ll::apr SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/apr-1)
+
+# Fix erroneous check for __attribute__ definition introduced with APR 1.7.5, causing lots of "this declaration may not have extern 'C' linkage" errors in VS
+file(READ ${LIBS_PREBUILT_DIR}/include/apr-1/apr.h APR_HEADER_CONTENTS)
+string(REPLACE "#if !(defined(__attribute__) || defined(__has_attribute))" "#if !defined(__attribute__)" APR_HEADER_CONTENTS "${APR_HEADER_CONTENTS}")
+file(WRITE ${LIBS_PREBUILT_DIR}/include/apr-1/apr.h "${APR_HEADER_CONTENTS}")
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index a3233f1c6f..be1e9008e5 100644
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -61,6 +61,7 @@ set(cmake_SOURCE_FILES
         UI.cmake
         UnixInstall.cmake
         Variables.cmake
+        VHACD.cmake
         ViewerMiscLibs.cmake
         VisualLeakDetector.cmake
         LibVLCPlugin.cmake
diff --git a/indra/cmake/LLPhysicsExtensions.cmake b/indra/cmake/LLPhysicsExtensions.cmake
index f9870e4a28..49950be37b 100644
--- a/indra/cmake/LLPhysicsExtensions.cmake
+++ b/indra/cmake/LLPhysicsExtensions.cmake
@@ -22,6 +22,7 @@ if (HAVOK)
    include(Havok)
    use_prebuilt_binary(llphysicsextensions_source)
    set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src)
+   target_compile_definitions( llphysicsextensions_impl INTERFACE LL_HAVOK=1 )
    if(DARWIN)
       set(LLPHYSICSEXTENSIONS_STUB_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub)
       # can't set these library dependencies per-arch here, need to do it using XCODE_ATTRIBUTE_OTHER_LDFLAGS[arch=*] in newview/CMakeLists.txt
@@ -32,10 +33,15 @@ if (HAVOK)
    endif()
 elseif (HAVOK_TPV)
    use_prebuilt_binary(llphysicsextensions_tpv)
-    if (CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
-        target_link_directories( llphysicsextensions_impl INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE} )
-    endif ()
-   target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions_tpv)
+   if (CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
+      target_link_directories( llphysicsextensions_impl INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE} )
+   endif ()
+   if(WINDOWS)
+      target_link_libraries( llphysicsextensions_impl INTERFACE ${ARCH_PREBUILT_DIRS}/llphysicsextensions_tpv.lib)
+   else()
+      target_link_libraries( llphysicsextensions_impl INTERFACE ${ARCH_PREBUILT_DIRS}/libllphysicsextensions_tpv.a)
+   endif()
+   target_compile_definitions( llphysicsextensions_impl INTERFACE LL_HAVOK=1 )
 else (HAVOK)
    use_prebuilt_binary(llphysicsextensions_stub)
    set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub)
diff --git a/indra/cmake/VHACD.cmake b/indra/cmake/VHACD.cmake
new file mode 100644
index 0000000000..b368fe28e0
--- /dev/null
+++ b/indra/cmake/VHACD.cmake
@@ -0,0 +1,30 @@
+# -*- cmake -*-
+include(Prebuilt)
+
+add_library(ll::vhacd INTERFACE IMPORTED)
+
+if (FALSE)
+use_system_binary(vhacd)
+use_prebuilt_binary(vhacd)
+
+elseif (NOT (${LINUX_DISTRO} MATCHES fedora))
+    if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/vhacd_installed OR NOT ${vhacd_installed} EQUAL 0)
+        if (NOT EXISTS ${CMAKE_BINARY_DIR}/v-hacd-4.1.0.tar.gz)
+            file(DOWNLOAD
+                https://github.com/kmammou/v-hacd/archive/refs/tags/v4.1.0.tar.gz
+                ${CMAKE_BINARY_DIR}/v-hacd-4.1.0.tar.gz
+                )
+        endif ()
+        file(ARCHIVE_EXTRACT
+            INPUT ${CMAKE_BINARY_DIR}/v-hacd-4.1.0.tar.gz
+            DESTINATION ${CMAKE_BINARY_DIR}
+            )
+        file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/vhacd)
+        file(
+            COPY ${CMAKE_BINARY_DIR}/v-hacd-4.1.0/include/VHACD.h
+            DESTINATION ${LIBS_PREBUILT_DIR}/include/vhacd
+            )
+        file(WRITE ${PREBUILD_TRACKING_DIR}/vhacd_installed "0")
+    endif ()
+target_include_directories(ll::vhacd SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/vhacd/)
+endif ()
diff --git a/indra/llcommon/llleap.cpp b/indra/llcommon/llleap.cpp
index 662a2511cd..ada6b9519e 100644
--- a/indra/llcommon/llleap.cpp
+++ b/indra/llcommon/llleap.cpp
@@ -188,6 +188,17 @@ public:
                                << childout.peek(0, peeklen) << "..." << LL_ENDL;
         }
 
+        // Handle any remaining stderr data (partial lines) the same way as we do
+        // for stdout: log it.
+        LLProcess::ReadPipe& childerr(mChild->getReadPipe(LLProcess::STDERR));
+        if (childerr.size())
+        {
+            LLProcess::ReadPipe::size_type
+                peeklen((std::min)(LLProcess::ReadPipe::size_type(50), childerr.size()));
+            LL_WARNS("LLLeap") << "Final stderr " << childerr.size() << " bytes: "
+                               << childerr.peek(0, peeklen) << "..." << LL_ENDL;
+        }
+
         // Kill this instance. MUST BE LAST before return!
         delete this;
         return false;
diff --git a/indra/llcommon/tests/llprocess_test.cpp b/indra/llcommon/tests/llprocess_test.cpp
index b63cc52bec..13422612d6 100644
--- a/indra/llcommon/tests/llprocess_test.cpp
+++ b/indra/llcommon/tests/llprocess_test.cpp
@@ -54,14 +54,29 @@ std::string apr_strerror_helper(apr_status_t rv)
 *****************************************************************************/
 
 #define ensure_equals_(left, right) \
-        ensure_equals(STRINGIZE(#left << " != " << #right), (left), (right))
+do { \
+    auto _left_val = (left); \
+    auto _right_val = (right); \
+    if (_left_val != _right_val) { \
+        std::string _msg = std::string(#left) + " != " + std::string(#right); \
+        tut::ensure_equals(_msg, _left_val, _right_val); \
+    } else { \
+        tut::ensure_equals("", _left_val, _right_val); \
+    } \
+} while(0)
 
 #define aprchk(expr) aprchk_(#expr, (expr))
 static void aprchk_(const char* call, apr_status_t rv, apr_status_t expected=APR_SUCCESS)
 {
-    tut::ensure_equals(STRINGIZE(call << " => " << rv << ": " << apr_strerror_helper
-                                 (rv)),
-                       rv, expected);
+    if (rv != expected)
+    {
+        std::string msg = std::string(call) + " => " + std::to_string(rv) + ": " + apr_strerror_helper(rv);
+        tut::ensure_equals(msg, rv, expected);
+    }
+    else
+    {
+        tut::ensure_equals("", rv, expected);
+    }
 }
 
 /**
@@ -78,11 +93,14 @@ static std::string readfile(const std::string& pathname, const std::string& desc
     std::string use_desc(desc);
     if (use_desc.empty())
     {
-        use_desc = STRINGIZE("in " << pathname);
+        use_desc = "in " + pathname;
     }
     std::ifstream inf(pathname.c_str());
     std::string output;
-    tut::ensure(STRINGIZE("No output " << use_desc), bool(std::getline(inf, output)));
+    if (!std::getline(inf, output))
+    {
+        tut::ensure("No output " + use_desc, false);
+    }
     std::string more;
     while (std::getline(inf, more))
     {
@@ -108,8 +126,8 @@ void waitfor(LLProcess& proc, int timeout=60)
     {
         yield();
     }
-    tut::ensure(STRINGIZE("process took longer than " << timeout << " seconds to terminate"),
-                i < timeout);
+    std::string msg = "process took longer than " + std::to_string(timeout) + " seconds to terminate";
+    tut::ensure(msg, i < timeout);
 }
 
 void waitfor(LLProcess::handle h, const std::string& desc, int timeout=60)
@@ -119,8 +137,8 @@ void waitfor(LLProcess::handle h, const std::string& desc, int timeout=60)
     {
         yield();
     }
-    tut::ensure(STRINGIZE("process took longer than " << timeout << " seconds to terminate"),
-                i < timeout);
+    std::string msg = "process took longer than " + std::to_string(timeout) + " seconds to terminate";
+    tut::ensure(msg, i < timeout);
 }
 
 /**
@@ -153,7 +171,8 @@ struct PythonProcessLauncher
         try
         {
             mPy = LLProcess::create(mParams);
-            tut::ensure(STRINGIZE("Couldn't launch " << mDesc << " script"), bool(mPy));
+            std::string msg = "Couldn't launch " + mDesc + " script";
+            tut::ensure(msg, bool(mPy));
         }
         catch (const tut::failure&)
         {
@@ -214,7 +233,8 @@ struct PythonProcessLauncher
         mParams.args.add(out.getName());
         run();
         // assuming the script wrote to that file, read it
-        return readfile(out.getName(), STRINGIZE("from " << mDesc << " script"));
+        std::string desc = "from " + mDesc + " script";
+        return readfile(out.getName(), desc);
     }
 
     LLProcess::Params mParams;
diff --git a/indra/llconvexdecomposition/CMakeLists.txt b/indra/llconvexdecomposition/CMakeLists.txt
new file mode 100644
index 0000000000..7dae884db8
--- /dev/null
+++ b/indra/llconvexdecomposition/CMakeLists.txt
@@ -0,0 +1,39 @@
+# -*- cmake -*-
+
+project(llconvexdecomposition)
+
+include(00-Common)
+include(LLCommon)
+include(LLMath)
+include(VHACD)
+
+set(llconvexdecomposition_SOURCE_FILES
+        llconvexdecomposition.cpp
+        llconvexdecompositionvhacd.cpp
+        )
+
+set(llconvexdecomposition_HEADER_FILES
+        CMakeLists.txt
+        llconvexdecomposition.h
+        llconvexdecompositionvhacd.h
+        )
+
+set_source_files_properties(${llconvexdecomposition_HEADER_FILES}
+        PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND llconvexdecomposition_SOURCE_FILES ${llconvexdecomposition_HEADER_FILES})
+
+add_library (llconvexdecomposition ${llconvexdecomposition_SOURCE_FILES})
+target_include_directories(llconvexdecomposition INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(llconvexdecomposition
+        llcommon
+        llmath
+        ll::vhacd)
+
+if(WINDOWS)
+  target_compile_options(llconvexdecomposition PRIVATE /bigobj)
+endif()
+
+# Add tests
+
diff --git a/indra/llconvexdecomposition/llconvexdecomposition.cpp b/indra/llconvexdecomposition/llconvexdecomposition.cpp
new file mode 100644
index 0000000000..7b9d775c53
--- /dev/null
+++ b/indra/llconvexdecomposition/llconvexdecomposition.cpp
@@ -0,0 +1,83 @@
+/**
+* @file   llconvexdecomposition.cpp
+* @author falcon@lindenlab.com
+* @brief  Inner implementation of LLConvexDecomposition interface
+*
+* $LicenseInfo:firstyear=2011&license=lgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2011, 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 "linden_common.h"
+
+#include "llconvexdecompositionvhacd.h"
+#include "llconvexdecomposition.h"
+
+bool LLConvexDecomposition::s_isInitialized = false;
+
+// static
+bool LLConvexDecomposition::isFunctional()
+{
+    return LLConvexDecompositionVHACD::isFunctional();
+}
+
+// static
+LLConvexDecomposition* LLConvexDecomposition::getInstance()
+{
+    if ( !s_isInitialized )
+    {
+        return nullptr;
+    }
+    else
+    {
+        return LLConvexDecompositionVHACD::getInstance();
+    }
+}
+
+// static
+LLCDResult LLConvexDecomposition::initSystem()
+{
+    LLCDResult result = LLConvexDecompositionVHACD::initSystem();
+    if ( result == LLCD_OK )
+    {
+        s_isInitialized = true;
+    }
+    return result;
+}
+
+// static
+LLCDResult LLConvexDecomposition::initThread()
+{
+    return LLConvexDecompositionVHACD::initThread();
+}
+
+// static
+LLCDResult LLConvexDecomposition::quitThread()
+{
+    return LLConvexDecompositionVHACD::quitThread();
+}
+
+// static
+LLCDResult LLConvexDecomposition::quitSystem()
+{
+    return LLConvexDecompositionVHACD::quitSystem();
+}
+
+
diff --git a/indra/llconvexdecomposition/llconvexdecomposition.h b/indra/llconvexdecomposition/llconvexdecomposition.h
new file mode 100644
index 0000000000..8008bc6e12
--- /dev/null
+++ b/indra/llconvexdecomposition/llconvexdecomposition.h
@@ -0,0 +1,231 @@
+/**
+ * @file llconvexdecomposition.cpp
+ * @brief LLConvexDecomposition interface definition
+ *
+ * $LicenseInfo:firstyear=2011&license=lgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2011, 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_CONVEX_DECOMPOSITION
+#define LL_CONVEX_DECOMPOSITION
+
+typedef int bool32;
+
+#if defined(_WIN32) || defined(_WIN64)
+#define LLCD_CALL __cdecl
+#else
+#define LLCD_CALL
+#endif
+
+struct LLCDParam
+{
+    enum LLCDParamType
+    {
+        LLCD_INVALID = 0,
+        LLCD_INTEGER,
+        LLCD_FLOAT,
+        LLCD_BOOLEAN,
+        LLCD_ENUM
+    };
+
+    struct LLCDEnumItem
+    {
+        const char* mName;
+        int         mValue;
+    };
+
+    union LLCDValue
+    {
+        float   mFloat;
+        int     mIntOrEnumValue;
+        bool32  mBool;
+    };
+
+    union LLCDParamDetails
+    {
+        struct {
+            LLCDValue mLow;
+            LLCDValue mHigh;
+            LLCDValue mDelta;
+        } mRange;
+
+        struct {
+            int             mNumEnums;
+            LLCDEnumItem*   mEnumsArray;
+        } mEnumValues;
+    };
+
+    const char*                 mName;
+    const char*                 mDescription;
+    LLCDParamType               mType;
+    LLCDParamDetails            mDetails;
+    LLCDValue                   mDefault;
+    int                         mStage;
+
+    // WARNING: Only the LLConvexDecomposition implementation
+    // should change this value
+    int                         mReserved;
+};
+
+struct LLCDStageData
+{
+    const char* mName;
+    const char* mDescription;
+    bool32 mSupportsCallback;
+};
+
+struct LLCDMeshData
+{
+    enum IndexType
+    {
+        INT_16,
+        INT_32
+    };
+
+    const float*    mVertexBase;
+    int             mVertexStrideBytes;
+    int             mNumVertices;
+    const void*     mIndexBase;
+    IndexType       mIndexType;
+    int             mIndexStrideBytes;
+    int             mNumTriangles;
+};
+
+struct LLCDHull
+{
+    const float*    mVertexBase;
+    int             mVertexStrideBytes;
+    int             mNumVertices;
+};
+
+enum LLCDResult
+{
+    LLCD_OK = 0,
+    LLCD_UNKOWN_ERROR,
+    LLCD_NULL_PTR,
+    LLCD_INVALID_STAGE,
+    LLCD_UNKNOWN_PARAM,
+    LLCD_BAD_VALUE,
+    LLCD_REQUEST_OUT_OF_RANGE,
+    LLCD_INVALID_MESH_DATA,
+    LLCD_INVALID_HULL_DATA,
+    LLCD_STAGE_NOT_READY,
+    LLCD_INVALID_THREAD,
+    LLCD_NOT_IMPLEMENTED
+};
+
+// This callback will receive a string describing the current subtask being performed
+// as well as a pair of numbers indicating progress. (The values should not be interpreted
+// as a completion percentage as 'current' may be greater than 'final'.)
+// If the callback returns zero, the decomposition will be terminated
+typedef int             (LLCD_CALL *llcdCallbackFunc)(const char* description, int current_progress, int final_progress);
+
+class LLConvexDecomposition
+{
+public:
+    // Obtain a pointer to the actual implementation
+    static LLConvexDecomposition* getInstance();
+
+    /// @returns false if this is the stub
+    static bool isFunctional();
+
+    static LLCDResult initSystem();
+    static LLCDResult initThread();
+    static LLCDResult quitThread();
+    static LLCDResult quitSystem();
+
+    // Generate a decomposition object handle
+    virtual void genDecomposition(int& decomp) = 0;
+    // Delete decomposition object handle
+    virtual void deleteDecomposition(int decomp) = 0;
+    // Bind given decomposition handle
+    // Commands operate on currently bound decomposition
+    virtual void bindDecomposition(int decomp) = 0;
+
+    // Sets *paramsOut to the address of the LLCDParam array and returns
+    // the number of parameters
+    virtual int getParameters(const LLCDParam** paramsOut) = 0;
+
+
+    // Sets *stagesOut to the address of the LLCDStageData array and returns
+    // the number of stages
+    virtual int getStages(const LLCDStageData** stagesOut) = 0;
+
+
+    // Set a parameter by name. Pass enum values as integers.
+    virtual LLCDResult  setParam(const char* name, float val)   = 0;
+    virtual LLCDResult  setParam(const char* name, int val)     = 0;
+    virtual LLCDResult  setParam(const char* name, bool val)    = 0;
+
+
+    // Set incoming mesh data. Data is copied to local buffers and will
+    // persist until the next setMeshData call
+    virtual LLCDResult  setMeshData( const LLCDMeshData* data, bool vertex_based ) = 0;
+
+
+    // Register a callback to be called periodically during the specified stage
+    // See the typedef above for more information
+    virtual LLCDResult  registerCallback( int stage, llcdCallbackFunc callback ) = 0;
+
+
+    // Execute the specified decomposition stage
+    virtual LLCDResult  executeStage(int stage) = 0;
+    virtual LLCDResult  buildSingleHull() = 0 ;
+
+
+    // Gets the number of hulls generated by the specified decompositions stage
+    virtual int getNumHullsFromStage(int stage) = 0;
+
+
+    // Populates hullOut to reference the internal copy of the requested hull
+    // The data will persist only until the next executeStage call for that stage.
+    virtual LLCDResult  getHullFromStage( int stage, int hull, LLCDHull* hullOut ) = 0;
+
+    virtual LLCDResult  getSingleHull( LLCDHull* hullOut ) = 0 ;
+
+
+    // TODO: Implement lock of some kind to disallow this call if data not yet ready
+    // Populates the meshDataOut to reference the utility's copy of the mesh geometry
+    // for the hull and stage specified.
+    // You must copy this data if you want to continue using it after the next executeStage
+    // call
+    virtual LLCDResult  getMeshFromStage( int stage, int hull, LLCDMeshData* meshDataOut) = 0;
+
+
+    // Creates a mesh from hullIn and temporarily stores it internally in the utility.
+    // The mesh data persists only until the next call to getMeshFromHull
+    virtual LLCDResult  getMeshFromHull( LLCDHull* hullIn, LLCDMeshData* meshOut ) = 0;
+
+    // Takes meshIn, generates a single convex hull from it, converts that to a mesh
+    // stored internally, and populates meshOut to reference the internally stored data.
+    // The data is persistent only until the next call to generateSingleHullMeshFromMesh
+    virtual LLCDResult generateSingleHullMeshFromMesh( LLCDMeshData* meshIn, LLCDMeshData* meshOut) = 0;
+
+    //
+    /// Debug
+    virtual void loadMeshData(const char* fileIn, LLCDMeshData** meshDataOut) = 0;
+
+private:
+    static bool s_isInitialized;
+};
+
+#endif //LL_CONVEX_DECOMPOSITION
+
diff --git a/indra/llconvexdecomposition/llconvexdecompositionvhacd.cpp b/indra/llconvexdecomposition/llconvexdecompositionvhacd.cpp
new file mode 100644
index 0000000000..78876f9f36
--- /dev/null
+++ b/indra/llconvexdecomposition/llconvexdecompositionvhacd.cpp
@@ -0,0 +1,492 @@
+/**
+* @file   llconvexdecompositionvhacd.cpp
+* @author rye@alchemyviewer.org
+* @brief  A VHACD based implementation of LLConvexDecomposition
+*
+* $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 "linden_common.h"
+
+#include "llmath.h"
+#include "v3math.h"
+
+#include <string.h>
+#include <memory>
+
+#define ENABLE_VHACD_IMPLEMENTATION 1
+#include "VHACD.h"
+
+#include "llconvexdecompositionvhacd.h"
+
+constexpr S32 MAX_HULLS = 256;
+constexpr S32 MAX_VERTICES_PER_HULL = 256;
+
+bool LLConvexDecompositionVHACD::isFunctional()
+{
+    return true;
+}
+
+LLConvexDecomposition* LLConvexDecompositionVHACD::getInstance()
+{
+    return LLSimpleton::getInstance();
+}
+
+LLCDResult LLConvexDecompositionVHACD::initSystem()
+{
+    createInstance();
+    return LLCD_OK;
+}
+
+LLCDResult LLConvexDecompositionVHACD::initThread()
+{
+    return LLCD_OK;
+}
+
+LLCDResult LLConvexDecompositionVHACD::quitThread()
+{
+    return LLCD_OK;
+}
+
+LLCDResult LLConvexDecompositionVHACD::quitSystem()
+{
+    deleteSingleton();
+    return LLCD_OK;
+}
+
+LLConvexDecompositionVHACD::LLConvexDecompositionVHACD()
+{
+    //Create our vhacd instance and setup default parameters
+    mVHACD = VHACD::CreateVHACD();
+
+    mVHACDParameters.m_callback = &mVHACDCallback;
+    mVHACDParameters.m_logger = &mVHACDLogger;
+
+    mDecompStages[0].mName = "Analyze";
+    mDecompStages[0].mDescription = nullptr;
+
+    LLCDParam param;
+    param.mName = "Fill Mode";
+    param.mDescription = nullptr;
+    param.mType = LLCDParam::LLCD_ENUM;
+    param.mDetails.mEnumValues.mNumEnums = 3;
+
+    static LLCDParam::LLCDEnumItem fill_enums[3];
+    fill_enums[(size_t)VHACD::FillMode::FLOOD_FILL].mName = "Flood";
+    fill_enums[(size_t)VHACD::FillMode::FLOOD_FILL].mValue = (int)VHACD::FillMode::FLOOD_FILL;
+    fill_enums[(size_t)VHACD::FillMode::SURFACE_ONLY].mName = "Surface Only";
+    fill_enums[(size_t)VHACD::FillMode::SURFACE_ONLY].mValue = (int)VHACD::FillMode::SURFACE_ONLY;
+    fill_enums[(size_t)VHACD::FillMode::RAYCAST_FILL].mName = "Raycast";
+    fill_enums[(size_t)VHACD::FillMode::RAYCAST_FILL].mValue = (int)VHACD::FillMode::RAYCAST_FILL;
+
+    param.mDetails.mEnumValues.mEnumsArray = fill_enums;
+    param.mDefault.mIntOrEnumValue = (int)VHACD::FillMode::FLOOD_FILL;
+    param.mStage = 0;
+    param.mReserved = -1;
+    mDecompParams.push_back(param);
+
+    enum EVoxelQualityLevels
+    {
+        E_LOW_QUALITY = 0,
+        E_NORMAL_QUALITY,
+        E_HIGH_QUALITY,
+        E_VERY_HIGH_QUALITY,
+        E_ULTRA_QUALITY,
+        E_MAX_QUALITY,
+        E_NUM_QUALITY_LEVELS
+    };
+
+    param.mName = "Voxel Resolution";
+    param.mDescription = nullptr;
+    param.mType = LLCDParam::LLCD_ENUM;
+    param.mDetails.mEnumValues.mNumEnums = E_NUM_QUALITY_LEVELS;
+
+    static LLCDParam::LLCDEnumItem voxel_quality_enums[E_NUM_QUALITY_LEVELS];
+    voxel_quality_enums[E_LOW_QUALITY].mName = "Low";
+    voxel_quality_enums[E_LOW_QUALITY].mValue = 200000;
+    voxel_quality_enums[E_NORMAL_QUALITY].mName = "Normal";
+    voxel_quality_enums[E_NORMAL_QUALITY].mValue = 400000;
+    voxel_quality_enums[E_HIGH_QUALITY].mName = "High";
+    voxel_quality_enums[E_HIGH_QUALITY].mValue = 800000;
+    voxel_quality_enums[E_VERY_HIGH_QUALITY].mName = "Very High";
+    voxel_quality_enums[E_VERY_HIGH_QUALITY].mValue = 1200000;
+    voxel_quality_enums[E_ULTRA_QUALITY].mName = "Ultra";
+    voxel_quality_enums[E_ULTRA_QUALITY].mValue = 1600000;
+    voxel_quality_enums[E_MAX_QUALITY].mName = "Maximum";
+    voxel_quality_enums[E_MAX_QUALITY].mValue = 2000000;
+
+    param.mDetails.mEnumValues.mEnumsArray = voxel_quality_enums;
+    param.mDefault.mIntOrEnumValue = 400000;
+    param.mStage = 0;
+    param.mReserved = -1;
+    mDecompParams.push_back(param);
+
+    param.mName = "Num Hulls";
+    param.mDescription = nullptr;
+    param.mType = LLCDParam::LLCD_FLOAT;
+    param.mDetails.mRange.mLow.mFloat = 1.f;
+    param.mDetails.mRange.mHigh.mFloat = MAX_HULLS;
+    param.mDetails.mRange.mDelta.mFloat = 1.f;
+    param.mDefault.mFloat = 8.f;
+    param.mStage = 0;
+    param.mReserved = -1;
+    mDecompParams.push_back(param);
+
+    param.mName = "Num Vertices";
+    param.mDescription = nullptr;
+    param.mType = LLCDParam::LLCD_FLOAT;
+    param.mDetails.mRange.mLow.mFloat = 3.f;
+    param.mDetails.mRange.mHigh.mFloat = MAX_VERTICES_PER_HULL;
+    param.mDetails.mRange.mDelta.mFloat = 1.f;
+    param.mDefault.mFloat = 32.f;
+    param.mStage = 0;
+    param.mReserved = -1;
+    mDecompParams.push_back(param);
+
+    param.mName = "Error Tolerance";
+    param.mDescription = nullptr;
+    param.mType = LLCDParam::LLCD_FLOAT;
+    param.mDetails.mRange.mLow.mFloat = 0.0001f;
+    param.mDetails.mRange.mHigh.mFloat = 99.f;
+    param.mDetails.mRange.mDelta.mFloat = 0.001f;
+    param.mDefault.mFloat = 1.f;
+    param.mStage = 0;
+    param.mReserved = -1;
+    mDecompParams.push_back(param);
+
+    for (const LLCDParam& param : mDecompParams)
+    {
+        const char* const name = param.mName;
+
+        switch (param.mType)
+        {
+        case LLCDParam::LLCD_FLOAT:
+        {
+            setParam(name, param.mDefault.mFloat);
+            break;
+        }
+        case LLCDParam::LLCD_ENUM:
+        case LLCDParam::LLCD_INTEGER:
+        {
+            setParam(name, param.mDefault.mIntOrEnumValue);
+            break;
+        }
+        case LLCDParam::LLCD_BOOLEAN:
+        {
+            setParam(name, (param.mDefault.mBool != 0));
+            break;
+        }
+        case LLCDParam::LLCD_INVALID:
+        default:
+        {
+            break;
+        }
+        }
+    }
+}
+
+LLConvexDecompositionVHACD::~LLConvexDecompositionVHACD()
+{
+    mBoundDecomp = nullptr;
+    mDecompData.clear();
+
+    mVHACD->Release();
+}
+
+void LLConvexDecompositionVHACD::genDecomposition(int& decomp)
+{
+    int new_decomp_id = static_cast<int>(mDecompData.size()) + 1;
+    mDecompData[new_decomp_id] = LLDecompData();
+    decomp = new_decomp_id;
+}
+
+void LLConvexDecompositionVHACD::deleteDecomposition(int decomp)
+{
+    auto iter = mDecompData.find(decomp);
+    if (iter != mDecompData.end())
+    {
+        if (mBoundDecomp == &iter->second)
+        {
+            mBoundDecomp = nullptr;
+        }
+        mDecompData.erase(iter);
+    }
+}
+
+void LLConvexDecompositionVHACD::bindDecomposition(int decomp)
+{
+    auto iter = mDecompData.find(decomp);
+    if (iter != mDecompData.end())
+    {
+        mBoundDecomp = &iter->second;
+    }
+    else
+    {
+        LL_WARNS() << "Failed to bind unknown decomposition: " << decomp << LL_ENDL;
+        mBoundDecomp = nullptr;
+    }
+}
+
+LLCDResult LLConvexDecompositionVHACD::setParam(const char* name, float val)
+{
+    if (name == std::string("Num Hulls"))
+    {
+        mVHACDParameters.m_maxConvexHulls = llclamp(ll_round(val), 1, MAX_HULLS);
+    }
+    else if (name == std::string("Num Vertices"))
+    {
+        mVHACDParameters.m_maxNumVerticesPerCH = llclamp(ll_round(val), 3, MAX_VERTICES_PER_HULL);
+    }
+    else if (name == std::string("Error Tolerance"))
+    {
+        mVHACDParameters.m_minimumVolumePercentErrorAllowed = val;
+    }
+    return LLCD_OK;
+}
+
+LLCDResult LLConvexDecompositionVHACD::setParam(const char* name, bool val)
+{
+    return LLCD_OK;
+}
+
+LLCDResult LLConvexDecompositionVHACD::setParam(const char* name, int val)
+{
+    if (name == std::string("Fill Mode"))
+    {
+        mVHACDParameters.m_fillMode = (VHACD::FillMode)val;
+    }
+    else if (name == std::string("Voxel Resolution"))
+    {
+        mVHACDParameters.m_resolution = val;
+    }
+    return LLCD_OK;
+}
+
+LLCDResult LLConvexDecompositionVHACD::setMeshData( const LLCDMeshData* data, bool vertex_based )
+{
+    if (!mBoundDecomp)
+    {
+        return LLCD_NULL_PTR;
+    }
+
+    return mBoundDecomp->mSourceMesh.from(data, vertex_based);
+}
+
+LLCDResult LLConvexDecompositionVHACD::registerCallback(int stage, llcdCallbackFunc callback )
+{
+    if (stage == 0)
+    {
+        mVHACDCallback.setCallbackFunc(callback);
+        return LLCD_OK;
+    }
+    else
+    {
+        return LLCD_INVALID_STAGE;
+    }
+}
+
+LLCDResult LLConvexDecompositionVHACD::executeStage(int stage)
+{
+    if (!mBoundDecomp)
+    {
+        return LLCD_NULL_PTR;
+    }
+
+    if (stage != 0)
+    {
+        return LLCD_INVALID_STAGE;
+    }
+
+    mBoundDecomp->mDecomposedHulls.clear();
+
+    const auto& decomp_mesh = mBoundDecomp->mSourceMesh;
+    if (!mVHACD->Compute((const double* const)decomp_mesh.mVertices.data(), static_cast<uint32_t>(decomp_mesh.mVertices.size()), (const uint32_t* const)decomp_mesh.mIndices.data(), static_cast<uint32_t>(decomp_mesh.mIndices.size()), mVHACDParameters))
+    {
+        return LLCD_INVALID_HULL_DATA;
+    }
+
+    uint32_t num_nulls = mVHACD->GetNConvexHulls();
+    if (num_nulls == 0)
+    {
+        return LLCD_INVALID_HULL_DATA;
+    }
+
+    for (uint32_t i = 0; num_nulls > i; ++i)
+    {
+        VHACD::IVHACD::ConvexHull ch;
+        if (!mVHACD->GetConvexHull(i, ch))
+            continue;
+
+        LLConvexMesh out_mesh;
+        out_mesh.setVertices(ch.m_points);
+        out_mesh.setIndices(ch.m_triangles);
+
+        mBoundDecomp->mDecomposedHulls.push_back(std::move(out_mesh));
+    }
+
+    mVHACD->Clean();
+
+    return LLCD_OK;
+}
+
+LLCDResult LLConvexDecompositionVHACD::buildSingleHull()
+{
+    LL_INFOS() << "Building single hull mesh" << LL_ENDL;
+    if (!mBoundDecomp || mBoundDecomp->mSourceMesh.mVertices.empty())
+    {
+        return LLCD_NULL_PTR;
+    }
+
+    mBoundDecomp->mSingleHullMesh.clear();
+
+    VHACD::QuickHull quickhull;
+    uint32_t num_tris = quickhull.ComputeConvexHull(mBoundDecomp->mSourceMesh.mVertices, MAX_VERTICES_PER_HULL);
+    if (num_tris > 0)
+    {
+        mBoundDecomp->mSingleHullMesh.setVertices(quickhull.GetVertices());
+        mBoundDecomp->mSingleHullMesh.setIndices(quickhull.GetIndices());
+
+        return LLCD_OK;
+    }
+
+    return LLCD_INVALID_MESH_DATA;
+}
+
+int LLConvexDecompositionVHACD::getNumHullsFromStage(int stage)
+{
+    if (!mBoundDecomp || stage != 0)
+    {
+        return 0;
+    }
+
+    return narrow(mBoundDecomp->mDecomposedHulls.size());
+}
+
+LLCDResult LLConvexDecompositionVHACD::getSingleHull( LLCDHull* hullOut )
+{
+    memset( hullOut, 0, sizeof(LLCDHull) );
+
+    if (!mBoundDecomp)
+    {
+        return LLCD_NULL_PTR;
+    }
+
+    if (mBoundDecomp->mSingleHullMesh.vertices.empty())
+    {
+        return LLCD_INVALID_HULL_DATA;
+    }
+
+    mBoundDecomp->mSingleHullMesh.to(hullOut);
+    return LLCD_OK;
+}
+
+LLCDResult LLConvexDecompositionVHACD::getHullFromStage( int stage, int hull, LLCDHull* hullOut )
+{
+    memset( hullOut, 0, sizeof(LLCDHull) );
+
+    if (!mBoundDecomp)
+    {
+        return LLCD_NULL_PTR;
+    }
+
+    if (stage != 0)
+    {
+        return LLCD_INVALID_STAGE;
+    }
+
+    if (mBoundDecomp->mDecomposedHulls.empty() || mBoundDecomp->mDecomposedHulls.size() <= hull)
+    {
+        return LLCD_REQUEST_OUT_OF_RANGE;
+    }
+
+    mBoundDecomp->mDecomposedHulls[hull].to(hullOut);
+    return LLCD_OK;
+}
+
+LLCDResult LLConvexDecompositionVHACD::getMeshFromStage( int stage, int hull, LLCDMeshData* meshDataOut )
+{
+    memset( meshDataOut, 0, sizeof(LLCDMeshData));
+    if (!mBoundDecomp)
+    {
+        return LLCD_NULL_PTR;
+    }
+
+    if (stage != 0)
+    {
+        return LLCD_INVALID_STAGE;
+    }
+
+    if (mBoundDecomp->mDecomposedHulls.empty() || mBoundDecomp->mDecomposedHulls.size() <= hull)
+    {
+        return LLCD_REQUEST_OUT_OF_RANGE;
+    }
+
+    mBoundDecomp->mDecomposedHulls[hull].to(meshDataOut);
+    return LLCD_OK;
+}
+
+LLCDResult LLConvexDecompositionVHACD::getMeshFromHull( LLCDHull* hullIn, LLCDMeshData* meshOut )
+{
+    memset(meshOut, 0, sizeof(LLCDMeshData));
+
+    LLVHACDMesh inMesh(hullIn);
+
+    VHACD::QuickHull quickhull;
+    uint32_t num_tris = quickhull.ComputeConvexHull(inMesh.mVertices, MAX_VERTICES_PER_HULL);
+    if (num_tris > 0)
+    {
+        mMeshFromHullData.setVertices(quickhull.GetVertices());
+        mMeshFromHullData.setIndices(quickhull.GetIndices());
+
+        mMeshFromHullData.to(meshOut);
+        return LLCD_OK;
+    }
+
+    return LLCD_INVALID_HULL_DATA;
+}
+
+LLCDResult LLConvexDecompositionVHACD::generateSingleHullMeshFromMesh(LLCDMeshData* meshIn, LLCDMeshData* meshOut)
+{
+    memset( meshOut, 0, sizeof(LLCDMeshData) );
+
+    LLVHACDMesh inMesh(meshIn, true);
+
+    VHACD::QuickHull quickhull;
+    uint32_t num_tris = quickhull.ComputeConvexHull(inMesh.mVertices, MAX_VERTICES_PER_HULL);
+    if (num_tris > 0)
+    {
+        mSingleHullMeshFromMeshData.setVertices(quickhull.GetVertices());
+        mSingleHullMeshFromMeshData.setIndices(quickhull.GetIndices());
+
+        mSingleHullMeshFromMeshData.to(meshOut);
+        return LLCD_OK;
+    }
+
+    return LLCD_INVALID_MESH_DATA;
+}
+
+void LLConvexDecompositionVHACD::loadMeshData(const char* fileIn, LLCDMeshData** meshDataOut)
+{
+    static LLCDMeshData meshData;
+    memset( &meshData, 0, sizeof(LLCDMeshData) );
+    *meshDataOut = &meshData;
+}
diff --git a/indra/llconvexdecomposition/llconvexdecompositionvhacd.h b/indra/llconvexdecomposition/llconvexdecompositionvhacd.h
new file mode 100644
index 0000000000..675356629c
--- /dev/null
+++ b/indra/llconvexdecomposition/llconvexdecompositionvhacd.h
@@ -0,0 +1,339 @@
+/**
+* @file   llconvexdecompositionvhacd.h
+* @author rye@alchemyviewer.org
+* @brief  A VHACD based implementation of LLConvexDecomposition
+*
+* $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_CONVEX_DECOMP_UTIL_VHACD_H
+#define LL_CONVEX_DECOMP_UTIL_VHACD_H
+
+#include "llconvexdecomposition.h"
+#include "llsingleton.h"
+#include "llmath.h"
+
+#include <vector>
+
+#include "VHACD.h"
+
+class LLDecompDataVHACD;
+
+class LLConvexDecompositionVHACD : public LLSimpleton<LLConvexDecompositionVHACD>, public LLConvexDecomposition
+{
+    class VHACDCallback : public VHACD::IVHACD::IUserCallback
+    {
+    public:
+        void Update(const double overallProgress, const double stageProgress, const char* const stage, const char* operation) override
+        {
+            std::string out_msg = llformat("Stage: %s Operation: %s", stage, operation);
+            if (mCurrentStage != stage && mCurrentOperation != operation)
+            {
+                mCurrentStage = stage;
+                mCurrentOperation = operation;
+                LL_INFOS("VHACD") << out_msg << LL_ENDL;
+            }
+
+            if(mCallbackFunc)
+            {
+                mCallbackFunc(out_msg.c_str(), ll_round(static_cast<F32>(stageProgress)), ll_round(static_cast<F32>(overallProgress)));
+            }
+        }
+
+        void setCallbackFunc(llcdCallbackFunc func)
+        {
+            mCallbackFunc = func;
+        }
+
+    private:
+        std::string mCurrentStage;
+        std::string mCurrentOperation;
+        llcdCallbackFunc mCallbackFunc = nullptr;
+    };
+
+    class VHACDLogger : public VHACD::IVHACD::IUserLogger
+    {
+        void Log(const char* const msg) override
+        {
+            LL_INFOS("VHACD") << msg << LL_ENDL;
+        }
+    };
+
+public:
+
+    LLConvexDecompositionVHACD();
+    virtual ~LLConvexDecompositionVHACD();
+
+    static bool isFunctional();
+    static LLConvexDecomposition* getInstance();
+    static LLCDResult initSystem();
+    static LLCDResult initThread();
+    static LLCDResult quitThread();
+    static LLCDResult quitSystem();
+
+    void genDecomposition(int& decomp);
+    void deleteDecomposition(int decomp);
+    void bindDecomposition(int decomp);
+
+    // Sets *paramsOut to the address of the LLCDParam array and returns
+    // the length of the array
+    int getParameters(const LLCDParam** paramsOut)
+    {
+        *paramsOut = mDecompParams.data();
+        return narrow(mDecompParams.size());
+    }
+
+    int getStages(const LLCDStageData** stagesOut)
+    {
+        *stagesOut = mDecompStages.data();
+        return narrow(mDecompStages.size());
+    }
+
+    // Set a parameter by name. Returns false if out of bounds or unsupported parameter
+    LLCDResult  setParam(const char* name, float val);
+    LLCDResult  setParam(const char* name, int val);
+    LLCDResult  setParam(const char* name, bool val);
+    LLCDResult  setMeshData( const LLCDMeshData* data, bool vertex_based );
+    LLCDResult  registerCallback(int stage, llcdCallbackFunc callback );
+
+    LLCDResult  executeStage(int stage);
+    LLCDResult  buildSingleHull();
+
+    int getNumHullsFromStage(int stage);
+
+    LLCDResult  getHullFromStage( int stage, int hull, LLCDHull* hullOut );
+    LLCDResult  getSingleHull( LLCDHull* hullOut ) ;
+
+    // TODO: Implement lock of some kind to disallow this call if data not yet ready
+    LLCDResult  getMeshFromStage( int stage, int hull, LLCDMeshData* meshDataOut);
+    LLCDResult  getMeshFromHull( LLCDHull* hullIn, LLCDMeshData* meshOut );
+
+    // For visualizing convex hull shapes in the viewer physics shape display
+    LLCDResult generateSingleHullMeshFromMesh( LLCDMeshData* meshIn, LLCDMeshData* meshOut);
+
+    /// Debug
+    void loadMeshData(const char* fileIn, LLCDMeshData** meshDataOut);
+
+private:
+    std::vector<LLCDParam>       mDecompParams;
+    std::array<LLCDStageData, 1> mDecompStages;
+
+    struct LLVHACDMesh
+    {
+        using vertex_type = VHACD::Vertex;
+        using index_type = VHACD::Triangle;
+        using vertex_array_type = std::vector<vertex_type>;
+        using index_array_type = std::vector<index_type>;
+
+        LLVHACDMesh() = default;
+        LLVHACDMesh(const LLCDHull* hullIn)
+        {
+            if (hullIn)
+            {
+                from(hullIn);
+            }
+        };
+
+        LLVHACDMesh(const LLCDMeshData* meshIn, bool vertex_based)
+        {
+            if (meshIn)
+            {
+                from(meshIn, vertex_based);
+            }
+        };
+
+        void clear()
+        {
+            mVertices.clear();
+            mIndices.clear();
+        }
+
+        void setVertices(const float* data, int num_vertices, int vertex_stride_bytes)
+        {
+            vertex_array_type vertices;
+            vertices.reserve(num_vertices);
+
+            const int stride = vertex_stride_bytes / sizeof(float);
+            for (int i = 0; i < num_vertices; ++i)
+            {
+                vertices.emplace_back(data[i * stride + 0],
+                    data[i * stride + 1],
+                    data[i * stride + 2]);
+            }
+
+            mVertices = std::move(vertices);
+        }
+
+        void setIndices(const void* data, int num_indices, int index_stride_bytes, LLCDMeshData::IndexType type)
+        {
+            index_array_type indices;
+            indices.reserve(num_indices);
+
+            if (type == LLCDMeshData::INT_16)
+            {
+                const U16* index_data = static_cast<const U16*>(data);
+                const int stride = index_stride_bytes / sizeof(U16);
+                for (int i = 0; i < num_indices; ++i)
+                {
+                    indices.emplace_back(index_data[i * stride + 0],
+                                         index_data[i * stride + 1],
+                                         index_data[i * stride + 2]);
+                }
+            }
+            else
+            {
+                const U32* index_data = static_cast<const U32*>(data);
+                const int stride = index_stride_bytes / sizeof(U32);
+                for (int i = 0; i < num_indices; ++i)
+                {
+                    indices.emplace_back(index_data[i * stride + 0],
+                                         index_data[i * stride + 1],
+                                         index_data[i * stride + 2]);
+                }
+            }
+
+            mIndices = std::move(indices);
+        }
+
+        LLCDResult from(const LLCDHull* hullIn)
+        {
+            clear();
+
+            if (!hullIn || !hullIn->mVertexBase || (hullIn->mNumVertices < 3) || (hullIn->mVertexStrideBytes != 12 && hullIn->mVertexStrideBytes != 16))
+            {
+                return LLCD_INVALID_HULL_DATA;
+            }
+
+            setVertices(hullIn->mVertexBase, hullIn->mNumVertices, hullIn->mVertexStrideBytes);
+
+            return LLCD_OK;
+        }
+
+        LLCDResult from(const LLCDMeshData* meshIn, bool vertex_based)
+        {
+            clear();
+
+            if (!meshIn || !meshIn->mVertexBase || (meshIn->mNumVertices < 3) || (meshIn->mVertexStrideBytes != 12 && meshIn->mVertexStrideBytes != 16))
+            {
+                return LLCD_INVALID_MESH_DATA;
+            }
+
+            if (!vertex_based && ((meshIn->mNumTriangles < 1) || !meshIn->mIndexBase))
+            {
+                return LLCD_INVALID_MESH_DATA;
+            }
+
+            setVertices(meshIn->mVertexBase, meshIn->mNumVertices, meshIn->mVertexStrideBytes);
+            if(!vertex_based)
+            {
+                setIndices(meshIn->mIndexBase, meshIn->mNumTriangles, meshIn->mIndexStrideBytes, meshIn->mIndexType);
+            }
+
+            return LLCD_OK;
+        }
+
+        vertex_array_type mVertices;
+        index_array_type mIndices;
+    };
+
+    struct LLConvexMesh
+    {
+        using vertex_type = glm::vec3;
+        using index_type = glm::u32vec3;
+        using vertex_array_type = std::vector<vertex_type>;
+        using index_array_type = std::vector<index_type>;
+
+        LLConvexMesh() = default;
+
+        void clear()
+        {
+            vertices.clear();
+            indices.clear();
+        }
+
+        void setVertices(const std::vector<VHACD::Vertex>& in_vertices)
+        {
+            vertices.clear();
+            vertices.reserve(in_vertices.size());
+
+            for (const auto& vertex : in_vertices)
+            {
+                vertices.emplace_back(narrow(vertex.mX), narrow(vertex.mY), narrow(vertex.mZ));
+            }
+        }
+
+        void setIndices(const std::vector<VHACD::Triangle>& in_indices)
+        {
+            indices.clear();
+            indices.reserve(in_indices.size());
+
+            for (const auto& triangle : in_indices)
+            {
+                indices.emplace_back(narrow(triangle.mI0), narrow(triangle.mI1), narrow(triangle.mI2));
+            }
+        }
+
+        void to(LLCDHull* meshOut) const
+        {
+            meshOut->mVertexBase = (float*)vertices.data();
+            meshOut->mVertexStrideBytes = sizeof(vertex_type);
+            meshOut->mNumVertices = (int)vertices.size();
+        }
+
+        void to(LLCDMeshData* meshOut) const
+        {
+            meshOut->mVertexBase = (float*)vertices.data();
+            meshOut->mVertexStrideBytes = sizeof(vertex_type);
+            meshOut->mNumVertices = (int)vertices.size();
+
+            meshOut->mIndexType = LLCDMeshData::INT_32;
+            meshOut->mIndexBase = indices.data();
+            meshOut->mIndexStrideBytes = sizeof(index_type);
+            meshOut->mNumTriangles = (int)indices.size();
+        }
+
+        vertex_array_type vertices;
+        index_array_type indices;
+    };
+
+    struct LLDecompData
+    {
+        LLVHACDMesh mSourceMesh;
+        LLConvexMesh mSingleHullMesh;
+
+        std::vector<LLConvexMesh> mDecomposedHulls;
+    };
+
+    std::unordered_map<int, LLDecompData> mDecompData;
+
+    LLDecompData* mBoundDecomp = nullptr;
+
+    VHACD::IVHACD* mVHACD = nullptr;
+    VHACDCallback  mVHACDCallback;
+    VHACDLogger    mVHACDLogger;
+    VHACD::IVHACD::Parameters mVHACDParameters;
+
+    LLConvexMesh mMeshFromHullData;
+    LLConvexMesh mSingleHullMeshFromMeshData;
+};
+
+#endif //LL_CONVEX_DECOMP_UTIL_VHACD_H
diff --git a/indra/llcorehttp/llhttpconstants.cpp b/indra/llcorehttp/llhttpconstants.cpp
index 40d6c7506c..7a671543d9 100755
--- a/indra/llcorehttp/llhttpconstants.cpp
+++ b/indra/llcorehttp/llhttpconstants.cpp
@@ -100,6 +100,7 @@ const std::string HTTP_IN_HEADER_LOCATION("location");
 const std::string HTTP_IN_HEADER_RETRY_AFTER("retry-after");
 const std::string HTTP_IN_HEADER_SET_COOKIE("set-cookie");
 const std::string HTTP_IN_HEADER_USER_AGENT("user-agent");
+const std::string HTTP_IN_HEADER_X_CONTENT_TYPE_OPTIONS("x-content-type-options");
 const std::string HTTP_IN_HEADER_X_FORWARDED_FOR("x-forwarded-for");
 
 const std::string HTTP_CONTENT_LLSD_XML("application/llsd+xml");
@@ -122,6 +123,7 @@ const std::string HTTP_CONTENT_IMAGE_BMP("image/bmp");
 
 const std::string HTTP_NO_CACHE("no-cache");
 const std::string HTTP_NO_CACHE_CONTROL("no-cache, max-age=0");
+const std::string HTTP_NOSNIFF("nosniff");
 
 const std::string HTTP_VERB_INVALID("(invalid)");
 const std::string HTTP_VERB_HEAD("HEAD");
diff --git a/indra/llcorehttp/llhttpconstants.h b/indra/llcorehttp/llhttpconstants.h
index 583f9fbcb7..71c1dfa173 100755
--- a/indra/llcorehttp/llhttpconstants.h
+++ b/indra/llcorehttp/llhttpconstants.h
@@ -190,6 +190,7 @@ extern const std::string HTTP_IN_HEADER_LOCATION;
 extern const std::string HTTP_IN_HEADER_RETRY_AFTER;
 extern const std::string HTTP_IN_HEADER_SET_COOKIE;
 extern const std::string HTTP_IN_HEADER_USER_AGENT;
+extern const std::string HTTP_IN_HEADER_X_CONTENT_TYPE_OPTIONS;
 extern const std::string HTTP_IN_HEADER_X_FORWARDED_FOR;
 
 //// HTTP Content Types ////
@@ -215,5 +216,6 @@ extern const std::string HTTP_CONTENT_IMAGE_BMP;
 //// HTTP Cache Settings ////
 extern const std::string HTTP_NO_CACHE;
 extern const std::string HTTP_NO_CACHE_CONTROL;
+extern const std::string HTTP_NOSNIFF;
 
 #endif
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index 5b672bf171..9350901324 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -554,11 +554,6 @@ public:
 
         }
 
-        if (!opj_setup_encoder(encoder, &parameters, image))
-        {
-            return false;
-        }
-
         U32 width_tiles = (rawImageIn.getWidth() >> 6);
         U32 height_tiles = (rawImageIn.getHeight() >> 6);
 
@@ -572,6 +567,19 @@ public:
             height_tiles = 1;
         }
 
+        if (width_tiles == 1 || height_tiles == 1)
+        {
+            // Images with either dimension less than 32 need less number of resolutions otherwise they error
+            int min_dim = rawImageIn.getWidth() < rawImageIn.getHeight() ? rawImageIn.getWidth() : rawImageIn.getHeight();
+            int max_res = 1 + (int)floor(log2(min_dim));
+            parameters.numresolution = max_res;
+        }
+
+        if (!opj_setup_encoder(encoder, &parameters, image))
+        {
+            return false;
+        }
+
         U32 tile_count = width_tiles * height_tiles;
         U32 data_size_guess = tile_count * TILE_SIZE;
 
diff --git a/indra/llinventory/llpermissions.cpp b/indra/llinventory/llpermissions.cpp
index ebf7445c65..b17e22e465 100644
--- a/indra/llinventory/llpermissions.cpp
+++ b/indra/llinventory/llpermissions.cpp
@@ -774,6 +774,7 @@ void LLPermissions::importLLSD(const LLSD& sd_perm)
         }
     }
 
+    fixOwnership();
     fix();
 }
 
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index e5521e0ffc..0cf5ecd3d0 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -5713,6 +5713,8 @@ bool LLVolumeFace::cacheOptimize(bool gen_tangents)
         {
             try
             {
+                // providing mIndices should help avoid unused vertices
+                // but those should have been filtered out on upload
                 vert_count = static_cast<S32>(meshopt_generateVertexRemapMulti(&remap[0], nullptr, data.p.size(), data.p.size(), mos, stream_count));
             }
             catch (std::bad_alloc&)
@@ -5722,10 +5724,16 @@ bool LLVolumeFace::cacheOptimize(bool gen_tangents)
             }
         }
 
-        if (vert_count < 65535 && vert_count != 0)
+        // Probably should be using meshopt_remapVertexBuffer instead of remaping manually
+        if (vert_count < 65535 && vert_count > 0)
         {
             //copy results back into volume
             resizeVertices(vert_count);
+            if (mNumVertices == 0)
+            {
+                LLError::LLUserWarningMsg::showOutOfMemory();
+                LL_ERRS("LLCoros") << "Failed to allocate memory for resizeVertices(" << vert_count << ")" << LL_ENDL;
+            }
 
             if (!data.w.empty())
             {
@@ -5738,13 +5746,27 @@ bool LLVolumeFace::cacheOptimize(bool gen_tangents)
             {
                 U32 src_idx = i;
                 U32 dst_idx = remap[i];
-                if (dst_idx >= (U32)mNumVertices)
+                if (dst_idx == U32_MAX)
+                {
+                    // Unused indices? Probably need to resize mIndices
+                    dst_idx = mNumVertices - 1;
+                    llassert(false);
+                    LL_DEBUGS_ONCE("LLVOLUME") << "U32_MAX destination index, substituting" << LL_ENDL;
+                }
+                else if (dst_idx >= (U32)mNumVertices)
                 {
                     dst_idx = mNumVertices - 1;
                     // Shouldn't happen, figure out what gets returned in remap and why.
                     llassert(false);
                     LL_DEBUGS_ONCE("LLVOLUME") << "Invalid destination index, substituting" << LL_ENDL;
                 }
+                if (src_idx >= (U32)data.p.size())
+                {
+                    // data.p.size() is supposed to be equal to mNumIndices
+                    src_idx = (U32)(data.p.size() - 1);
+                    llassert(false);
+                    LL_DEBUGS_ONCE("LLVOLUME") << "Invalid source index, substituting" << LL_ENDL;
+                }
                 mIndices[i] = dst_idx;
 
                 mPositions[dst_idx].load3(data.p[src_idx].mV);
@@ -5778,7 +5800,7 @@ bool LLVolumeFace::cacheOptimize(bool gen_tangents)
         }
         else
         {
-            if (vert_count == 0)
+            if (vert_count <= 0)
             {
                 LL_WARNS_ONCE("LLVOLUME") << "meshopt_generateVertexRemapMulti failed to process a model or model was invalid" << LL_ENDL;
             }
diff --git a/indra/llmessage/llcoproceduremanager.cpp b/indra/llmessage/llcoproceduremanager.cpp
index 563dd9459c..5c7b1c4235 100644
--- a/indra/llmessage/llcoproceduremanager.cpp
+++ b/indra/llmessage/llcoproceduremanager.cpp
@@ -138,7 +138,22 @@ LLCoprocedureManager::LLCoprocedureManager()
 
 LLCoprocedureManager::~LLCoprocedureManager()
 {
-    close();
+    try
+    {
+        close();
+    }
+    catch (const boost::fibers::fiber_error&)
+    {
+        LL_WARNS() << "Fiber error during ~LLCoprocedureManager()" << LL_ENDL;
+    }
+    catch (const std::exception& e)
+    {
+        // Shutting down, just log it
+        LL_WARNS() << "Exception during ~LLCoprocedureManager(): " << e.what() << LL_ENDL;
+    }
+    mPropertyQueryFn.clear();
+    mPropertyDefineFn.clear();
+    mPoolMap.clear();
 }
 
 void LLCoprocedureManager::initializePool(const std::string &poolName, size_t queue_size)
@@ -365,6 +380,22 @@ LLCoprocedurePool::LLCoprocedurePool(const std::string &poolName, size_t size, s
 
 LLCoprocedurePool::~LLCoprocedurePool()
 {
+    try
+    {
+        close(); // should have been closed already, but shouldn't hurt
+        mStatusListener.disconnect();
+        mPendingCoprocs.reset();
+        mCoroMapping.clear();
+    }
+    catch (const boost::fibers::fiber_error&)
+    {
+        LL_WARNS() << "Fiber error during ~LLCoprocedurePool() " << mPoolName << LL_ENDL;
+    }
+    catch (const std::exception& e)
+    {
+        // Shutting down, just log it
+        LL_WARNS() << "Exception " << e.what() << " during ~LLCoprocedurePool() in " << mPoolName << LL_ENDL;
+    }
 }
 
 //-------------------------------------------------------------------------
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
index b084098532..0e8f591800 100644
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -92,6 +92,12 @@ target_link_libraries(llprimitive
         ll::glm
         )
 
+if (TARGET llconvexdecomposition)
+    target_link_libraries(llprimitive
+            llconvexdecomposition
+            )
+endif ()
+
 include(LibraryInstall)
 
 #add unit tests
diff --git a/indra/llprimitive/llgltfmaterial.cpp b/indra/llprimitive/llgltfmaterial.cpp
index cc4921416f..930222e3db 100644
--- a/indra/llprimitive/llgltfmaterial.cpp
+++ b/indra/llprimitive/llgltfmaterial.cpp
@@ -923,3 +923,34 @@ void LLGLTFMaterial::updateTextureTracking()
     // setTEGLTFMaterialOverride is responsible for tracking
     // for material overrides editor will set it
 }
+
+void LLGLTFMaterial::convertTextureTransformToPBR(
+    F32 tex_scale_s,
+    F32 tex_scale_t,
+    F32 tex_offset_s,
+    F32 tex_offset_t,
+    F32 tex_rotation,
+    LLVector2& pbr_scale,
+    LLVector2& pbr_offset,
+    F32& pbr_rotation)
+{
+    pbr_scale.set(tex_scale_s, tex_scale_t);
+    pbr_rotation = -(tex_rotation) / 2.f;
+    const F32 adjusted_offset_s = tex_offset_s;
+    const F32 adjusted_offset_t = -tex_offset_t;
+    F32 center_adjust_s = 0.5f * (1.0f - tex_scale_s);
+    F32 center_adjust_t = 0.5f * (1.0f - tex_scale_t);
+
+    if (pbr_rotation != 0.0f)
+    {
+        const F32 c = cosf(pbr_rotation);
+        const F32 s = sinf(pbr_rotation);
+        const F32 tmp_s = center_adjust_s * c - center_adjust_t * s;
+        const F32 tmp_t = center_adjust_s * s + center_adjust_t * c;
+        center_adjust_s = tmp_s;
+        center_adjust_t = tmp_t;
+    }
+
+    pbr_offset.set(adjusted_offset_s + center_adjust_s,
+                   adjusted_offset_t + center_adjust_t);
+}
diff --git a/indra/llprimitive/llgltfmaterial.h b/indra/llprimitive/llgltfmaterial.h
index b89853c9fd..6bb021254b 100644
--- a/indra/llprimitive/llgltfmaterial.h
+++ b/indra/llprimitive/llgltfmaterial.h
@@ -215,6 +215,14 @@ public:
     bool hasLocalTextures() { return !mTrackingIdToLocalTexture.empty(); }
     virtual bool replaceLocalTexture(const LLUUID& tracking_id, const LLUUID &old_id, const LLUUID& new_id);
     virtual void updateTextureTracking();
+
+    // Convert legacy TE transform values to PBR transform values.
+    static void convertTextureTransformToPBR(F32 tex_scale_s, F32 tex_scale_t,
+                                             F32 tex_offset_s, F32 tex_offset_t,
+                                             F32 tex_rotation,
+                                             LLVector2& pbr_scale,
+                                             LLVector2& pbr_offset,
+                                             F32& pbr_rotation);
 protected:
     static LLVector2 vec2FromJson(const std::map<std::string, tinygltf::Value>& object, const char* key, const LLVector2& default_value);
     static F32 floatFromJson(const std::map<std::string, tinygltf::Value>& object, const char* key, const F32 default_value);
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 98faa88968..db752411fc 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -1296,10 +1296,10 @@ LLModel::weight_list& LLModel::getJointInfluences(const LLVector3& pos)
 }
 
 void LLModel::setConvexHullDecomposition(
-    const LLModel::convex_hull_decomposition& decomp)
+    const LLModel::convex_hull_decomposition& decomp, const std::vector<LLModel::PhysicsMesh>& decomp_mesh)
 {
     mPhysics.mHull = decomp;
-    mPhysics.mMesh.clear();
+    mPhysics.mMesh = decomp_mesh;
     updateHullCenters();
 }
 
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index a4ba6acd7e..854c77e63a 100644
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -307,7 +307,8 @@ public:
     S32 mDecompID;
 
     void setConvexHullDecomposition(
-        const convex_hull_decomposition& decomp);
+        const convex_hull_decomposition& decomp,
+        const std::vector<LLModel::PhysicsMesh>& decomp_mesh);
     void updateHullCenters();
 
     LLVector3 mCenterOfHullCenters;
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index 9ff483b92b..bc80bd9556 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -1152,6 +1152,8 @@ void sub_image_lines(U32 target, S32 miplevel, S32 x_offset, S32 y_offset, S32 w
         // full width texture, do 32 lines at a time
         for (U32 y_pos = y_offset; y_pos < y_offset_end; y_pos += batch_size)
         {
+            // If this keeps crashing, pass down data_size, looks like it is using
+            // imageraw->getData(); for data, but goes way over allocated size limit
             glTexSubImage2D(target, miplevel, x_offset, y_pos, width, batch_size, pixformat, pixtype, src);
             src += line_width * batch_size;
         }
@@ -1161,6 +1163,8 @@ void sub_image_lines(U32 target, S32 miplevel, S32 x_offset, S32 y_offset, S32 w
         // partial width or strange height
         for (U32 y_pos = y_offset; y_pos < y_offset_end; y_pos += 1)
         {
+            // If this keeps crashing, pass down data_size, looks like it is using
+            // imageraw->getData(); for data, but goes way over allocated size limit
             glTexSubImage2D(target, miplevel, x_offset, y_pos, width, 1, pixformat, pixtype, src);
             src += line_width;
         }
@@ -1635,6 +1639,7 @@ bool LLImageGL::createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S
         llassert(mCurrentDiscardLevel >= 0);
         discard_level = mCurrentDiscardLevel;
     }
+    discard_level = llmin(discard_level, MAX_DISCARD_LEVEL);
 
     // Actual image width/height = raw image width/height * 2^discard_level
     S32 raw_w = imageraw->getWidth() ;
@@ -1741,6 +1746,7 @@ bool LLImageGL::createGLTexture(S32 discard_level, const U8* data_in, bool data_
         discard_level = mCurrentDiscardLevel;
     }
     discard_level = llclamp(discard_level, 0, (S32)mMaxDiscardLevel);
+    discard_level = llmin(discard_level, MAX_DISCARD_LEVEL);
 
     if (main_thread // <--- always force creation of new_texname when not on main thread ...
         && !defer_copy // <--- ... or defer copy is set
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 6dd3634309..ea8530f282 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -1050,6 +1050,7 @@ void LLShaderMgr::clearShaderCache()
     LL_INFOS("ShaderMgr") << "Removing shader cache at " << shader_cache << LL_ENDL;
     const std::string mask = "*";
     gDirUtilp->deleteFilesInDir(shader_cache, mask);
+    LLFile::rmdir(shader_cache);
     mShaderBinaryCache.clear();
 }
 
diff --git a/indra/llui/llaccordionctrl.cpp b/indra/llui/llaccordionctrl.cpp
index 495ba2f40f..1a64c2699d 100644
--- a/indra/llui/llaccordionctrl.cpp
+++ b/indra/llui/llaccordionctrl.cpp
@@ -303,8 +303,11 @@ void LLAccordionCtrl::ctrlSetLeftTopAndSize(LLView* panel, S32 left, S32 top, S3
         return;
     LLRect panel_rect = panel->getRect();
     panel_rect.setLeftTopAndSize( left, top, width, height);
-    panel->reshape( width, height, 1);
-    panel->setRect(panel_rect);
+    if (panel->getRect() != panel_rect)
+    {
+        panel->reshape( width, height, 1);
+        panel->setRect(panel_rect);
+    }
 }
 
 void LLAccordionCtrl::ctrlShiftVertical(LLView* panel, S32 delta)
@@ -494,6 +497,7 @@ void LLAccordionCtrl::arrangeMultiple()
 
 void LLAccordionCtrl::arrange()
 {
+    LL_PROFILE_ZONE_SCOPED;
     updateNoTabsHelpTextVisibility();
 
     if (mAccordionTabs.empty())
diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp
index ac66525030..bdf93348bb 100644
--- a/indra/llui/llaccordionctrltab.cpp
+++ b/indra/llui/llaccordionctrltab.cpp
@@ -248,10 +248,22 @@ void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::draw()
 void LLAccordionCtrlTab::LLAccordionCtrlTabHeader::reshape(S32 width, S32 height, bool called_from_parent /* = true */)
 {
     S32 header_height = mHeaderTextbox->getTextPixelHeight();
+    LLRect old_header_rect = mHeaderTextbox->getRect();
 
     LLRect textboxRect(HEADER_TEXT_LEFT_OFFSET, (height + header_height) / 2, width, (height - header_height) / 2);
-    mHeaderTextbox->reshape(textboxRect.getWidth(), textboxRect.getHeight());
-    mHeaderTextbox->setRect(textboxRect);
+    if (old_header_rect.getHeight() != textboxRect.getHeight()
+        || old_header_rect.mLeft != textboxRect.mLeft
+        || old_header_rect.mTop != textboxRect.mTop
+        || old_header_rect.getWidth() > textboxRect.getWidth() // reducing header's width
+        || (old_header_rect.getWidth() < textboxRect.getWidth() && old_header_rect.getWidth() < mHeaderTextbox->getTextPixelWidth()))
+    {
+        // Expensive text reflow
+        // Update if position or height changes
+        // Update if width reduces
+        // But do not update if text already fits and width increases (arguably LLTextBox::reshape should be smarter, not Accordion)
+        mHeaderTextbox->reshape(textboxRect.getWidth(), textboxRect.getHeight());
+        mHeaderTextbox->setRect(textboxRect);
+    }
 
     if (mHeaderTextbox->getTextPixelWidth() > mHeaderTextbox->getRect().getWidth())
     {
@@ -416,8 +428,11 @@ void LLAccordionCtrlTab::reshape(S32 width, S32 height, bool called_from_parent
     LLRect headerRect;
 
     headerRect.setLeftTopAndSize(0, height, width, HEADER_HEIGHT);
-    mHeader->setRect(headerRect);
-    mHeader->reshape(headerRect.getWidth(), headerRect.getHeight());
+    if (mHeader->getRect() != headerRect)
+    {
+        mHeader->setRect(headerRect);
+        mHeader->reshape(headerRect.getWidth(), headerRect.getHeight());
+    }
 
     if (!mDisplayChildren)
         return;
@@ -932,7 +947,7 @@ void LLAccordionCtrlTab::adjustContainerPanel(const LLRect& child_rect)
         show_hide_scrollbar(child_rect);
         updateLayout(child_rect);
     }
-    else
+    else if (mContainerPanel->getRect() != child_rect)
     {
         mContainerPanel->reshape(child_rect.getWidth(), child_rect.getHeight());
         mContainerPanel->setRect(child_rect);
diff --git a/indra/llui/llemojidictionary.cpp b/indra/llui/llemojidictionary.cpp
index 925608e47e..16e6f0591a 100644
--- a/indra/llui/llemojidictionary.cpp
+++ b/indra/llui/llemojidictionary.cpp
@@ -390,14 +390,17 @@ void LLEmojiDictionary::loadEmojis()
             continue;
         }
 
+        std::string category;
         std::list<std::string> categories = loadCategories(sd);
         if (categories.empty())
         {
-            LL_WARNS() << "Skipping invalid emoji descriptor (no categories)" << LL_ENDL;
-            continue;
+            // Should already have a localization for "other symbols"
+            category = "other symbols";
+        }
+        else
+        {
+            category = categories.front();
         }
-
-        std::string category = categories.front();
 
         if (std::find(mSkipCategories.begin(), mSkipCategories.end(), category) != mSkipCategories.end())
         {
diff --git a/indra/llui/llemojihelper.cpp b/indra/llui/llemojihelper.cpp
index b2c59ce775..7cdd19bebc 100644
--- a/indra/llui/llemojihelper.cpp
+++ b/indra/llui/llemojihelper.cpp
@@ -117,7 +117,17 @@ void LLEmojiHelper::showHelper(LLUICtrl* hostctrl_p, S32 local_x, S32 local_y, c
     S32 top = floater_y - HELPER_FLOATER_OFFSET_Y + rect.getHeight();
     rect.setLeftTopAndSize(left, top, rect.getWidth(), rect.getHeight());
     pHelperFloater->setRect(rect);
+
+    // Hack: Trying to open floater, search for a match,
+    // and hide floater immediately if no match found,
+    // instead of checking prior to opening
+    //
+    // Supress sounds in case floater won't be shown.
+    // Todo: add some kind of shouldShow(short_code)
+    U8 sound_flags = pHelperFloater->getSoundFlags();
+    pHelperFloater->setSoundFlags(LLView::SILENT);
     pHelperFloater->openFloater(LLSD().with("hint", short_code));
+    pHelperFloater->setSoundFlags(sound_flags);
 }
 
 void LLEmojiHelper::hideHelper(const LLUICtrl* ctrl_p, bool strict)
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index fd07b2ec5d..52a5e3dbd6 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2274,7 +2274,7 @@ void LLFloater::drawConeToOwner(F32 &context_cone_opacity,
         LLRect local_rect = getLocalRect();
 
         gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
-        LLGLEnable(GL_CULL_FACE);
+        LLGLEnable cull_face(GL_CULL_FACE);
         gGL.begin(LLRender::TRIANGLE_STRIP);
         {
             gGL.color4f(0.f, 0.f, 0.f, contex_cone_in_alpha * context_cone_opacity);
diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index b664065532..db4ab8487e 100644
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -1510,6 +1510,7 @@ bool LLFolderView::handleRightMouseDown( S32 x, S32 y, MASK mask )
         && ( count > 0 && (hasVisibleChildren()) ))) && // show menu only if selected items are visible
         !hide_folder_menu)
     {
+        LL_INFOS("Inventory") << "Opening inventory menu from path: " << getPathname() << LL_ENDL;
         if (mCallbackRegistrar)
         {
             mCallbackRegistrar->pushScope();
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 9ca77dbe46..878f1cb856 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -1884,10 +1884,18 @@ void LLFolderViewFolder::updateHasFavorites(bool new_childs_value)
 void LLFolderViewFolder::onIdleUpdateFavorites(void* data)
 {
     LLFolderViewFolder* self = reinterpret_cast<LLFolderViewFolder*>(data);
+    if (self->mFavoritesDirtyFlags == FAVORITE_CLEANUP)
+    {
+        // parent or child already processed the update, clean the callback
+        self->mFavoritesDirtyFlags = 0;
+        gIdleCallbacks.deleteFunction(&LLFolderViewFolder::onIdleUpdateFavorites, data);
+        return;
+    }
+
     if (self->mFavoritesDirtyFlags == 0)
     {
-        // already processed either on previous run or by a different callback
-        gIdleCallbacks.deleteFunction(&LLFolderViewFolder::onIdleUpdateFavorites, self);
+        llassert(false); // should not happen, everything that sets to 0 should clean callback
+        gIdleCallbacks.deleteFunction(&LLFolderViewFolder::onIdleUpdateFavorites, data);
         return;
     }
 
@@ -1915,7 +1923,7 @@ void LLFolderViewFolder::onIdleUpdateFavorites(void* data)
                     // Parent will remove onIdleUpdateFavorites later, don't remove now,
                     // We are inside gIdleCallbacks. Removing 'self' callback is safe,
                     // but removing 'parent' can invalidate following iterator
-                    parent->mFavoritesDirtyFlags = 0;
+                    parent->mFavoritesDirtyFlags = FAVORITE_CLEANUP;
                 }
                 parent = parent->getParentFolder();
             }
@@ -1981,7 +1989,7 @@ void LLFolderViewFolder::onIdleUpdateFavorites(void* data)
                         // Parent will remove onIdleUpdateFavorites later, don't remove now,
                         // We are inside gIdleCallbacks. Removing 'self' callback is safe,
                         // but removing 'parent' can invalidate following iterator
-                        parent->mFavoritesDirtyFlags = 0;
+                        parent->mFavoritesDirtyFlags = FAVORITE_CLEANUP;
                     }
                     parent = parent->getParentFolder();
                 }
@@ -1992,7 +2000,7 @@ void LLFolderViewFolder::onIdleUpdateFavorites(void* data)
                 // Parent will remove onIdleUpdateFavorites later, don't remove now.
                 // We are inside gIdleCallbacks. Removing 'self' callback is safe,
                 // but removing 'parent' can invalidate following iterator
-                parent->mFavoritesDirtyFlags = 0;
+                parent->mFavoritesDirtyFlags = FAVORITE_CLEANUP;
             }
             parent = parent->getParentFolder();
         }
@@ -2106,10 +2114,14 @@ void LLFolderViewFolder::setOpen(bool openitem)
     {
         // navigateToFolder can destroy this view
         // delay it in case setOpen was called from click or key processing
-        doOnIdleOneTime([this]()
-                        {
-                            getViewModelItem()->navigateToFolder();
-                        });
+        LLPointer<LLFolderViewModelItem> view_model_item = mViewModelItem;
+        doOnIdleOneTime([view_model_item]()
+        {
+            if (view_model_item.notNull())
+            {
+                view_model_item.get()->navigateToFolder();
+            }
+        });
     }
     else
     {
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index c9b003b892..23d794bf26 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -421,6 +421,7 @@ private:
 
     constexpr static S32 FAVORITE_ADDED = 1;
     constexpr static S32 FAVORITE_REMOVED = 2;
+    constexpr static S32 FAVORITE_CLEANUP = 4;
     S32 mFavoritesDirtyFlags { 0 };
 public:
 
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 3fe0df1848..1de12896eb 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -185,6 +185,7 @@ LLTextBase::LLTextBase(const LLTextBase::Params &p)
     mURLClickSignal(NULL),
     mIsFriendSignal(NULL),
     mIsObjectBlockedSignal(NULL),
+    mIsObjectReachableSignal(NULL),
     mMaxTextByteLength( p.max_text_length ),
     mFont(p.font),
     mFontShadow(p.font_shadow),
@@ -290,6 +291,7 @@ LLTextBase::~LLTextBase()
     delete mURLClickSignal;
     delete mIsFriendSignal;
     delete mIsObjectBlockedSignal;
+    delete mIsObjectReachableSignal;
 }
 
 void LLTextBase::initFromParams(const LLTextBase::Params& p)
@@ -1446,6 +1448,8 @@ void LLTextBase::reshape(S32 width, S32 height, bool called_from_parent)
         // up-to-date mVisibleTextRect
         updateRects();
 
+        // Todo: This might be wrong. updateRects already sets needsReflow conditionaly.
+        // Reflow is expensive and doing it at any twith can be too much.
         needsReflow();
     }
 }
@@ -2281,6 +2285,15 @@ void LLTextBase::createUrlContextMenu(S32 x, S32 y, const std::string &in_url)
                 unblockButton->setVisible(is_blocked);
             }
         }
+
+        if (mIsObjectReachableSignal)
+        {
+            bool is_reachable = *(*mIsObjectReachableSignal)(LLUUID(LLUrlAction::getObjectId(url)));
+            if (LLView* zoom_btn = menu->getChild<LLView>("zoom_in"))
+            {
+                zoom_btn->setEnabled(is_reachable);
+            }
+        }
         menu->show(x, y);
         LLMenuGL::showPopup(this, menu, x, y);
     }
@@ -3387,6 +3400,15 @@ boost::signals2::connection LLTextBase::setIsObjectBlockedCallback(const is_bloc
     return mIsObjectBlockedSignal->connect(cb);
 }
 
+boost::signals2::connection LLTextBase::setIsObjectReachableCallback(const is_obj_reachable_signal_t::slot_type& cb)
+{
+    if (!mIsObjectReachableSignal)
+    {
+        mIsObjectReachableSignal = new is_obj_reachable_signal_t();
+    }
+    return mIsObjectReachableSignal->connect(cb);
+}
+
 //
 // LLTextSegment
 //
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 8ca653acb9..07cd9a1ee5 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -325,6 +325,7 @@ public:
 
     typedef boost::signals2::signal<bool (const LLUUID& user_id)> is_friend_signal_t;
     typedef boost::signals2::signal<bool (const LLUUID& blocked_id, const std::string from)> is_blocked_signal_t;
+    typedef boost::signals2::signal<bool (const LLUUID& obj_id)> is_obj_reachable_signal_t;
 
     struct LineSpacingParams : public LLInitParam::ChoiceBlock<LineSpacingParams>
     {
@@ -535,6 +536,7 @@ public:
     boost::signals2::connection setURLClickedCallback(const commit_signal_t::slot_type& cb);
     boost::signals2::connection setIsFriendCallback(const is_friend_signal_t::slot_type& cb);
     boost::signals2::connection setIsObjectBlockedCallback(const is_blocked_signal_t::slot_type& cb);
+    boost::signals2::connection setIsObjectReachableCallback(const is_obj_reachable_signal_t::slot_type& cb);
 
     void                    setWordWrap(bool wrap);
     LLScrollContainer*      getScrollContainer() const { return mScroller; }
@@ -783,6 +785,7 @@ protected:
     // Used to check if user with given ID is avatar's friend
     is_friend_signal_t*         mIsFriendSignal;
     is_blocked_signal_t*        mIsObjectBlockedSignal;
+    is_obj_reachable_signal_t*  mIsObjectReachableSignal;
 
     LLUIString                  mLabel; // text label that is visible when no user text provided
 };
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index 5955a28fa3..56ab6e9bae 100644
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -1054,7 +1054,7 @@ bool LLToolBar::handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop,
     // if drop is set, it's time to call the callback to get the operation done
     if (handled && drop)
     {
-        handled = mHandleDropCallback(cargo_data, x, y, this);
+        handled = mHandleDropCallback(cargo_data, cargo_type, x, y, this);
     }
 
     // We accept only single tool drop on toolbars
diff --git a/indra/llui/lltoolbar.h b/indra/llui/lltoolbar.h
index 5556406fbd..a3f044c256 100644
--- a/indra/llui/lltoolbar.h
+++ b/indra/llui/lltoolbar.h
@@ -41,7 +41,7 @@ class LLIconCtrl;
 
 typedef boost::function<void (S32 x, S32 y, LLToolBarButton* button)> tool_startdrag_callback_t;
 typedef boost::function<bool (S32 x, S32 y, const LLUUID& uuid, LLAssetType::EType type)> tool_handledrag_callback_t;
-typedef boost::function<bool (void* data, S32 x, S32 y, LLToolBar* toolbar)> tool_handledrop_callback_t;
+typedef boost::function<bool (void* data, EDragAndDropType cargo_type, S32 x, S32 y, LLToolBar* toolbar)> tool_handledrop_callback_t;
 
 class LLToolBarButton : public LLButton
 {
diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp
index 7e2b5d2741..d453ad0c7b 100644
--- a/indra/llwebrtc/llwebrtc.cpp
+++ b/indra/llwebrtc/llwebrtc.cpp
@@ -390,8 +390,6 @@ void LLWebRTCImpl::terminate()
 
     mSignalingThread->BlockingCall([this]() { mPeerConnectionFactory = nullptr; });
 
-    mPeerConnections.clear();
-
     mWorkerThread->BlockingCall(
         [this]()
         {
@@ -402,6 +400,14 @@ void LLWebRTCImpl::terminate()
             mDeviceModule     = nullptr;
             mTaskQueueFactory = nullptr;
         });
+
+    // In case peer connections still somehow have jobs in workers,
+    // only clear connections up after clearing workers.
+    mNetworkThread = nullptr;
+    mWorkerThread = nullptr;
+    mSignalingThread = nullptr;
+
+    mPeerConnections.clear();
     webrtc::LogMessage::RemoveLogToStream(mLogSink);
 }
 
@@ -651,6 +657,13 @@ void LLWebRTCImpl::OnDevicesUpdated()
 void LLWebRTCImpl::setTuningMode(bool enable)
 {
     mTuningMode = enable;
+    if (!mTuningMode
+        && !mMute
+        && mPeerCustomProcessor
+        && mPeerCustomProcessor->getGain() != mGain)
+    {
+        mPeerCustomProcessor->setGain(mGain);
+    }
     mWorkerThread->PostTask(
         [this]
         {
@@ -782,6 +795,7 @@ void LLWebRTCImpl::freePeerConnection(LLWebRTCPeerConnectionInterface* peer_conn
     std::find(mPeerConnections.begin(), mPeerConnections.end(), peer_connection);
     if (it != mPeerConnections.end())
     {
+        // Todo: make sure conection had no jobs in workers
         mPeerConnections.erase(it);
         if (mPeerConnections.empty())
         {
@@ -801,7 +815,8 @@ LLWebRTCPeerConnectionImpl::LLWebRTCPeerConnectionImpl() :
     mWebRTCImpl(nullptr),
     mPeerConnection(nullptr),
     mMute(MUTE_INITIAL),
-    mAnswerReceived(false)
+    mAnswerReceived(false),
+    mPendingJobs(0)
 {
 }
 
@@ -809,6 +824,10 @@ LLWebRTCPeerConnectionImpl::~LLWebRTCPeerConnectionImpl()
 {
     mSignalingObserverList.clear();
     mDataObserverList.clear();
+    if (mPendingJobs > 0)
+    {
+        RTC_LOG(LS_ERROR) << __FUNCTION__ << "Destroying a connection that has " << std::to_string(mPendingJobs) << " unfinished jobs that might cause workers to crash";
+    }
 }
 
 //
@@ -820,8 +839,10 @@ void LLWebRTCPeerConnectionImpl::init(LLWebRTCImpl * webrtc_impl)
     mWebRTCImpl = webrtc_impl;
     mPeerConnectionFactory = mWebRTCImpl->getPeerConnectionFactory();
 }
+
 void LLWebRTCPeerConnectionImpl::terminate()
 {
+    mPendingJobs++;
     mWebRTCImpl->PostSignalingTask(
         [this]()
         {
@@ -864,7 +885,9 @@ void LLWebRTCPeerConnectionImpl::terminate()
                     observer->OnPeerConnectionClosed();
                 }
             }
+            mPendingJobs--;
         });
+    mPeerConnectionFactory.release();
 }
 
 void LLWebRTCPeerConnectionImpl::setSignalingObserver(LLWebRTCSignalingObserver *observer) { mSignalingObserverList.emplace_back(observer); }
@@ -885,6 +908,7 @@ bool LLWebRTCPeerConnectionImpl::initializeConnection(const LLWebRTCPeerConnecti
     RTC_DCHECK(!mPeerConnection);
     mAnswerReceived = false;
 
+    mPendingJobs++;
     mWebRTCImpl->PostSignalingTask(
         [this,options]()
         {
@@ -906,6 +930,13 @@ bool LLWebRTCPeerConnectionImpl::initializeConnection(const LLWebRTCPeerConnecti
             config.set_max_port(60100);
 
             webrtc::PeerConnectionDependencies pc_dependencies(this);
+            if (mPeerConnectionFactory == nullptr)
+            {
+                RTC_LOG(LS_ERROR) << __FUNCTION__ << "Error creating peer connection, factory doesn't exist";
+                // Too early?
+                mPendingJobs--;
+                return;
+            }
             auto error_or_peer_connection = mPeerConnectionFactory->CreatePeerConnectionOrError(config, std::move(pc_dependencies));
             if (error_or_peer_connection.ok())
             {
@@ -918,6 +949,7 @@ bool LLWebRTCPeerConnectionImpl::initializeConnection(const LLWebRTCPeerConnecti
                 {
                     observer->OnRenegotiationNeeded();
                 }
+                mPendingJobs--;
                 return;
             }
 
@@ -980,6 +1012,7 @@ bool LLWebRTCPeerConnectionImpl::initializeConnection(const LLWebRTCPeerConnecti
 
             webrtc::PeerConnectionInterface::RTCOfferAnswerOptions offerOptions;
             mPeerConnection->CreateOffer(this, offerOptions);
+            mPendingJobs--;
         });
 
     return true;
@@ -1022,6 +1055,7 @@ void LLWebRTCPeerConnectionImpl::AnswerAvailable(const std::string &sdp)
 {
     RTC_LOG(LS_INFO) << __FUNCTION__ << " Remote SDP: " << sdp;
 
+    mPendingJobs++;
     mWebRTCImpl->PostSignalingTask(
                                [this, sdp]()
                                {
@@ -1031,6 +1065,7 @@ void LLWebRTCPeerConnectionImpl::AnswerAvailable(const std::string &sdp)
                                        mPeerConnection->SetRemoteDescription(webrtc::CreateSessionDescription(webrtc::SdpType::kAnswer, sdp),
                                                                              webrtc::scoped_refptr<webrtc::SetRemoteDescriptionObserverInterface>(this));
                                    }
+                                   mPendingJobs--;
                                });
 }
 
@@ -1053,6 +1088,7 @@ void LLWebRTCPeerConnectionImpl::setMute(bool mute)
     mMute = new_state;
 
 
+    mPendingJobs++;
     mWebRTCImpl->PostSignalingTask(
         [this, force_reset, enable]()
         {
@@ -1076,6 +1112,7 @@ void LLWebRTCPeerConnectionImpl::setMute(bool mute)
                     track->set_enabled(enable);
                 }
             }
+            mPendingJobs--;
         }
     });
 }
@@ -1097,6 +1134,7 @@ void LLWebRTCPeerConnectionImpl::resetMute()
 
 void LLWebRTCPeerConnectionImpl::setReceiveVolume(float volume)
 {
+    mPendingJobs++;
     mWebRTCImpl->PostSignalingTask(
         [this, volume]()
         {
@@ -1115,11 +1153,13 @@ void LLWebRTCPeerConnectionImpl::setReceiveVolume(float volume)
                     }
                 }
             }
+            mPendingJobs--;
         });
 }
 
 void LLWebRTCPeerConnectionImpl::setSendVolume(float volume)
 {
+    mPendingJobs++;
     mWebRTCImpl->PostSignalingTask(
         [this, volume]()
         {
@@ -1130,6 +1170,7 @@ void LLWebRTCPeerConnectionImpl::setSendVolume(float volume)
                     track->GetSource()->SetVolume(volume*5.0);
                 }
             }
+            mPendingJobs--;
         });
 }
 
@@ -1206,11 +1247,13 @@ void LLWebRTCPeerConnectionImpl::OnConnectionChange(webrtc::PeerConnectionInterf
     {
         case webrtc::PeerConnectionInterface::PeerConnectionState::kConnected:
         {
+            mPendingJobs++;
             mWebRTCImpl->PostWorkerTask([this]() {
                 for (auto &observer : mSignalingObserverList)
                 {
                     observer->OnAudioEstablished(this);
                 }
+                mPendingJobs--;
             });
             break;
         }
@@ -1468,11 +1511,13 @@ void LLWebRTCPeerConnectionImpl::sendData(const std::string& data, bool binary)
     {
         webrtc::CopyOnWriteBuffer cowBuffer(data.data(), data.length());
         webrtc::DataBuffer     buffer(cowBuffer, binary);
+        mPendingJobs++;
         mWebRTCImpl->PostNetworkTask([this, buffer]() {
                 if (mDataChannel)
                 {
                     mDataChannel->Send(buffer);
                 }
+                mPendingJobs--;
             });
     }
 }
diff --git a/indra/llwebrtc/llwebrtc_impl.h b/indra/llwebrtc/llwebrtc_impl.h
index fbc60d48e3..9d3af985ef 100644
--- a/indra/llwebrtc/llwebrtc_impl.h
+++ b/indra/llwebrtc/llwebrtc_impl.h
@@ -428,6 +428,9 @@ class LLWebRTCImpl : public LLWebRTCDeviceInterface, public webrtc::AudioDeviceO
     ~LLWebRTCImpl()
     {
         delete mLogSink;
+
+        // Explicit cleanup for the sake of debugging and crash stacks
+        mPeerCustomProcessor = nullptr;
     }
 
     void init();
@@ -679,6 +682,8 @@ class LLWebRTCPeerConnectionImpl : public LLWebRTCPeerConnectionInterface,
     // data
     std::vector<LLWebRTCDataObserver *> mDataObserverList;
     webrtc::scoped_refptr<webrtc::DataChannelInterface> mDataChannel;
+
+    std::atomic<int> mPendingJobs;
 };
 
 }
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index 8f8ea7fdb6..d63927d23d 100644
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -95,6 +95,7 @@ public:
 #if LL_WINDOWS && !LL_SDL
     virtual bool getCursorDelta(LLCoordCommon* delta) = 0;
 #endif
+    virtual bool isWrapMouse() const = 0;
     virtual void showCursor() = 0;
     virtual void hideCursor() = 0;
     virtual bool isCursorHidden() = 0;
diff --git a/indra/llwindow/llwindowcallbacks.cpp b/indra/llwindow/llwindowcallbacks.cpp
index 195f68e08b..7331f50ba0 100644
--- a/indra/llwindow/llwindowcallbacks.cpp
+++ b/indra/llwindow/llwindowcallbacks.cpp
@@ -68,7 +68,13 @@ void LLWindowCallbacks::handleMouseLeave(LLWindow *window)
     return;
 }
 
-bool LLWindowCallbacks::handleCloseRequest(LLWindow *window)
+bool LLWindowCallbacks::handleCloseRequest(LLWindow *window, bool from_user)
+{
+    //allow the window to close
+    return true;
+}
+
+bool LLWindowCallbacks::handleSessionExit(LLWindow* window)
 {
     //allow the window to close
     return true;
diff --git a/indra/llwindow/llwindowcallbacks.h b/indra/llwindow/llwindowcallbacks.h
index d812f93524..59dcdd3ade 100644
--- a/indra/llwindow/llwindowcallbacks.h
+++ b/indra/llwindow/llwindowcallbacks.h
@@ -42,7 +42,8 @@ public:
     virtual bool handleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask);
     virtual void handleMouseLeave(LLWindow *window);
     // return true to allow window to close, which will then cause handleQuit to be called
-    virtual bool handleCloseRequest(LLWindow *window);
+    virtual bool handleCloseRequest(LLWindow *window, bool from_user);
+    virtual bool handleSessionExit(LLWindow* window);
     // window is about to be destroyed, clean up your business
     virtual void handleQuit(LLWindow *window);
     virtual bool handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask);
diff --git a/indra/llwindow/llwindowheadless.h b/indra/llwindow/llwindowheadless.h
index acec401133..0a1ecb05e0 100644
--- a/indra/llwindow/llwindowheadless.h
+++ b/indra/llwindow/llwindowheadless.h
@@ -63,6 +63,7 @@ public:
 #if LL_WINDOWS && !LL_SDL
     /*virtual*/ bool getCursorDelta(LLCoordCommon* delta) override { return false; }
 #endif
+    /*virtual*/ bool isWrapMouse() const override { return true; }
     /*virtual*/ void showCursor() override {}
     /*virtual*/ void hideCursor() override {}
     /*virtual*/ void showCursorFromMouseMove() override {}
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 4a4b2658f6..0bf1c4b057 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -613,7 +613,7 @@ void callQuitHandler()
 {
     if (gWindowImplementation && gWindowImplementation->getCallbacks())
     {
-        if(gWindowImplementation->getCallbacks()->handleCloseRequest(gWindowImplementation))
+        if(gWindowImplementation->getCallbacks()->handleCloseRequest(gWindowImplementation, true))
         {
             gWindowImplementation->getCallbacks()->handleQuit(gWindowImplementation);
         }
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h
index 110c5756d0..d703a84d02 100644
--- a/indra/llwindow/llwindowmacosx.h
+++ b/indra/llwindow/llwindowmacosx.h
@@ -63,6 +63,7 @@ public:
     bool switchContext(bool fullscreen, const LLCoordScreen &size, bool enable_vsync, const LLCoordScreen * const posp = NULL) override;
     bool setCursorPosition(LLCoordWindow position) override;
     bool getCursorPosition(LLCoordWindow *position) override;
+    bool isWrapMouse() const override { return !mCursorDecoupled; };
     void showCursor() override;
     void hideCursor() override;
     void showCursorFromMouseMove() override;
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 0a117be1fc..ad40dea0c3 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -1722,7 +1722,7 @@ void LLWindowSDL::gatherInput()
                 break;
             }
             case SDL_QUIT:
-                if(mCallbacks->handleCloseRequest(this))
+                if(mCallbacks->handleCloseRequest(this, true))
                 {
                     // Get the app to initiate cleanup.
                     mCallbacks->handleQuit(this);
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h
index 076d7234bc..d9b6be5fdc 100644
--- a/indra/llwindow/llwindowsdl.h
+++ b/indra/llwindow/llwindowsdl.h
@@ -91,6 +91,8 @@ public:
 
     bool getCursorPosition(LLCoordWindow *position) override;
 
+    bool isWrapMouse() const override { return true; }
+
     void showCursor() override;
 
     void hideCursor() override;
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index cfc2038be9..5471e1c87a 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -450,6 +450,7 @@ LLWindowWin32::LLWindowWin32(LLWindowCallbacks* callbacks,
                              F32 max_gl_version)
     :
     LLWindow(callbacks, fullscreen, flags),
+    mAbsoluteCursorPosition(false),
     mMaxGLVersion(max_gl_version),
     mMaxCores(max_cores)
 {
@@ -2466,10 +2467,13 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
         case WM_CLOSE:
         {
             LL_PROFILE_ZONE_NAMED_CATEGORY_WIN32("mwp - WM_CLOSE");
+            // todo: WM_CLOSE can be caused by user and by task manager,
+            // distinguish these cases.
+            // For now assume it is always user.
             window_imp->post([=]()
                 {
                     // Will the app allow the window to close?
-                    if (window_imp->mCallbacks->handleCloseRequest(window_imp))
+                    if (window_imp->mCallbacks->handleCloseRequest(window_imp, true))
                     {
                         // Get the app to initiate cleanup.
                         window_imp->mCallbacks->handleQuit(window_imp);
@@ -2487,6 +2491,50 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
             }
             return 0;
         }
+        case WM_QUERYENDSESSION:
+        {
+            // Generally means that OS is going to shut down or user is going to log off.
+            // Can use ShutdownBlockReasonCreate here.
+            LL_INFOS("Window") << "Received WM_QUERYENDSESSION with wParam: " << (U32)w_param << " lParam: " << (U32)l_param << LL_ENDL;
+            return TRUE; // 1 = ok to end session. 0 no longer works by itself, use ShutdownBlockReasonCreate
+        }
+        case WM_ENDSESSION:
+        {
+            // OS session is shutting down, initiate cleanup.
+            // Comes after WM_QUERYENDSESSION
+            LL_PROFILE_ZONE_NAMED_CATEGORY_WIN32("mwp - WM_ENDSESSION");
+            LL_INFOS("Window") << "Received WM_ENDSESSION with wParam: " << (U32)w_param << " lParam: " << (U32)l_param << LL_ENDL;
+            unsigned int end_session_flags = (U32)w_param;
+            if (end_session_flags == 0)
+            {
+                // session is not actually ending
+                return 0;
+            }
+
+            if ((end_session_flags & ENDSESSION_CLOSEAPP)
+                || (end_session_flags & ENDSESSION_CRITICAL)
+                || (end_session_flags & ENDSESSION_LOGOFF))
+            {
+                window_imp->post([=]()
+                {
+                    // Check if app needs cleanup or can be closed immediately.
+                    if (window_imp->mCallbacks->handleSessionExit(window_imp))
+                    {
+                        // Get the app to initiate cleanup.
+                        window_imp->mCallbacks->handleQuit(window_imp);
+                        // The app is responsible for calling destroyWindow when done with GL
+                    }
+                });
+                // Give app a second to finish up. That's not enough for a clean exit,
+                // but better than nothing.
+                // Todo: sync this better, some kind of waitForResult? Can't wait forever,
+                // but can potentially use ShutdownBlockReasonCreate for a bigger delay.
+                ms_sleep(1000);
+            }
+            // Don't need to post quit or destroy window,
+            // if session is ending OS is going to take care of it.
+            return 0;
+        }
         case WM_COMMAND:
         {
             LL_PROFILE_ZONE_NAMED_CATEGORY_WIN32("mwp - WM_COMMAND");
@@ -3111,6 +3159,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 
                         prev_absolute_x = absolute_x;
                         prev_absolute_y = absolute_y;
+                        window_imp->mAbsoluteCursorPosition = true;
                     }
                     else
                     {
@@ -3127,6 +3176,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                             window_imp->mRawMouseDelta.mX += (S32)round((F32)raw->data.mouse.lLastX * (F32)speed / DEFAULT_SPEED);
                             window_imp->mRawMouseDelta.mY -= (S32)round((F32)raw->data.mouse.lLastY * (F32)speed / DEFAULT_SPEED);
                         }
+                        window_imp->mAbsoluteCursorPosition = false;
                     }
                 }
             }
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h
index 7196706f87..0fc93ad0b1 100644
--- a/indra/llwindow/llwindowwin32.h
+++ b/indra/llwindow/llwindowwin32.h
@@ -70,6 +70,7 @@ public:
     /*virtual*/ bool setCursorPosition(LLCoordWindow position);
     /*virtual*/ bool getCursorPosition(LLCoordWindow *position);
     /*virtual*/ bool getCursorDelta(LLCoordCommon* delta);
+    /*virtual*/ bool isWrapMouse() const override { return !mAbsoluteCursorPosition; };
     /*virtual*/ void showCursor();
     /*virtual*/ void hideCursor();
     /*virtual*/ void showCursorFromMouseMove();
@@ -195,6 +196,7 @@ protected:
 
     HCURSOR     mCursor[ UI_CURSOR_COUNT ];  // Array of all mouse cursors
     LLCoordWindow mCursorPosition;  // mouse cursor position, should only be mutated on main thread
+    bool        mAbsoluteCursorPosition; // true if last position was received in absolute coordinates.
     LLMutex mRawMouseMutex;
     RAWINPUTDEVICE mRawMouse;
     LLCoordWindow mLastCursorPosition; // mouse cursor position from previous frame
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index e033fd57bf..d1ea2773fe 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1744,10 +1744,6 @@ if (WINDOWS)
   list(APPEND viewer_SOURCE_FILES ${viewer_INSTALLER_FILES})
 endif (WINDOWS)
 
-if (HAVOK OR HAVOK_TPV)
-  set(LLSTARTUP_COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS} -DLL_HAVOK")
-endif (HAVOK OR HAVOK_TPV)
-
 if( DEFINED LLSTARTUP_COMPILE_FLAGS )
    # progress view disables/enables icons based on available packages
    set_source_files_properties(llprogressview.cpp PROPERTIES COMPILE_FLAGS "${LLSTARTUP_COMPILE_FLAGS}")
@@ -2187,6 +2183,10 @@ if( TARGET ll::nvapi )
    target_link_libraries(${VIEWER_BINARY_NAME} ll::nvapi )
 endif()
 
+if ( TARGET llconvexdecomposition )
+    target_link_libraries(${VIEWER_BINARY_NAME} llconvexdecomposition )
+endif ()
+
 set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH
     "Path to artwork files.")
 
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 77f5bec5b2..429dc57af3 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-7.2.2
+7.2.3
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index d9cf46a4af..ecea9a3238 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -2491,16 +2491,16 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>DisableMouseWarp</key>
+    <key>MouseWarpMode</key>
     <map>
       <key>Comment</key>
-      <string>Disable warping of the mouse to the center of the screen during alt-zoom and mouse look. Useful with certain input devices, mouse sharing programs like Synergy, or running under Parallels.</string>
+      <string>Controls warping of the mouse to the center of the screen during alt-zoom and mouse look. Useful with certain input devices, mouse sharing programs like Synergy, or running under Parallels. 0 - automatic, 1 - on, 2 - off</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
-      <string>Boolean</string>
+      <string>S32</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>DisableExternalBrowser</key>
     <map>
@@ -2612,7 +2612,7 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>DoubleClickTeleport</key>
+    <key>DoubleClickTeleport</key> 
     <map>
       <key>Comment</key>
       <string>Enable double-click to teleport where allowed (afects minimap and people panel)</string>
@@ -4413,7 +4413,7 @@
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>40.0</real>
+    <real>90.0</real>
   </map>
   <key>LogMessages</key>
     <map>
@@ -7929,7 +7929,7 @@
   <key>RenderMaxOpenGLVersion</key>
   <map>
     <key>Comment</key>
-    <string>Maximum OpenGL version to attempt use (minimum 3.1 maximum 4.6).  Requires restart.</string>
+    <string>Maximum OpenGL version to attempt use (minimum 3.1 maximum 4.6).  Requires restart. Windows only.</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -9177,7 +9177,7 @@
     <key>RenderQualityPerformance</key>
     <map>
       <key>Comment</key>
-      <string>Which graphics settings you've chosen</string>
+      <string>Which graphics settings you've chosen. Don't use this setting to change quality directly from debug settings.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -9185,6 +9185,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>DebugQualityPerformance</key>
+    <map>
+        <key>Comment</key>
+        <string>Allows to change performance quality directly from debug settings.</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>U32</string>
+        <key>Value</key>
+        <integer>1</integer>
+    </map>
 
   <key>RenderReflectionDetail</key>
     <map>
@@ -9274,7 +9285,7 @@
     <key>Value</key>
     <real>1.0</real>
   </map>
-
+  
   <key>RenderReflectionProbeDrawDistance</key>
   <map>
     <key>Comment</key>
@@ -9473,7 +9484,7 @@
     <key>Value</key>
     <real>1.0</real>
   </map>
-
+  
   <key>RenderReflectionProbeMaxLocalLightAmbiance</key>
   <map>
     <key>Comment</key>
@@ -10473,13 +10484,13 @@
   <key>SceneLoadRearMaxRadiusFraction</key>
   <map>
     <key>Comment</key>
-    <string>a percentage of draw distance beyond which all objects outside of view frustum will be unloaded, regardless of pixel threshold</string>
+    <string>a fraction of draw distance beyond which all objects outside of view frustum will be unloaded, regardless of pixel threshold</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
     <string>F32</string>
     <key>Value</key>
-    <real>75.0</real>
+    <real>0.75</real>
   </map>
     <key>SceneLoadRearPixelThreshold</key>
     <map>
@@ -11074,7 +11085,7 @@
             <string>Boolean</string>
         <key>Value</key>
             <integer>0</integer>
-    </map>
+    </map> 
     <key>NearbyListShowMap</key>
     <map>
       <key>Comment</key>
@@ -13190,9 +13201,9 @@
     <key>Use24HourClock</key>
     <map>
         <key>Comment</key>
-        <string>12 vs 24. At the moment only for region restart schedule floater</string>
+        <string>12 vs 24. At the moment coverage is partial</string>
         <key>Persist</key>
-        <integer>0</integer>
+        <integer>1</integer>
         <key>Type</key>
         <string>Boolean</string>
         <key>Value</key>
diff --git a/indra/newview/gltf/accessor.cpp b/indra/newview/gltf/accessor.cpp
index 03f7331893..f0ad3fa594 100644
--- a/indra/newview/gltf/accessor.cpp
+++ b/indra/newview/gltf/accessor.cpp
@@ -158,6 +158,11 @@ bool Buffer::prep(Asset& asset)
     {
         std::string dir = gDirUtilp->getDirName(asset.mFilename);
         std::string bin_file = dir + gDirUtilp->getDirDelimiter() + mUri;
+        if (!gDirUtilp->fileExists(bin_file))
+        {
+            // Characters might be escaped in the URI
+            bin_file = dir + gDirUtilp->getDirDelimiter() + LLURI::unescape(mUri);
+        }
 
         llifstream file(bin_file.c_str(), std::ios::binary);
         if (!file.is_open())
diff --git a/indra/newview/gltf/llgltfloader.cpp b/indra/newview/gltf/llgltfloader.cpp
index dd1d327683..4f8f80129d 100644
--- a/indra/newview/gltf/llgltfloader.cpp
+++ b/indra/newview/gltf/llgltfloader.cpp
@@ -412,17 +412,14 @@ void LLGLTFLoader::processNodeHierarchy(S32 node_idx, std::map<std::string, S32>
     // Process this node's mesh if it has one
     if (node.mMesh >= 0 && node.mMesh < mGLTFAsset.mMeshes.size())
     {
-        LLMatrix4    transformation;
-        material_map mats;
-
-        LLModel* pModel = new LLModel(volume_params, 0.f);
-        const LL::GLTF::Mesh& mesh = mGLTFAsset.mMeshes[node.mMesh];
-
-        // Get base mesh name and track usage
-        std::string base_name = getLodlessLabel(mesh);
+        // Get base node name and track usage
+        // Potentially multiple nodes can reuse the same mesh and Collada used
+        // node name instead of mesh name, so for consistency use node name if
+        // avaliable, node index otherwise.
+        std::string base_name = getLodlessLabel(node);
         if (base_name.empty())
         {
-            base_name = "mesh_" + std::to_string(node.mMesh);
+            base_name = "node_" + std::to_string(node_idx);
         }
 
         S32 instance_count = mesh_name_counts[base_name]++;
@@ -433,6 +430,12 @@ void LLGLTFLoader::processNodeHierarchy(S32 node_idx, std::map<std::string, S32>
             base_name = base_name + "_copy_" + std::to_string(instance_count);
         }
 
+        LLMatrix4    transformation;
+        material_map mats;
+
+        LLModel* pModel = new LLModel(volume_params, 0.f);
+        const LL::GLTF::Mesh& mesh = mGLTFAsset.mMeshes[node.mMesh];
+
         if (populateModelFromMesh(pModel, base_name, mesh, node, mats) &&
             (LLModel::NO_ERRORS == pModel->getStatus()) &&
             validate_model(pModel))
@@ -652,6 +655,14 @@ std::string LLGLTFLoader::processTexture(S32 texture_index, const std::string& t
             filename = filename.substr(pos + 1);
         }
 
+        std::string dir = gDirUtilp->getDirName(mFilename);
+        std::string full_path = dir + gDirUtilp->getDirDelimiter() + filename;
+        if (!gDirUtilp->fileExists(full_path) && filename.find("data:") == std::string::npos)
+        {
+            // Uri might be escaped
+            filename = LLURI::unescape(filename);
+        }
+
         LL_INFOS("GLTF_IMPORT") << "Found texture: " << filename << " for material: " << material_name << LL_ENDL;
 
         LLSD args;
@@ -1810,13 +1821,13 @@ size_t LLGLTFLoader::getSuffixPosition(const std::string &label)
     return -1;
 }
 
-std::string LLGLTFLoader::getLodlessLabel(const LL::GLTF::Mesh& mesh)
+std::string LLGLTFLoader::getLodlessLabel(const LL::GLTF::Node& node)
 {
-    size_t ext_pos = getSuffixPosition(mesh.mName);
+    size_t ext_pos = getSuffixPosition(node.mName);
     if (ext_pos != -1)
     {
-        return mesh.mName.substr(0, ext_pos);
+        return node.mName.substr(0, ext_pos);
     }
-    return mesh.mName;
+    return node.mName;
 }
 
diff --git a/indra/newview/gltf/llgltfloader.h b/indra/newview/gltf/llgltfloader.h
index e8b91996c7..7aa1a94c20 100644
--- a/indra/newview/gltf/llgltfloader.h
+++ b/indra/newview/gltf/llgltfloader.h
@@ -170,7 +170,7 @@ private:
     void notifyUnsupportedExtension(bool unsupported);
 
     static size_t getSuffixPosition(const std::string& label);
-    static std::string getLodlessLabel(const LL::GLTF::Mesh& mesh);
+    static std::string getLodlessLabel(const LL::GLTF::Node& mesh);
 
     //    bool mPreprocessGLTF;
 
diff --git a/indra/newview/licenses-linux.txt b/indra/newview/licenses-linux.txt
index 23dace4de0..daa069db4c 100644
--- a/indra/newview/licenses-linux.txt
+++ b/indra/newview/licenses-linux.txt
@@ -431,3 +431,36 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
+
+======
+V-HACD
+======
+BSD 3-Clause License
+
+Copyright (c) 2011, Khaled Mamou (kmamou at gmail dot com)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/indra/newview/licenses-mac.txt b/indra/newview/licenses-mac.txt
index a3792f0b6b..1765cc95f0 100644
--- a/indra/newview/licenses-mac.txt
+++ b/indra/newview/licenses-mac.txt
@@ -765,6 +765,41 @@ sse2neon
  * SOFTWARE.
  */
 
+
+======
+V-HACD
+======
+BSD 3-Clause License
+
+Copyright (c) 2011, Khaled Mamou (kmamou at gmail dot com)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 ===============================
 libwebrtc binaries (unofficial)
 ===============================
diff --git a/indra/newview/licenses-win32.txt b/indra/newview/licenses-win32.txt
index eddc9a4475..170fa2884a 100644
--- a/indra/newview/licenses-win32.txt
+++ b/indra/newview/licenses-win32.txt
@@ -821,6 +821,41 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
+
+======
+V-HACD
+======
+BSD 3-Clause License
+
+Copyright (c) 2011, Khaled Mamou (kmamou at gmail dot com)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
 ==============
 Vulkan GLTF 
 ==============
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 93cc4941f1..5801ba1eb8 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -538,6 +538,27 @@ LLInventoryItem* LLAgentWearables::getWearableInventoryItem(LLWearableType::ETyp
     return item;
 }
 
+const S32 LLAgentWearables::getWearableIdxFromItem(const LLViewerInventoryItem* item) const
+{
+    if (!item) return -1;
+    if (!item->isWearableType()) return -1;
+
+    LLWearableType::EType type = item->getWearableType();
+    U32 wearable_count = getWearableCount(type);
+    if (0 == wearable_count) return -1;
+
+    const LLUUID& asset_id = item->getAssetUUID();
+
+    for (U32 i = 0; i < wearable_count; ++i)
+    {
+        const LLViewerWearable* wearable = getViewerWearable(type, i);
+        if (!wearable) continue;
+        if (wearable->getAssetID() != asset_id) continue;
+        return i;
+    }
+
+    return -1;
+}
 const LLViewerWearable* LLAgentWearables::getWearableFromItemID(const LLUUID& item_id) const
 {
     const LLUUID& base_item_id = gInventory.getLinkedItemID(item_id);
@@ -1471,7 +1492,7 @@ bool LLAgentWearables::moveWearable(const LLViewerInventoryItem* item, bool clos
 
     LLWearableType::EType type = item->getWearableType();
     U32 wearable_count = getWearableCount(type);
-    if (0 == wearable_count) return false;
+    if (wearable_count < 2) return false;
 
     const LLUUID& asset_id = item->getAssetUUID();
 
diff --git a/indra/newview/llagentwearables.h b/indra/newview/llagentwearables.h
index 3b8ff93c76..1e118ffa98 100644
--- a/indra/newview/llagentwearables.h
+++ b/indra/newview/llagentwearables.h
@@ -87,6 +87,7 @@ public:
 public:
     const LLUUID        getWearableItemID(LLWearableType::EType type, U32 index /*= 0*/) const;
     const LLUUID        getWearableAssetID(LLWearableType::EType type, U32 index /*= 0*/) const;
+    const S32 getWearableIdxFromItem(const LLViewerInventoryItem* item) const;
     const LLViewerWearable* getWearableFromItemID(const LLUUID& item_id) const;
     LLViewerWearable*   getWearableFromItemID(const LLUUID& item_id);
     LLViewerWearable*   getWearableFromAssetID(const LLUUID& asset_id);
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 71dec10e01..cb352ac3e5 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1500,6 +1500,27 @@ void wear_on_avatar_cb(const LLUUID& inv_item, bool do_replace = false)
     }
 }
 
+bool needs_to_replace(LLViewerInventoryItem* item_to_wear, bool & first_for_object, std::vector<bool>& first_for_type, bool replace)
+{
+    bool res = false;
+    LLAssetType::EType type = item_to_wear->getType();
+    if (type == LLAssetType::AT_OBJECT)
+    {
+        res = first_for_object && replace;
+        first_for_object = false;
+    }
+    else if (type == LLAssetType::AT_CLOTHING)
+    {
+        LLWearableType::EType wtype = item_to_wear->getWearableType();
+        if (wtype >= 0 && wtype < LLWearableType::WT_COUNT)
+        {
+            res = first_for_type[wtype] && replace;
+            first_for_type[wtype] = false;
+        }
+    }
+    return res;
+}
+
 void LLAppearanceMgr::wearItemsOnAvatar(const uuid_vec_t& item_ids_to_wear,
                                         bool do_update,
                                         bool replace,
@@ -1508,7 +1529,8 @@ void LLAppearanceMgr::wearItemsOnAvatar(const uuid_vec_t& item_ids_to_wear,
     LL_DEBUGS("UIUsage") << "wearItemsOnAvatar" << LL_ENDL;
     LLUIUsage::instance().logCommand("Avatar.WearItem");
 
-    bool first = true;
+    bool first_for_object = true;
+    std::vector<bool> first_for_type(LLWearableType::WT_COUNT, true);
 
     LLInventoryObject::const_object_list_t items_to_link;
 
@@ -1516,9 +1538,6 @@ void LLAppearanceMgr::wearItemsOnAvatar(const uuid_vec_t& item_ids_to_wear,
          it != item_ids_to_wear.end();
          ++it)
     {
-        replace = first && replace;
-        first = false;
-
         const LLUUID& item_id_to_wear = *it;
 
         if (item_id_to_wear.isNull())
@@ -1537,8 +1556,9 @@ void LLAppearanceMgr::wearItemsOnAvatar(const uuid_vec_t& item_ids_to_wear,
         if (gInventory.isObjectDescendentOf(item_to_wear->getUUID(), gInventory.getLibraryRootFolderID()))
         {
             LL_DEBUGS("Avatar") << "inventory item in library, will copy and wear "
-                                << item_to_wear->getName() << " id " << item_id_to_wear << LL_ENDL;
-            LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(wear_on_avatar_cb,_1,replace));
+                << item_to_wear->getName() << " id " << item_id_to_wear << LL_ENDL;
+            bool replace_item = needs_to_replace(item_to_wear, first_for_object, first_for_type, replace);
+            LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(wear_on_avatar_cb, _1, replace_item));
             copy_inventory_item(gAgent.getID(), item_to_wear->getPermissions().getOwner(),
                                 item_to_wear->getUUID(), LLUUID::null, std::string(), cb);
             continue;
@@ -1576,7 +1596,8 @@ void LLAppearanceMgr::wearItemsOnAvatar(const uuid_vec_t& item_ids_to_wear,
                     }
                     LLWearableType::EType type = item_to_wear->getWearableType();
                     S32 wearable_count = gAgentWearables.getWearableCount(type);
-                    if ((replace && wearable_count != 0) || !gAgentWearables.canAddWearable(type))
+                    bool replace_item = needs_to_replace(item_to_wear, first_for_object, first_for_type, replace);
+                    if ((replace_item && wearable_count != 0) || !gAgentWearables.canAddWearable(type))
                     {
                         LLUUID item_id = gAgentWearables.getWearableItemID(item_to_wear->getWearableType(),
                                                                            wearable_count-1);
@@ -1605,7 +1626,13 @@ void LLAppearanceMgr::wearItemsOnAvatar(const uuid_vec_t& item_ids_to_wear,
 
             case LLAssetType::AT_OBJECT:
             {
-                rez_attachment(item_to_wear, NULL, replace);
+                // Note that this will replace only first attachment regardless of attachment point,
+                // so if user is wearing two items over other two on different attachment points,
+                // only one will be replaced.
+                // Unfortunately we have no way to determine attachment point from inventory item.
+                // We might want to forbid wearing multiple objects with replace option in future.
+                bool replace_item = needs_to_replace(item_to_wear, first_for_object, first_for_type, replace);
+                rez_attachment(item_to_wear, NULL, replace_item);
             }
             break;
 
@@ -4220,37 +4247,54 @@ bool LLAppearanceMgr::moveWearable(LLViewerInventoryItem* item, bool closer_to_b
     if (item->getType() != LLAssetType::AT_CLOTHING) return false;
     if (!gInventory.isObjectDescendentOf(item->getUUID(), getCOF())) return false;
 
+    S32 pos = gAgentWearables.getWearableIdxFromItem(item);
+    if (pos < 0) return false; // Not found
+
+    U32 count = gAgentWearables.getWearableCount(item->getWearableType());
+    if (count < 2) return false; // Nothing to swap with
+    if (closer_to_body)
+    {
+        if (pos == 0) return false; // already first
+    }
+    else
+    {
+        if (pos == count - 1)  return false; // already last
+    }
+
+    U32 old_pos = (U32)pos;
+    U32 swap_with = closer_to_body ? old_pos - 1 : old_pos + 1;
+    LLUUID swap_item_id = gAgentWearables.getWearableItemID(item->getWearableType(), swap_with);
+
+    // Find link item from item id.
     LLInventoryModel::cat_array_t cats;
     LLInventoryModel::item_array_t items;
     LLFindWearablesOfType filter_wearables_of_type(item->getWearableType());
     gInventory.collectDescendentsIf(getCOF(), cats, items, true, filter_wearables_of_type);
     if (items.empty()) return false;
 
-    // We assume that the items have valid descriptions.
-    std::sort(items.begin(), items.end(), WearablesOrderComparator(item->getWearableType()));
-
-    if (closer_to_body && items.front() == item) return false;
-    if (!closer_to_body && items.back() == item) return false;
-
-    LLInventoryModel::item_array_t::iterator it = std::find(items.begin(), items.end(), item);
-    if (items.end() == it) return false;
-
-
-    //swapping descriptions
-    closer_to_body ? --it : ++it;
-    LLViewerInventoryItem* swap_item = *it;
-    if (!swap_item) return false;
-    std::string tmp = swap_item->getActualDescription();
-    swap_item->setDescription(item->getActualDescription());
-    item->setDescription(tmp);
+    LLViewerInventoryItem* swap_item = nullptr;
+    for (auto iter : items)
+    {
+        if (iter->getLinkedUUID() == swap_item_id)
+        {
+            swap_item = iter.get();
+            break;
+        }
+    }
+    if (!swap_item)
+    {
+        return false;
+    }
 
-    // LL_DEBUGS("Inventory") << "swap, item "
-    //                     << ll_pretty_print_sd(item->asLLSD())
-    //                     << " swap_item "
-    //                     << ll_pretty_print_sd(swap_item->asLLSD()) << LL_ENDL;
+    // Description is supposed to hold sort index, but user could have changed
+    // order rapidly and there might be a state mismatch between description
+    // and gAgentWearables, trust gAgentWearables over description.
+    // Generate new description.
+    std::string new_desc = build_order_string(item->getWearableType(), old_pos);
+    swap_item->setDescription(new_desc);
+    new_desc = build_order_string(item->getWearableType(), swap_with);
+    item->setDescription(new_desc);
 
-    // FIXME switch to use AISv3 where supported.
-    //items need to be updated on a dataserver
     item->setComplete(true);
     item->updateServer(false);
     gInventory.updateItem(item);
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index c3dc821b13..f7dc7f0895 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1288,6 +1288,7 @@ bool LLAppViewer::init()
     LLViewerCamera::createInstance();
     LL::GLTFSceneManager::createInstance();
 
+    gSavedSettings.setU32("DebugQualityPerformance", gSavedSettings.getU32("RenderQualityPerformance"));
 
 #if LL_WINDOWS
     if (!mSecondInstance)
@@ -4006,8 +4007,15 @@ void LLAppViewer::processMarkerFiles()
         else if (marker_is_same_version)
         {
             // the file existed, is ours, and matched our version, so we can report on what it says
-            LL_INFOS("MarkerFile") << "Exec marker '"<< mMarkerFileName << "' found; last exec crashed" << LL_ENDL;
+            LL_INFOS("MarkerFile") << "Exec marker '"<< mMarkerFileName << "' found; last exec crashed or froze" << LL_ENDL;
+#if LL_WINDOWS && LL_BUGSPLAT
+            // bugsplat will set correct state in bugsplatSendLog
+            // Might be more accurate to rename this one into 'unknown'
+            gLastExecEvent = LAST_EXEC_FROZE;
+#else
             gLastExecEvent = LAST_EXEC_OTHER_CRASH;
+#endif // LL_WINDOWS
+
         }
         else
         {
@@ -4256,7 +4264,7 @@ void LLAppViewer::earlyExit(const std::string& name, const LLSD& substitutions)
 // case where we need the viewer to exit without any need for notifications
 void LLAppViewer::earlyExitNoNotify()
 {
-    LL_WARNS() << "app_early_exit with no notification: " << LL_ENDL;
+    LL_WARNS() << "app_early_exit with no notification." << LL_ENDL;
     gDoDisconnect = true;
     finish_early_exit( LLSD(), LLSD() );
 }
@@ -4535,6 +4543,7 @@ void LLAppViewer::purgeCache()
     LLAppViewer::getTextureCache()->purgeCache(LL_PATH_CACHE);
     LLVOCache::getInstance()->removeCache(LL_PATH_CACHE);
     LLViewerShaderMgr::instance()->clearShaderCache();
+    purgeCefStaleCaches();
     gDirUtilp->deleteFilesInDir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ""), "*");
 }
 
@@ -5469,6 +5478,12 @@ void LLAppViewer::createErrorMarker(eLastExecEvent error_code) const
     }
 }
 
+bool LLAppViewer::errorMarkerExists() const
+{
+    std::string error_marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ERROR_MARKER_FILE_NAME);
+    return LLAPRFile::isExist(error_marker_file, NULL, LL_APR_RB);
+}
+
 void LLAppViewer::outOfMemorySoftQuit()
 {
     if (!mQuitRequested)
@@ -5600,7 +5615,10 @@ void LLAppViewer::idleNetwork()
     add(LLStatViewer::NUM_NEW_OBJECTS, gObjectList.mNumNewObjects);
 
     // Retransmit unacknowledged packets.
-    gXferManager->retransmitUnackedPackets();
+    if (gXferManager)
+    {
+        gXferManager->retransmitUnackedPackets();
+    }
     gAssetStorage->checkForTimeouts();
     gViewerThrottle.setBufferLoadRate(gMessageSystem->getBufferLoadRate());
     gViewerThrottle.updateDynamicThrottle();
diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h
index 3afde6b9f5..4f2583cb16 100644
--- a/indra/newview/llappviewer.h
+++ b/indra/newview/llappviewer.h
@@ -149,6 +149,12 @@ public:
     std::string getWindowTitle() const; // The window display name.
 
     void forceDisconnect(const std::string& msg); // Force disconnection, with a message to the user.
+
+    // sendSimpleLogoutRequest does not create a marker file.
+    // Meant for lost network case, and for forced shutdowns,
+    // to at least attempt to remove the ghost from the world.
+    void sendSimpleLogoutRequest();
+
     void badNetworkHandler(); // Cause a crash state due to bad network packet.
 
     bool hasSavedFinalSnapshot() { return mSavedFinalSnapshot; }
@@ -245,6 +251,7 @@ public:
 
     // Writes an error code into the error_marker file for use on next startup.
     void createErrorMarker(eLastExecEvent error_code) const;
+    bool errorMarkerExists() const;
 
     // Attempt a 'soft' quit with disconnect and saving of settings/cache.
     // Intended to be thread safe.
@@ -311,10 +318,6 @@ private:
     void sendLogoutRequest();
     void disconnectViewer();
 
-    // Does not create a marker file. For lost network case,
-    // to at least attempt to remove the ghost from the world.
-    void sendSimpleLogoutRequest();
-
     // *FIX: the app viewer class should be some sort of singleton, no?
     // Perhaps its child class is the singleton and this should be an abstract base.
     static LLAppViewer* sInstance;
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index f612495953..76c71f8778 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -176,6 +176,15 @@ namespace
                                     << '/' << loc.mV[1]
                                     << '/' << loc.mV[2])));
             }
+
+            LLAppViewer* app = LLAppViewer::instance();
+            if (!app->isSecondInstance() && !app->errorMarkerExists())
+            {
+                // If marker doesn't exist, create a marker with 'other' code for next launch
+                // otherwise don't override existing file
+                // Any unmarked crashes will be considered as freezes
+                app->createErrorMarker(LAST_EXEC_OTHER_CRASH);
+            }
         } // MDSCB_EXCEPTIONCODE
 
         return false;
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp
index 21a29bb1bb..8617183840 100644
--- a/indra/newview/llchathistory.cpp
+++ b/indra/newview/llchathistory.cpp
@@ -215,7 +215,8 @@ public:
             LLUUID obj_id = mObjectData["object_id"];
             if (obj_id.notNull())
             {
-                return nullptr != gObjectList.findObject(mAvatarID);
+                LLViewerObject* object = gObjectList.findObject(obj_id);
+                return object && object->isReachable();
             }
             return false;
         }
@@ -441,6 +442,7 @@ public:
                 time_t current_time = time_corrected();
                 time_t message_time = (time_t)(current_time - LLFrameTimer::getElapsedSeconds() + mTime);
 
+                // Report abuse shouldn't use AM/PM, use 24-hour time
                 time_string = "[" + LLTrans::getString("TimeMonth") + "]/["
                     + LLTrans::getString("TimeDay") + "]/["
                     + LLTrans::getString("TimeYear") + "] ["
@@ -1117,7 +1119,11 @@ LLChatHistory::LLChatHistory(const LLChatHistory::Params& p)
     mEditor = LLUICtrlFactory::create<LLTextEditor>(editor_params, this);
     mEditor->setIsFriendCallback(LLAvatarActions::isFriend);
     mEditor->setIsObjectBlockedCallback(boost::bind(&LLMuteList::isMuted, LLMuteList::getInstance(), _1, _2, 0));
-
+    mEditor->setIsObjectReachableCallback([](const LLUUID& obj_id)
+        {
+            LLViewerObject* object = gObjectList.findObject(obj_id);
+            return object && object->isReachable();
+        });
 }
 
 LLSD LLChatHistory::getValue() const
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp
index cea68c1779..65a068e08d 100644
--- a/indra/newview/llconversationlog.cpp
+++ b/indra/newview/llconversationlog.cpp
@@ -118,11 +118,21 @@ const std::string LLConversation::createTimestamp(const U64Seconds& utc_time)
     LLSD substitution;
     substitution["datetime"] = (S32)utc_time.value();
 
-    timeStr = "["+LLTrans::getString ("TimeMonth")+"]/["
-                 +LLTrans::getString ("TimeDay")+"]/["
-                 +LLTrans::getString ("TimeYear")+"] ["
-                 +LLTrans::getString ("TimeHour")+"]:["
-                 +LLTrans::getString ("TimeMin")+"]";
+    static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+    timeStr = "[" + LLTrans::getString("TimeMonth") + "]/["
+        + LLTrans::getString("TimeDay") + "]/["
+        + LLTrans::getString("TimeYear") + "] [";
+    if (use_24h)
+    {
+        timeStr += LLTrans::getString("TimeHour") + "]:["
+            + LLTrans::getString("TimeMin") + "]";
+    }
+    else
+    {
+        timeStr += LLTrans::getString("TimeHour12") + "]:["
+            + LLTrans::getString("TimeMin") + "] ["
+            + LLTrans::getString("TimeAMPM") + "]";
+    }
 
 
     LLStringUtil::format (timeStr, substitution);
diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp
index c6fea1ba82..86c58a3497 100644
--- a/indra/newview/lleventpoll.cpp
+++ b/indra/newview/lleventpoll.cpp
@@ -54,13 +54,6 @@ namespace Details
         void stop();
 
     private:
-        // We will wait RETRY_SECONDS + (errorCount * RETRY_SECONDS_INC) before retrying after an error.
-        // This means we attempt to recover relatively quickly but back off giving more time to recover
-        // until we finally give up after MAX_EVENT_POLL_HTTP_ERRORS attempts.
-        static const F32                EVENT_POLL_ERROR_RETRY_SECONDS;
-        static const F32                EVENT_POLL_ERROR_RETRY_SECONDS_INC;
-        static const S32                MAX_EVENT_POLL_HTTP_ERRORS;
-
         void                            eventPollCoro(std::string url);
 
         void                            handleMessage(const LLSD &content);
@@ -76,9 +69,13 @@ namespace Details
     };
 
 
-    const F32 LLEventPollImpl::EVENT_POLL_ERROR_RETRY_SECONDS = 15.f; // ~ half of a normal timeout.
-    const F32 LLEventPollImpl::EVENT_POLL_ERROR_RETRY_SECONDS_INC = 5.f; // ~ half of a normal timeout.
-    const S32 LLEventPollImpl::MAX_EVENT_POLL_HTTP_ERRORS = 10; // ~5 minutes, by the above rules.
+    // We will wait RETRY_SECONDS + (errorCount * RETRY_SECONDS_INC) before retrying after an error.
+    // This means we attempt to recover relatively quickly but back off giving more time to recover
+    // until we finally give up after MAX_EVENT_POLL_HTTP_ERRORS attempts.
+    constexpr F32 EVENT_POLL_ERROR_RETRY_SECONDS = 15.f; // ~ half of a normal timeout.
+    constexpr F32 EVENT_POLL_ERROR_RETRY_SECONDS_INC = 5.f; // ~ half of a normal timeout.
+    constexpr S32 MAX_EVENT_POLL_HTTP_ERRORS = 10; // ~5 minutes, by the above rules.
+    constexpr F64 MIN_SECONDS_PASSED = 10.0; // Minimum time we expect the server to hold the request.
 
     int LLEventPollImpl::sNextCounter = 1;
 
@@ -151,11 +148,17 @@ namespace Details
         LLSD acknowledge;
         int errorCount = 0;
         int counter = mCounter; // saved on the stack for logging.
+        LLTimer message_time;
 
         LL_DEBUGS("LLEventPollImpl") << " <" << counter << "> entering coroutine." << LL_ENDL;
 
         mAdapter = httpAdapter;
 
+        // This is a loop with its own waitToRetry implementation,
+        // so disable retries.
+        LLCore::HttpOptions::ptr_t httpOpts(new LLCore::HttpOptions);
+        httpOpts->setRetries(0);
+
         LL::WorkQueue::ptr_t main_queue = nullptr;
 
         // HACK -- grab the mainloop workqueue to move execution of the handler
@@ -172,11 +175,13 @@ namespace Details
             request["ack"] = acknowledge;
             request["done"] = mDone;
 
+            message_time.reset();
+
 //          LL_DEBUGS("LLEventPollImpl::eventPollCoro") << "<" << counter << "> request = "
 //              << LLSDXMLStreamer(request) << LL_ENDL;
 
             LL_DEBUGS("LLEventPollImpl") << " <" << counter << "> posting and yielding." << LL_ENDL;
-            LLSD result = httpAdapter->postAndSuspend(mHttpRequest, url, request);
+            LLSD result = httpAdapter->postAndSuspend(mHttpRequest, url, request, httpOpts);
 
 //          LL_DEBUGS("LLEventPollImpl::eventPollCoro") << "<" << counter << "> result = "
 //              << LLSDXMLStreamer(result) << LL_ENDL;
@@ -194,11 +199,30 @@ namespace Details
 
             if (!status)
             {
-                if (status == LLCore::HttpStatus(LLCore::HttpStatus::EXT_CURL_EASY, CURLE_OPERATION_TIMEDOUT))
-                {   // A standard timeout response we get this when there are no events.
-                    LL_DEBUGS("LLEventPollImpl") << "All is very quiet on target server. It may have gone idle?" << LL_ENDL;
-                    errorCount = 0;
-                    continue;
+                if (status == LLCore::HttpStatus(LLCore::HttpStatus::EXT_CURL_EASY, CURLE_OPERATION_TIMEDOUT) // A standard timeout, no events.
+                    || status == LLCore::HttpStatus(HTTP_BAD_GATEWAY) // An expected 'No events' case.
+                    || status == LLCore::HttpStatus(HTTP_INTERNAL_ERROR)
+                    || status == LLCore::HttpStatus(HTTP_SERVICE_UNAVAILABLE)
+                    || status == LLCore::HttpStatus(HTTP_GATEWAY_TIME_OUT))
+                {
+                    if (message_time.getElapsedSeconds() < MIN_SECONDS_PASSED)
+                    {
+                        // Server is supposed to hold request for 20 to 30 seconds.
+                        // If it didn't hold the request at least for 10s, treat as an error.
+                        LL_WARNS("LLEventPollImpl") << "Response arrived too early, status: " << status.toTerseString()
+                            << ", time passed: " << message_time.getElapsedSeconds() << LL_ENDL;
+                    }
+                    else
+                    {
+                        // Timeout, expected and means 'no events'. Request is to be re-issued immediately.
+                        // Current definition of a timeout is any of :
+                        // - libcurl easy 28 status code
+                        // - Linden 499 special http status code
+                        // - RFC - standard 502 - 504 http status codes
+                        LL_DEBUGS("LLEventPollImpl") << "No events, from: " << mSenderIp <<" status: " << (S32)status.getStatus() << LL_ENDL;
+                        errorCount = 0;
+                        continue;
+                    }
                 }
                 else if ((status == LLCore::HttpStatus(LLCore::HttpStatus::LLCORE, LLCore::HE_OP_CANCELED)) ||
                         (status == LLCore::HttpStatus(HTTP_NOT_FOUND)))
@@ -206,13 +230,13 @@ namespace Details
                     // some cases the server gets ahead of the viewer and will
                     // return a 404 error (Not Found) before the cancel event
                     // comes back in the queue
-                    LL_WARNS("LLEventPollImpl") << "Canceling coroutine" << LL_ENDL;
+                    LL_WARNS("LLEventPollImpl") << "<" << counter << "> Canceling coroutine, status: " << status.toTerseString() << LL_ENDL;
                     break;
                 }
                 else if (!status.isHttpStatus())
                 {
                     /// Some LLCore or LIBCurl error was returned.  This is unlikely to be recoverable
-                    LL_WARNS("LLEventPollImpl") << "Critical error from poll request returned from libraries.  Canceling coroutine." << LL_ENDL;
+                    LL_WARNS("LLEventPollImpl") << "<" << counter << "> Critical error from poll request returned from libraries.  Canceling coroutine." << LL_ENDL;
                     break;
                 }
                 LL_WARNS("LLEventPollImpl") << "<" << counter << "> Error result from LLCoreHttpUtil::HttpCoroHandler. Code "
@@ -255,6 +279,10 @@ namespace Details
                         LL_WARNS("LLEventPollImpl") << "< " << counter << "> Forcing disconnect due to stalled main region event poll." << LL_ENDL;
                         LLAppViewer::instance()->forceDisconnect(LLTrans::getString("AgentLostConnection"));
                     }
+                    else
+                    {
+                        LL_WARNS("LLEventPollImpl") << "< " << counter << "> Stopping event poll for " << mSenderIp << " due to failures." << LL_ENDL;
+                    }
                     break;
                 }
             }
diff --git a/indra/newview/lleventpoll.h b/indra/newview/lleventpoll.h
index bb407b3799..ea186aa803 100644
--- a/indra/newview/lleventpoll.h
+++ b/indra/newview/lleventpoll.h
@@ -40,7 +40,30 @@ namespace Details
 
 
 class LLEventPoll
-    ///< implements the viewer side of server-to-viewer pushed events.
+    ///< Implements the viewer side of server-to-viewer pushed events.
+    ///
+    /// This class implements the sole consumer of the EventQueueGet capability
+    /// and delivers data, including llsd-encoded llmessage payloads, from
+    /// simulator to viewer.
+    ///
+    /// https://wiki.secondlife.com/wiki/EventQueueGet
+    /// The wiki page is neither complete nor entirely correct. Request timeouts
+    /// became the de facto method of returning an empty event set to the viewer.
+    /// But the timeout behavior was never defined. It was simply whatever
+    /// behavior a given grid implementation implemented.
+    ///
+    /// In SL's case, the path may include reverse proxies, http caches, http and
+    /// socks proxies, transparent hijacking, and other horrors. A pitfall for
+    /// implementors.
+    ///
+    /// Current definition of a timeout is any of :
+    /// - libcurl easy 28 status code
+    /// - Linden 499 special http status code
+    /// - RFC - standard 502 - 504 http status codes
+    /// If requests are failing too quickly with the above errors, they are treated
+    /// as actual errors and not an empty payload. These will count towards a final
+    /// error declaration and can lead to disconnection from a simulator or the
+    /// entire grid.
 {
 public:
     LLEventPoll(const std::string& pollURL, const LLHost& sender);
diff --git a/indra/newview/llfetchedgltfmaterial.cpp b/indra/newview/llfetchedgltfmaterial.cpp
index 558fc92018..a05f725673 100644
--- a/indra/newview/llfetchedgltfmaterial.cpp
+++ b/indra/newview/llfetchedgltfmaterial.cpp
@@ -222,6 +222,14 @@ void LLFetchedGLTFMaterial::updateTextureTracking()
     }
 }
 
+void LLFetchedGLTFMaterial::clearFetchedTextures()
+{
+    mBaseColorTexture = nullptr;
+    mNormalTexture = nullptr;
+    mMetallicRoughnessTexture = nullptr;
+    mEmissiveTexture = nullptr;
+}
+
 void LLFetchedGLTFMaterial::materialBegin()
 {
     llassert(!mFetching);
diff --git a/indra/newview/llfetchedgltfmaterial.h b/indra/newview/llfetchedgltfmaterial.h
index 4a33b9f05f..074e3fef41 100644
--- a/indra/newview/llfetchedgltfmaterial.h
+++ b/indra/newview/llfetchedgltfmaterial.h
@@ -67,6 +67,7 @@ public:
     LLPointer<LLViewerFetchedTexture> mNormalTexture;
     LLPointer<LLViewerFetchedTexture> mMetallicRoughnessTexture;
     LLPointer<LLViewerFetchedTexture> mEmissiveTexture;
+    void clearFetchedTextures();
 
     std::set<LLTextureEntry*> mTextureEntires;
 
diff --git a/indra/newview/llfloaterdisplayname.cpp b/indra/newview/llfloaterdisplayname.cpp
index 236aadfbc1..4843a48e66 100644
--- a/indra/newview/llfloaterdisplayname.cpp
+++ b/indra/newview/llfloaterdisplayname.cpp
@@ -56,6 +56,7 @@ private:
     void onCacheSetName(bool success,
                                           const std::string& reason,
                                           const LLSD& content);
+    bool mIsLockedOut = false;
 };
 
 LLFloaterDisplayName::LLFloaterDisplayName(const LLSD& key) :
@@ -72,8 +73,8 @@ void LLFloaterDisplayName::onOpen(const LLSD& key)
     LLAvatarNameCache::get(gAgent.getID(), &av_name);
 
     F64 now_secs = LLDate::now().secondsSinceEpoch();
-
-    if (now_secs < av_name.mNextUpdate)
+    mIsLockedOut = now_secs < av_name.mNextUpdate;
+    if (mIsLockedOut)
     {
         // ...can't update until some time in the future
         F64 next_update_local_secs =
@@ -167,18 +168,19 @@ void LLFloaterDisplayName::onReset()
     }
     getChild<LLUICtrl>("display_name_editor")->setValue(av_name.getUserName());
 
-    if (getChild<LLUICtrl>("display_name_editor")->getEnabled())
+    if (mIsLockedOut)
     {
-        // UI is enabled, fill the first field
-        getChild<LLUICtrl>("display_name_confirm")->clear();
-        getChild<LLUICtrl>("display_name_confirm")->setFocus(true);
+        // UI is disabled.
+        // We should allow resetting even if user already
+        // set a display name, enable save button
+        getChild<LLUICtrl>("display_name_confirm")->setValue(av_name.getUserName());
+        getChild<LLUICtrl>("save_btn")->setEnabled(true);
     }
     else
     {
-        // UI is disabled, looks like we should allow resetting
-        // even if user already set a display name, enable save button
-        getChild<LLUICtrl>("display_name_confirm")->setValue(av_name.getUserName());
-        getChild<LLUICtrl>("save_btn")->setEnabled(true);
+        // UI is enabled, focus on the confirm field
+        getChild<LLUICtrl>("display_name_confirm")->clear();
+        getChild<LLUICtrl>("display_name_confirm")->setFocus(true);
     }
 }
 
diff --git a/indra/newview/llfloateremojipicker.cpp b/indra/newview/llfloateremojipicker.cpp
index af0ef7223d..b7f4df874c 100644
--- a/indra/newview/llfloateremojipicker.cpp
+++ b/indra/newview/llfloateremojipicker.cpp
@@ -377,6 +377,9 @@ void LLFloaterEmojiPicker::initialize()
     {
         if (!mHint.empty())
         {
+            // Hack: Trying to open floater, search for a match,
+            // and hide floater immediately if no match found,
+            // instead of checking prior to opening
             hideFloater();
             return;
         }
@@ -406,6 +409,12 @@ void LLFloaterEmojiPicker::initialize()
         return;
     }
 
+    if (!mHint.empty() && getSoundFlags() == LLView::SILENT)
+    {
+        // Sounds were supressed
+        make_ui_sound("UISndWindowOpen");
+    }
+
     mGroups->setVisible(true);
     mPreview->setIcon(nullptr);
     showPreview(true);
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp
index d28c987414..1825797159 100644
--- a/indra/newview/llfloaterfixedenvironment.cpp
+++ b/indra/newview/llfloaterfixedenvironment.cpp
@@ -134,12 +134,15 @@ void LLFloaterFixedEnvironment::onClose(bool app_quitting)
 {
     doCloseInventoryFloater(app_quitting);
 
-    LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL);
-    LLEnvironment::instance().setCurrentEnvironmentSelection(LLEnvironment::ENV_LOCAL);
-    LLEnvironment::instance().clearEnvironment(LLEnvironment::ENV_EDIT);
+    if (!app_quitting)
+    {
+        LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL);
+        LLEnvironment::instance().setCurrentEnvironmentSelection(LLEnvironment::ENV_LOCAL);
+        LLEnvironment::instance().clearEnvironment(LLEnvironment::ENV_EDIT);
 
-    mSettings.reset();
-    syncronizeTabs();
+        mSettings.reset();
+        syncronizeTabs();
+    }
 }
 
 void LLFloaterFixedEnvironment::refresh()
diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp
index 550c3adc27..c924807273 100644
--- a/indra/newview/llfloaterimagepreview.cpp
+++ b/indra/newview/llfloaterimagepreview.cpp
@@ -267,6 +267,14 @@ void LLFloaterImagePreview::onBtnOK()
 
         LLPointer<LLImageJ2C> formatted = new LLImageJ2C;
 
+        if (mRawImagep->getWidth() * mRawImagep->getHeight() <= LL_IMAGE_REZ_LOSSLESS_CUTOFF * LL_IMAGE_REZ_LOSSLESS_CUTOFF)
+        {
+            if (gSavedSettings.getBOOL("LosslessJ2CUpload"))
+            {
+                formatted->setReversible(true);
+            }
+        }
+
         if (formatted->encode(mRawImagep, 0.0f))
         {
             LLFileSystem fmt_file(new_asset_id, LLAssetType::AT_TEXTURE, LLFileSystem::WRITE);
diff --git a/indra/newview/llfloaterimsessiontab.cpp b/indra/newview/llfloaterimsessiontab.cpp
index 5160ac4d34..48360f30d4 100644
--- a/indra/newview/llfloaterimsessiontab.cpp
+++ b/indra/newview/llfloaterimsessiontab.cpp
@@ -618,9 +618,21 @@ void LLFloaterIMSessionTab::deleteAllChildren()
 
 std::string LLFloaterIMSessionTab::appendTime()
 {
-    std::string timeStr = "[" + LLTrans::getString("TimeHour") + "]:"
-                          "[" + LLTrans::getString("TimeMin") + "]:"
-                          "[" + LLTrans::getString("TimeSec") + "]";
+    std::string timeStr;
+    static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+    if (use_24h)
+    {
+        timeStr = "[" + LLTrans::getString("TimeHour") + "]:"
+            "[" + LLTrans::getString("TimeMin") + "]:"
+            "[" + LLTrans::getString("TimeSec") + "]";
+    }
+    else
+    {
+        timeStr = "[" + LLTrans::getString("TimeHour12") + "]:"
+            "[" + LLTrans::getString("TimeMin") + "]:"
+            "[" + LLTrans::getString("TimeSec") + "] ["
+            + LLTrans::getString("TimeAMPM") + "]";
+    }
 
     LLSD substitution;
     substitution["datetime"] = (S32)time_corrected();
diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp
index 4f993ca0e1..c0fe7ad896 100644
--- a/indra/newview/llfloaterinspect.cpp
+++ b/indra/newview/llfloaterinspect.cpp
@@ -220,7 +220,8 @@ void LLFloaterInspect::refresh()
         }
 
         time_t timestamp = (time_t) (obj->mCreationDate/1000000);
-        std::string timeStr = getString("timeStamp");
+        static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+        std::string timeStr = use_24h ? getString("timeStamp") : getString("timeStampAMPM");
         LLSD substitution;
         substitution["datetime"] = (S32) timestamp;
         LLStringUtil::format (timeStr, substitution);
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 52a3e78d04..5c5219bcdd 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -733,7 +733,8 @@ void LLPanelLandGeneral::refresh()
 
             // Display claim date
             time_t claim_date = parcel->getClaimDate();
-            std::string claim_date_str = getString("time_stamp_template");
+            static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+            std::string claim_date_str = use_24h ? getString("time_stamp_template") : getString("time_stamp_template_ampm");
             LLSD substitution;
             substitution["datetime"] = (S32) claim_date;
             LLStringUtil::format (claim_date_str, substitution);
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index f76f39222b..ef29be8200 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -1035,8 +1035,13 @@ void LLFloaterModelPreview::onPhysicsStageExecute(LLUICtrl* ctrl, void* data)
                 gMeshRepo.mDecompThread->submitRequest(request);
             }
         }
-
-        if (stage == "Decompose")
+        if (stage == "Analyze")
+        {
+            sInstance->setStatusMessage(sInstance->getString("decomposing"));
+            sInstance->childSetVisible("Analyze", false);
+            sInstance->childSetVisible("analyze_cancel", true);
+        }
+        else if (stage == "Decompose")
         {
             sInstance->setStatusMessage(sInstance->getString("decomposing"));
             sInstance->childSetVisible("Decompose", false);
@@ -1137,6 +1142,7 @@ void LLFloaterModelPreview::initDecompControls()
 
     childSetCommitCallback("simplify_cancel", onPhysicsStageCancel, NULL);
     childSetCommitCallback("decompose_cancel", onPhysicsStageCancel, NULL);
+    childSetCommitCallback("analyze_cancel", onPhysicsStageCancel, NULL);
 
     childSetCommitCallback("physics_lod_combo", onPhysicsUseLOD, NULL);
     childSetCommitCallback("physics_browse", onPhysicsBrowse, NULL);
@@ -2018,7 +2024,7 @@ void LLFloaterModelPreview::DecompRequest::completed()
 { //called from the main thread
     if (mContinue)
     {
-        mModel->setConvexHullDecomposition(mHull);
+        mModel->setConvexHullDecomposition(mHull, mHullMesh);
 
         if (sInstance)
         {
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index d9753596e6..aa36782942 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -475,6 +475,8 @@ bool LLFloaterPreference::postBuild()
     getChild<LLUICtrl>("log_path_string")->setEnabled(false); // make it read-only but selectable
 
     getChild<LLComboBox>("language_combobox")->setCommitCallback(boost::bind(&LLFloaterPreference::onLanguageChange, this));
+    mTimeFormatCombobox = getChild<LLComboBox>("time_format_combobox");
+    mTimeFormatCombobox->setCommitCallback(boost::bind(&LLFloaterPreference::onTimeFormatChange, this));
 
     getChild<LLComboBox>("FriendIMOptions")->setCommitCallback(boost::bind(&LLFloaterPreference::onNotificationsChange, this,"FriendIMOptions"));
     getChild<LLComboBox>("NonFriendIMOptions")->setCommitCallback(boost::bind(&LLFloaterPreference::onNotificationsChange, this,"NonFriendIMOptions"));
@@ -772,6 +774,17 @@ void LLFloaterPreference::onOpen(const LLSD& key)
     // Load (double-)click to walk/teleport settings.
     updateClickActionViews();
 
+#if LL_LINUX
+    // Lixux doesn't support automatic mode
+    LLComboBox* combo = getChild<LLComboBox>("double_click_action_combo");
+    S32 mode = gSavedSettings.getS32("MouseWarpMode");
+    if (mode == 0)
+    {
+        combo->setValue("1");
+    }
+    combo->setEnabledByValue("0", false);
+#endif
+
     // Enabled/disabled popups, might have been changed by user actions
     // while preferences floater was closed.
     buildPopupLists();
@@ -1103,6 +1116,13 @@ void LLFloaterPreference::onLanguageChange()
     }
 }
 
+void LLFloaterPreference::onTimeFormatChange()
+{
+    std::string val = mTimeFormatCombobox->getValue();
+    gSavedSettings.setBOOL("Use24HourClock", val == "1");
+    onLanguageChange();
+}
+
 void LLFloaterPreference::onNotificationsChange(const std::string& OptionName)
 {
     mNotificationOptions[OptionName] = getChild<LLComboBox>(OptionName)->getSelectedItemLabel();
@@ -1318,6 +1338,8 @@ void LLFloaterPreference::refresh()
         advanced->refresh();
     }
     updateClickActionViews();
+
+    mTimeFormatCombobox->selectByValue(gSavedSettings.getBOOL("Use24HourClock") ? "1" : "0");
 }
 
 void LLFloaterPreference::onCommitWindowedMode()
@@ -1356,6 +1378,7 @@ void LLFloaterPreference::onChangeQuality(const LLSD& data)
     }
     mLastQualityLevel = level;
     LLFeatureManager::getInstance()->setGraphicsLevel(level, true);
+    gSavedSettings.setU32("DebugQualityPerformance", level);
     refreshEnabledGraphics();
     refresh();
 }
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index c93b837e82..8d3f1ed6b0 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -117,6 +117,7 @@ protected:
     void        onClickClearCache();            // Clear viewer texture cache, file cache on next startup
     void        onClickBrowserClearCache();     // Clear web history and caches as well as viewer caches above
     void        onLanguageChange();
+    void        onTimeFormatChange();
     void        onNotificationsChange(const std::string& OptionName);
     void        onNameTagOpacityChange(const LLSD& newvalue);
 
@@ -235,6 +236,7 @@ private:
     LLButton*       mDeleteTranscriptsBtn = nullptr;
     LLButton*       mEnablePopupBtn = nullptr;
     LLButton*       mDisablePopupBtn = nullptr;
+    LLComboBox*     mTimeFormatCombobox = nullptr;
     std::unique_ptr< ll::prefs::SearchData > mSearchData;
     bool mSearchDataDirty;
 
diff --git a/indra/newview/llfloatertoybox.cpp b/indra/newview/llfloatertoybox.cpp
index f6257dbd3d..5e3ec366d5 100644
--- a/indra/newview/llfloatertoybox.cpp
+++ b/indra/newview/llfloatertoybox.cpp
@@ -63,7 +63,7 @@ bool LLFloaterToybox::postBuild()
 
     mToolBar->setStartDragCallback(boost::bind(LLToolBarView::startDragTool,_1,_2,_3));
     mToolBar->setHandleDragCallback(boost::bind(LLToolBarView::handleDragTool,_1,_2,_3,_4));
-    mToolBar->setHandleDropCallback(boost::bind(LLToolBarView::handleDropTool,_1,_2,_3,_4));
+    mToolBar->setHandleDropCallback(boost::bind(LLToolBarView::handleDropTool,_1,_2,_3,_4,_5));
     mToolBar->setButtonEnterCallback(boost::bind(&LLFloaterToybox::onToolBarButtonEnter,this,_1));
 
     //
diff --git a/indra/newview/llfloaterurlentry.cpp b/indra/newview/llfloaterurlentry.cpp
index 7651b2528f..2f1857ec61 100644
--- a/indra/newview/llfloaterurlentry.cpp
+++ b/indra/newview/llfloaterurlentry.cpp
@@ -242,6 +242,16 @@ void LLFloaterURLEntry::getMediaTypeCoro(std::string url, LLHandle<LLFloater> pa
             resolvedMimeType = mimeType;
         }
     }
+    else if (resultHeaders.has(HTTP_IN_HEADER_X_CONTENT_TYPE_OPTIONS))
+    {
+        const std::string& val = resultHeaders[HTTP_IN_HEADER_X_CONTENT_TYPE_OPTIONS];
+        if (val == HTTP_NOSNIFF)
+        {
+            // Doesn't permit 'sniffing' mime type, default to either html or plain
+            // If this doesn't work user will have to choose something manually.
+            resolvedMimeType = HTTP_CONTENT_TEXT_HTML;
+        }
+    }
 
     floaterUrlEntry->headerFetchComplete(status.getType(), resolvedMimeType);
 
diff --git a/indra/newview/llgltfmateriallist.cpp b/indra/newview/llgltfmateriallist.cpp
index 8da835ed7d..3e4aadc381 100644
--- a/indra/newview/llgltfmateriallist.cpp
+++ b/indra/newview/llgltfmateriallist.cpp
@@ -359,6 +359,7 @@ void LLGLTFMaterialList::queueApply(const LLViewerObject* obj, S32 side, const L
 {
     if (asset_id.isNull() || override_json.empty())
     {
+        // If there is no asset, there can't be an override
         queueApply(obj, side, asset_id);
     }
     else
@@ -371,6 +372,7 @@ void LLGLTFMaterialList::queueApply(const LLViewerObject* obj, S32 side, const L
 {
     if (asset_id.isNull() || material_override == nullptr)
     {
+        // If there is no asset, there can't be an override
         queueApply(obj, side, asset_id);
     }
     else
@@ -470,7 +472,7 @@ void LLGLTFMaterialList::flushUpdatesOnce(std::shared_ptr<CallbackHolder> callba
         {
             data[i]["gltf_json"] = e.override_data->asJSON();
         }
-        if (!e.override_json.empty())
+        else if (!e.override_json.empty())
         {
             data[i]["gltf_json"] = e.override_json;
         }
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index bc89af2eed..67b62433f8 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -811,6 +811,10 @@ void LLIMModel::LLIMSession::initVoiceChannel(const LLSD& voiceChannelInfo)
 {
     if (mVoiceChannel)
     {
+        if (!voiceChannelInfo.isMap())
+        {
+            LL_WARNS() << "initVoiceChannel called without voiceChannelInfo" << LL_ENDL;
+        }
         if (mVoiceChannel->isThisVoiceChannel(voiceChannelInfo))
         {
             return;
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index f508935799..1ec7ec85c9 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4390,6 +4390,32 @@ void LLFolderBridge::pasteLinkFromClipboard()
         std::vector<LLUUID> objects;
         LLClipboard::instance().pasteFromClipboard(objects);
 
+        if (objects.size() == 0)
+        {
+            LLClipboard::instance().setCutMode(false);
+            return;
+        }
+
+        LLUUID& first_id = objects[0];
+        LLInventoryItem* item = model->getItem(first_id);
+        if (item && item->getAssetUUID().isNull())
+        {
+            if (item->getActualType() == LLAssetType::AT_NOTECARD)
+            {
+                // otehrwise AIS will return 'Cannot link to items with a NULL asset_id.'
+                LLNotificationsUtil::add("CantLinkNotecard");
+                LLClipboard::instance().setCutMode(false);
+                return;
+            }
+            else if (item->getActualType() == LLAssetType::AT_MATERIAL)
+            {
+                LLNotificationsUtil::add("CantLinkMaterial");
+                LLClipboard::instance().setCutMode(false);
+                return;
+            }
+        }
+
+
         LLPointer<LLInventoryCallback> cb = NULL;
         LLInventoryPanel* panel = mInventoryPanel.get();
         if (panel->getRootFolder()->isSingleFolderMode())
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index a4cb6ea65d..c54af7d9f1 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -2120,6 +2120,30 @@ void LLInventoryGallery::pasteAsLink()
     std::vector<LLUUID> objects;
     LLClipboard::instance().pasteFromClipboard(objects);
 
+    if (objects.size() == 0)
+    {
+        LLClipboard::instance().setCutMode(false);
+        return;
+    }
+
+    LLUUID& first_id = objects[0];
+    LLInventoryItem* item = gInventory.getItem(first_id);
+    if (item && item->getAssetUUID().isNull())
+    {
+        if (item->getActualType() == LLAssetType::AT_NOTECARD)
+        {
+            LLNotificationsUtil::add("CantLinkNotecard");
+            LLClipboard::instance().setCutMode(false);
+            return;
+        }
+        else if (item->getActualType() == LLAssetType::AT_MATERIAL)
+        {
+            LLNotificationsUtil::add("CantLinkMaterial");
+            LLClipboard::instance().setCutMode(false);
+            return;
+        }
+    }
+
     bool paste_into_root = mSelectedItemIDs.empty();
     for (LLUUID& dest : mSelectedItemIDs)
     {
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index b9d4f4471a..6bea648380 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -624,20 +624,23 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
     bool has_children = false;
     bool is_full_perm_item = false;
     bool is_copyable = false;
-    LLViewerInventoryItem* selected_item = gInventory.getItem(selected_id);
+
+    LLViewerInventoryCategory* selected_category = nullptr;
+    LLViewerInventoryItem* selected_item = nullptr;
 
     if(is_folder)
     {
-        LLInventoryCategory* category = gInventory.getCategory(selected_id);
-        if (category)
+        selected_category = dynamic_cast<LLViewerInventoryCategory*>(obj);
+        if (selected_category)
         {
-            folder_type = category->getPreferredType();
+            folder_type = selected_category->getPreferredType();
             is_system_folder = LLFolderType::lookupIsProtectedType(folder_type);
             has_children = (gInventory.categoryHasChildren(selected_id) != LLInventoryModel::CHILDREN_NO);
         }
     }
     else
     {
+        selected_item = dynamic_cast<LLViewerInventoryItem*>(obj);
         if (selected_item)
         {
             is_full_perm_item = selected_item->getIsFullPerm();
@@ -756,8 +759,7 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
     {
         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))
+            if (!selected_category || !LLFriendCardsManager::instance().isCategoryInFriendFolder(selected_category))
             {
                 items.push_back(std::string("New Folder"));
             }
@@ -785,6 +787,22 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
             if (inventory_linking)
             {
                 items.push_back(std::string("Paste As Link"));
+
+                if (selected_item)
+                {
+                    if (!LLAssetType::lookupCanLink(selected_item->getActualType()))
+                    {
+                        disabled_items.push_back(std::string("Paste As Link"));
+                    }
+                    else if (gInventory.isObjectDescendentOf(selected_item->getUUID(), gInventory.getLibraryRootFolderID()))
+                    {
+                        disabled_items.push_back(std::string("Paste As Link"));
+                    }
+                }
+                else if (selected_category && LLFolderType::lookupIsProtectedType(selected_category->getPreferredType()))
+                {
+                    disabled_items.push_back(std::string("Paste As Link"));
+                }
             }
         }
         if (is_folder && is_agent_inventory)
@@ -1045,9 +1063,8 @@ void LLInventoryGalleryContextMenu::updateMenuItemsVisibility(LLContextMenu* men
         {
             if (is_folder)
             {
-                LLViewerInventoryCategory* cat = gInventory.getCategory(selected_id);
-                if (cat
-                    && !LLFolderType::lookupIsProtectedType(cat->getPreferredType())
+                if (selected_category
+                    && !LLFolderType::lookupIsProtectedType(selected_category->getPreferredType())
                     && gInventory.isObjectDescendentOf(selected_id, gInventory.getRootFolderID()))
                 {
                     can_list = true;
diff --git a/indra/newview/llinventoryitemslist.cpp b/indra/newview/llinventoryitemslist.cpp
index cfa37cc3ee..73cc953692 100644
--- a/indra/newview/llinventoryitemslist.cpp
+++ b/indra/newview/llinventoryitemslist.cpp
@@ -40,6 +40,10 @@
 #include "llinventorymodel.h"
 #include "llviewerinventory.h"
 
+bool LLInventoryItemsList::sListIdleRegistered = false;
+LLInventoryItemsList::all_list_t LLInventoryItemsList::sAllLists;
+LLInventoryItemsList::all_list_t::iterator LLInventoryItemsList::sAllListIter;
+
 LLInventoryItemsList::Params::Params()
 {}
 
@@ -55,13 +59,39 @@ LLInventoryItemsList::LLInventoryItemsList(const LLInventoryItemsList::Params& p
 
     setNoFilteredItemsMsg(LLTrans::getString("InventoryNoMatchingItems"));
 
-    gIdleCallbacks.addFunction(idle, this);
+    sAllLists.push_back(this);
+    sAllListIter = sAllLists.begin();
+
+    if (!sListIdleRegistered)
+    {
+        sAllListIter = sAllLists.begin();
+        gIdleCallbacks.addFunction(idle, nullptr);
+
+        LLEventPumps::instance().obtain("LLApp").listen(
+            "LLInventoryItemsList",
+            [](const LLSD& stat)
+        {
+            std::string status(stat["status"]);
+            if (status != "running")
+            {
+                // viewer is starting shutdown
+                gIdleCallbacks.deleteFunction(idle, nullptr);
+            }
+            return false;
+        });
+        sListIdleRegistered = true;
+    }
 }
 
 // virtual
 LLInventoryItemsList::~LLInventoryItemsList()
 {
-    gIdleCallbacks.deleteFunction(idle, this);
+    auto it = std::find(sAllLists.begin(), sAllLists.end(), this);
+    if (it != sAllLists.end())
+    {
+        sAllLists.erase(it);
+        sAllListIter = sAllLists.begin();
+    }
 }
 
 void LLInventoryItemsList::refreshList(const LLInventoryModel::item_array_t item_array)
@@ -111,25 +141,55 @@ void LLInventoryItemsList::updateSelection()
     mSelectTheseIDs.clear();
 }
 
-void LLInventoryItemsList::doIdle()
+bool LLInventoryItemsList::doIdle()
 {
-    if (mRefreshState == REFRESH_COMPLETE) return;
+    if (mRefreshState == REFRESH_COMPLETE) return true; // done
 
     if (isInVisibleChain() || mForceRefresh || !getFilterSubString().empty())
     {
         refresh();
 
         mRefreshCompleteSignal(this, LLSD());
+        return false; // keep going
     }
+    return true; // done
 }
 
 //static
 void LLInventoryItemsList::idle(void* user_data)
 {
-    LLInventoryItemsList* self = static_cast<LLInventoryItemsList*>(user_data);
-    if ( self )
-    {   // Do the real idle
-        self->doIdle();
+    if (sAllLists.empty())
+        return;
+
+    LL_PROFILE_ZONE_SCOPED;
+
+    using namespace std::chrono;
+    auto start = steady_clock::now();
+    const milliseconds time_limit = milliseconds(3);
+    const auto end_time = start + time_limit;
+    S32 max_update_count = 50;
+
+    if (sAllListIter == sAllLists.end())
+    {
+        sAllListIter = sAllLists.begin();
+    }
+
+    S32 updated = 0;
+    while (steady_clock::now() < end_time
+           && updated < max_update_count
+           && sAllListIter != sAllLists.end())
+    {
+        LLInventoryItemsList* list = *sAllListIter;
+        // Refresh is split into multiple separate parts,
+        // so keep repeating it while there is time, until done.
+        // Todo: refresh() split is pointless now?
+        // Or still useful for large folders?
+        if (list->doIdle())
+        {
+            // Item is done
+            ++sAllListIter;
+            updated++;
+        }
     }
 }
 
@@ -141,6 +201,7 @@ void LLInventoryItemsList::refresh()
     {
     case REFRESH_ALL:
         {
+            LL_PROFILE_ZONE_NAMED("items_refresh_all");
             mAddedItems.clear();
             mRemovedItems.clear();
             computeDifference(getIDs(), mAddedItems, mRemovedItems);
@@ -163,6 +224,7 @@ void LLInventoryItemsList::refresh()
         }
     case REFRESH_LIST_ERASE:
         {
+            LL_PROFILE_ZONE_NAMED("items_refresh_erase");
             uuid_vec_t::const_iterator it = mRemovedItems.begin();
             for (; mRemovedItems.end() != it; ++it)
             {
@@ -175,6 +237,7 @@ void LLInventoryItemsList::refresh()
         }
     case REFRESH_LIST_APPEND:
         {
+            LL_PROFILE_ZONE_NAMED("items_refresh_append");
             static const unsigned ADD_LIMIT = 25; // Note: affects perfomance
 
             unsigned int nadded = 0;
@@ -239,6 +302,7 @@ void LLInventoryItemsList::refresh()
         }
     case REFRESH_LIST_SORT:
         {
+            LL_PROFILE_ZONE_NAMED("items_refresh_sort");
             // Filter, sort, rearrange and notify parent about shape changes
             filterItems(true, true);
 
@@ -255,7 +319,10 @@ void LLInventoryItemsList::refresh()
             break;
         }
     default:
-        break;
+        {
+            mRefreshState = REFRESH_COMPLETE;
+            break;
+        }
     }
 
     setForceRefresh(mRefreshState != REFRESH_COMPLETE);
diff --git a/indra/newview/llinventoryitemslist.h b/indra/newview/llinventoryitemslist.h
index 9ebeb5e52b..b20c27eec8 100644
--- a/indra/newview/llinventoryitemslist.h
+++ b/indra/newview/llinventoryitemslist.h
@@ -59,7 +59,10 @@ public:
      * Sets the flag indicating that the list needs to be refreshed even if it is
      * not currently visible.
      */
-    void setForceRefresh(bool force_refresh) { mForceRefresh = force_refresh; }
+    void setForceRefresh(bool force_refresh)
+    {
+        mForceRefresh = force_refresh;
+    }
 
     /**
     * If refreshes when invisible.
@@ -76,7 +79,7 @@ public:
      * This is needed for example to filter items of the list hidden by closed
      * accordion tab.
      */
-    virtual void doIdle();                      // Real idle routine
+    bool doIdle();                          // Real idle routine
     static void idle(void* user_data);      // static glue to doIdle()
 
 protected:
@@ -126,6 +129,12 @@ private:
     bool mForceRefresh;
 
     commit_signal_t mRefreshCompleteSignal;
+
+    // Update synchronization
+    typedef std::vector<LLInventoryItemsList*> all_list_t;
+    static all_list_t sAllLists;
+    static all_list_t::iterator sAllListIter;
+    static bool sListIdleRegistered;
 };
 
 #endif //LL_LLINVENTORYITEMSLIST_H
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index 999f431bd6..1a07efe25d 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -80,8 +80,8 @@ const static std::string MULTI_LINE_PREFIX(" ");
  *
  * Note: "You" was used as an avatar names in viewers of previous versions
  */
-const static boost::regex TIMESTAMP_AND_STUFF("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}:\\d{2}\\]\\s+|\\[\\d{1,2}:\\d{2}\\]\\s+)?(.*)$");
-const static boost::regex TIMESTAMP("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}\\]|\\[\\d{1,2}:\\d{2}\\]).*");
+const static boost::regex TIMESTAMP_AND_STUFF("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}:\\d{2}\\s[AaPp][Mm]\\]\\s+|\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}:\\d{2}\\]\\s+|\\[\\d{1,2}:\\d{2}:\\d{2}\\s[AaPp][Mm]\\]\\s+|\\[\\d{1,2}:\\d{2}\\]\\s+)?(.*)$");
+const static boost::regex TIMESTAMP("^(\\[\\d{4}/\\d{1,2}/\\d{1,2}\\s+\\d{1,2}:\\d{2}(\\s[AaPp][Mm])?\\]|\\[\\d{1,2}:\\d{2}(\\s[AaPp][Mm])?\\]).*");
 
 /**
  *  Regular expression suitable to match names like
@@ -152,6 +152,10 @@ public:
 
     void checkAndCutOffDate(std::string& time_str)
     {
+        if (time_str.size() < 10) // not enough space for a date
+        {
+            return;
+        }
         // Cuts off the "%Y/%m/%d" from string for todays timestamps.
         // Assume that passed string has at least "%H:%M" time format.
         date log_date(not_a_date_time);
@@ -168,20 +172,12 @@ public:
 
         if ( days_alive == zero_days )
         {
-            // Yep, today's so strip "%Y/%m/%d" info
-            ptime stripped_time(not_a_date_time);
-
-            mTimeStream.str(LLStringUtil::null);
-            mTimeStream << time_str;
-            mTimeStream >> stripped_time;
-            mTimeStream.clear();
-
-            time_str.clear();
-
-            mTimeStream.str(LLStringUtil::null);
-            mTimeStream << stripped_time;
-            mTimeStream >> time_str;
-            mTimeStream.clear();
+            size_t pos = time_str.find_first_of(' ');
+            if (pos != std::string::npos)
+            {
+                time_str.erase(0, pos + 1);
+                LLStringUtil::trim(time_str);
+            }
         }
 
         LL_DEBUGS("LLChatLogParser")
@@ -310,18 +306,24 @@ std::string LLLogChat::timestamp2LogString(U32 timestamp, bool withdate)
     std::string timeStr;
     if (withdate)
     {
-        timeStr = "[" + LLTrans::getString ("TimeYear") + "]/["
-                  + LLTrans::getString ("TimeMonth") + "]/["
-                  + LLTrans::getString ("TimeDay") + "] ["
-                  + LLTrans::getString ("TimeHour") + "]:["
-                  + LLTrans::getString ("TimeMin") + "]:["
-                  + LLTrans::getString ("TimeSec") + "]";
+        timeStr = "[" + LLTrans::getString("TimeYear") + "]/["
+            + LLTrans::getString("TimeMonth") + "]/["
+            + LLTrans::getString("TimeDay") + "] ";
+    }
+
+    static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+    if (use_24h)
+    {
+        timeStr += "[" + LLTrans::getString("TimeHour") + "]:["
+            + LLTrans::getString("TimeMin") + "]:["
+            + LLTrans::getString("TimeSec") + "]";
     }
     else
     {
-        timeStr = "[" + LLTrans::getString("TimeHour") + "]:["
-                  + LLTrans::getString ("TimeMin")+"]:["
-                  + LLTrans::getString ("TimeSec")+"]";
+        timeStr += "[" + LLTrans::getString("TimeHour12") + "]:["
+            + LLTrans::getString("TimeMin") + "]:["
+            + LLTrans::getString("TimeSec") + "] ["
+            + LLTrans::getString("TimeAMPM") + "]";
     }
 
     LLSD substitution;
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index 4bffe7feac..41cec4f074 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -62,7 +62,7 @@
 
 const S32 LOGIN_MAX_RETRIES = 0; // Viewer should not autmatically retry login
 const F32 LOGIN_SRV_TIMEOUT_MIN = 10;
-const F32 LOGIN_SRV_TIMEOUT_MAX = 120;
+const F32 LOGIN_SRV_TIMEOUT_MAX = 180;
 const F32 LOGIN_DNS_TIMEOUT_FACTOR = 0.9; // make DNS wait shorter then retry time
 
 class LLLoginInstance::Disposable {
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index 8d5f94cdbb..413f02b723 100644
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -256,6 +256,7 @@
 //     mDecompositionRequests   mMutex        rw.repo.mMutex, ro.repo.none [5]
 //     mPhysicsShapeRequests    mMutex        rw.repo.mMutex, ro.repo.none [5]
 //     mDecompositionQ          mMutex        rw.repo.mLoadedMutex, rw.main.mLoadedMutex [5] (was:  [0])
+//     mPhysicsQ                mMutex        rw.repo.mLoadedMutex, rw.main.mLoadedMutex [5] (was:  [0])
 //     mHeaderReqQ              mMutex        ro.repo.none [5], rw.repo.mMutex, rw.any.mMutex
 //     mLODReqQ                 mMutex        ro.repo.none [5], rw.repo.mMutex, rw.any.mMutex
 //     mUnavailableQ            mMutex        rw.repo.none [0], ro.main.none [5], rw.main.mLoadedMutex
@@ -982,6 +983,12 @@ LLMeshRepoThread::~LLMeshRepoThread()
         mDecompositionQ.pop_front();
     }
 
+    while (!mPhysicsQ.empty())
+    {
+        delete mPhysicsQ.front();
+        mPhysicsQ.pop_front();
+    }
+
     delete mHttpRequest;
     mHttpRequest = nullptr;
     delete mMutex;
@@ -2565,12 +2572,12 @@ EMeshProcessingResult LLMeshRepoThread::physicsShapeReceived(const LLUUID& mesh_
 
     {
         LLMutexLock lock(mLoadedMutex);
-        mDecompositionQ.push_back(d);
+        mPhysicsQ.push_back(d);
     }
     return MESH_OK;
 }
 
-LLMeshUploadThread::LLMeshUploadThread(LLMeshUploadThread::instance_list& data, const LLMeshUploadThread::lod_sources_map_t& sources_list,
+LLMeshUploadThread::LLMeshUploadThread(LLMeshUploadThread::instance_list_t& data, const LLMeshUploadThread::lod_sources_map_t& sources_list,
                                        LLVector3& scale, bool upload_textures,
                                        bool upload_skin, bool upload_joints, bool lock_scale_if_joint_position,
                                        const std::string & upload_url, LLUUID destination_folder_id, bool do_upload,
@@ -2652,7 +2659,7 @@ void LLMeshUploadThread::DecompRequest::completed()
 void LLMeshUploadThread::preStart()
 {
     //build map of LLModel refs to instances for callbacks
-    for (instance_list::iterator iter = mInstanceList.begin(); iter != mInstanceList.end(); ++iter)
+    for (instance_list_t::iterator iter = mInstanceList.begin(); iter != mInstanceList.end(); ++iter)
     {
         mInstance[iter->mModel].push_back(*iter);
     }
@@ -2701,6 +2708,179 @@ LLSD llsd_from_file(std::string filename)
     return result;
 }
 
+void LLMeshUploadThread::packModelIntance(
+    LLModel* model,
+    LLMeshUploadThread::instance_list_t& instance_list,
+    std::string& model_name,
+    LLSD& res,
+    S32& mesh_num,
+    S32& texture_num,
+    S32& instance_num,
+    std::unordered_set<LLViewerTexture* >& textures,
+    std::unordered_map<LLViewerTexture*, S32> texture_index,
+    std::unordered_map<LLModel*, S32>& mesh_index,
+    std::vector<std::string>& texture_list_dest,
+    bool include_textures
+    )
+{
+    LLMeshUploadData data;
+    data.mBaseModel = model;
+
+    LLModelInstance& first_instance = *(instance_list.begin());
+    for (S32 i = 0; i < 5; i++)
+    {
+        data.mModel[i] = first_instance.mLOD[i];
+    }
+
+    if (mesh_index.find(data.mBaseModel) == mesh_index.end())
+    {
+        // Have not seen this model before - create a new mesh_list entry for it.
+        if (model_name.empty())
+        {
+            model_name = data.mBaseModel->getName();
+        }
+
+        std::stringstream ostr;
+
+        LLModel::Decomposition& decomp =
+            data.mModel[LLModel::LOD_PHYSICS].notNull() ?
+            data.mModel[LLModel::LOD_PHYSICS]->mPhysics :
+            data.mBaseModel->mPhysics;
+
+        decomp.mBaseHull = mHullMap[data.mBaseModel];
+
+        LLSD mesh_header = LLModel::writeModel(
+            ostr,
+            data.mModel[LLModel::LOD_PHYSICS],
+            data.mModel[LLModel::LOD_HIGH],
+            data.mModel[LLModel::LOD_MEDIUM],
+            data.mModel[LLModel::LOD_LOW],
+            data.mModel[LLModel::LOD_IMPOSTOR],
+            decomp,
+            mUploadSkin,
+            mUploadJoints,
+            mLockScaleIfJointPosition,
+            LLModel::WRITE_BINARY,
+            false,
+            data.mBaseModel->mSubmodelID);
+
+        data.mAssetData = ostr.str();
+        std::string str = ostr.str();
+
+        res["mesh_list"][mesh_num] = LLSD::Binary(str.begin(), str.end());
+        mesh_index[data.mBaseModel] = mesh_num;
+        mesh_num++;
+    }
+
+    // For all instances that use this model
+    for (instance_list_t::iterator instance_iter = instance_list.begin();
+        instance_iter != instance_list.end();
+        ++instance_iter)
+    {
+        LLModelInstance& instance = *instance_iter;
+
+        LLSD instance_entry;
+
+        for (S32 i = 0; i < 5; i++)
+        {
+            data.mModel[i] = instance.mLOD[i];
+        }
+
+        LLVector3 pos, scale;
+        LLQuaternion rot;
+        LLMatrix4 transformation = instance.mTransform;
+        decomposeMeshMatrix(transformation, pos, rot, scale);
+        instance_entry["position"] = ll_sd_from_vector3(pos);
+        instance_entry["rotation"] = ll_sd_from_quaternion(rot);
+        instance_entry["scale"] = ll_sd_from_vector3(scale);
+
+        instance_entry["material"] = LL_MCODE_WOOD;
+        if (model->mSubmodelID)
+        {
+            // Should it really be different?
+            instance_entry["physics_shape_type"] = (U8)(LLViewerObject::PHYSICS_SHAPE_NONE);
+        }
+        else
+        {
+            instance_entry["physics_shape_type"] = data.mModel[LLModel::LOD_PHYSICS].notNull() ? (U8)(LLViewerObject::PHYSICS_SHAPE_PRIM) : (U8)(LLViewerObject::PHYSICS_SHAPE_CONVEX_HULL);
+        }
+        instance_entry["mesh"] = mesh_index[data.mBaseModel];
+        instance_entry["mesh_name"] = instance.mLabel;
+
+        instance_entry["face_list"] = LLSD::emptyArray();
+
+        // We want to be able to allow more than 8 materials...
+        //
+        S32 end = llmin((S32)data.mBaseModel->mMaterialList.size(), instance.mModel->getNumVolumeFaces());
+
+        for (S32 face_num = 0; face_num < end; face_num++)
+        {
+            // multiple faces can reuse the same material
+            LLImportMaterial& material = instance.mMaterial[data.mBaseModel->mMaterialList[face_num]];
+            LLSD face_entry = LLSD::emptyMap();
+
+            LLViewerFetchedTexture* texture = NULL;
+
+            if (material.mDiffuseMapFilename.size())
+            {
+                texture = FindViewerTexture(material);
+            }
+
+            if ((texture != NULL) &&
+                (textures.find(texture) == textures.end()))
+            {
+                textures.insert(texture);
+            }
+
+            std::stringstream texture_str;
+            if (texture != NULL && include_textures && mUploadTextures)
+            {
+                if (texture->hasSavedRawImage())
+                {
+                    LLImageDataLock lock(texture->getSavedRawImage());
+
+                    LLPointer<LLImageJ2C> upload_file =
+                        LLViewerTextureList::convertToUploadFile(texture->getSavedRawImage());
+
+                    if (!upload_file.isNull() && upload_file->getDataSize() && !upload_file->isBufferInvalid())
+                    {
+                        texture_str.write((const char*)upload_file->getData(), upload_file->getDataSize());
+                    }
+                }
+            }
+
+            if (texture != NULL &&
+                mUploadTextures &&
+                texture_index.find(texture) == texture_index.end())
+            {
+                texture_index[texture] = texture_num;
+                std::string str = texture_str.str();
+                res["texture_list"][texture_num] = LLSD::Binary(str.begin(), str.end());
+                // store indexes for error handling;
+                texture_list_dest.push_back(material.mDiffuseMapFilename);
+                texture_num++;
+            }
+
+            // Subset of TextureEntry fields.
+            if (texture != NULL && mUploadTextures)
+            {
+                face_entry["image"] = texture_index[texture];
+                face_entry["scales"] = 1.0;
+                face_entry["scalet"] = 1.0;
+                face_entry["offsets"] = 0.0;
+                face_entry["offsett"] = 0.0;
+                face_entry["imagerot"] = 0.0;
+            }
+            face_entry["diffuse_color"] = ll_sd_from_color4(material.mDiffuseColor);
+            face_entry["fullbright"] = material.mFullbright;
+            instance_entry["face_list"][face_num] = face_entry;
+        }
+
+        res["instance_list"][instance_num] = instance_entry;
+        instance_num++;
+    }
+}
+
 void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, std::vector<std::string>& texture_list_dest, bool include_textures)
 {
     LLSD result;
@@ -2734,6 +2914,7 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, std::vector<std::string>&
     }
     S32 mesh_num = 0;
     S32 texture_num = 0;
+    S32 instance_num = 0;
 
     std::unordered_set<LLViewerTexture* > textures;
     std::unordered_map<LLViewerTexture*,S32> texture_index;
@@ -2741,7 +2922,34 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, std::vector<std::string>&
     std::unordered_map<LLModel*,S32> mesh_index;
     std::string model_name;
 
-    S32 instance_num = 0;
+    // If server gets a m1, m2, m3, m4 list, m1 becomes the root
+    // and the rest go as m4, m3, m2
+    // to counter that mInstance is sorted as m4, m3, m2, m1
+    // and we grab m1 from the end and send it first
+    LLModel* root_model = nullptr;
+    for (instance_map_t::reverse_iterator iter = mInstance.rbegin(); iter != mInstance.rend(); ++iter)
+    {
+        if (iter->first->mSubmodelID)
+        {
+            // Submodel can't be root
+            continue;
+        }
+        root_model = iter->first;
+        packModelIntance(
+            iter->first,
+            iter->second,
+            model_name,
+            res,
+            mesh_num,
+            texture_num,
+            instance_num,
+            textures,
+            texture_index,
+            mesh_index,
+            texture_list_dest,
+            include_textures);
+        break;
+    }
 
     // Handle models, ignore submodels for now.
     // Probably should pre-sort by mSubmodelID instead of running twice.
@@ -2749,319 +2957,53 @@ void LLMeshUploadThread::wholeModelToLLSD(LLSD& dest, std::vector<std::string>&
     // deterministic order.
     for (auto& iter : mInstance)
     {
-        LLMeshUploadData data;
-        data.mBaseModel = iter.first;
-
-        if (data.mBaseModel->mSubmodelID)
+        if (iter.first->mSubmodelID)
         {
             // These are handled below to insure correct parenting order on creation
             // due to map walking being based on model address (aka random)
             continue;
         }
-
-        LLModelInstance& first_instance = *(iter.second.begin());
-        for (S32 i = 0; i < 5; i++)
-        {
-            data.mModel[i] = first_instance.mLOD[i];
-        }
-
-        if (mesh_index.find(data.mBaseModel) == mesh_index.end())
-        {
-            // Have not seen this model before - create a new mesh_list entry for it.
-            if (model_name.empty())
-            {
-                model_name = data.mBaseModel->getName();
-            }
-
-            std::stringstream ostr;
-
-            LLModel::Decomposition& decomp =
-                data.mModel[LLModel::LOD_PHYSICS].notNull() ?
-                data.mModel[LLModel::LOD_PHYSICS]->mPhysics :
-                data.mBaseModel->mPhysics;
-
-            decomp.mBaseHull = mHullMap[data.mBaseModel];
-
-            LLSD mesh_header = LLModel::writeModel(
-                ostr,
-                data.mModel[LLModel::LOD_PHYSICS],
-                data.mModel[LLModel::LOD_HIGH],
-                data.mModel[LLModel::LOD_MEDIUM],
-                data.mModel[LLModel::LOD_LOW],
-                data.mModel[LLModel::LOD_IMPOSTOR],
-                decomp,
-                mUploadSkin,
-                mUploadJoints,
-                mLockScaleIfJointPosition,
-                LLModel::WRITE_BINARY,
-                false,
-                data.mBaseModel->mSubmodelID);
-
-            data.mAssetData = ostr.str();
-            std::string str = ostr.str();
-
-            res["mesh_list"][mesh_num] = LLSD::Binary(str.begin(),str.end());
-            mesh_index[data.mBaseModel] = mesh_num;
-            mesh_num++;
-        }
-
-        // For all instances that use this model
-        for (instance_list::iterator instance_iter = iter.second.begin();
-             instance_iter != iter.second.end();
-             ++instance_iter)
+        if (root_model == iter.first)
         {
-
-            LLModelInstance& instance = *instance_iter;
-
-            LLSD instance_entry;
-
-            for (S32 i = 0; i < 5; i++)
-            {
-                data.mModel[i] = instance.mLOD[i];
-            }
-
-            LLVector3 pos, scale;
-            LLQuaternion rot;
-            LLMatrix4 transformation = instance.mTransform;
-            decomposeMeshMatrix(transformation,pos,rot,scale);
-            instance_entry["position"] = ll_sd_from_vector3(pos);
-            instance_entry["rotation"] = ll_sd_from_quaternion(rot);
-            instance_entry["scale"] = ll_sd_from_vector3(scale);
-
-            instance_entry["material"] = LL_MCODE_WOOD;
-            instance_entry["physics_shape_type"] = data.mModel[LLModel::LOD_PHYSICS].notNull() ? (U8)(LLViewerObject::PHYSICS_SHAPE_PRIM) : (U8)(LLViewerObject::PHYSICS_SHAPE_CONVEX_HULL);
-            instance_entry["mesh"] = mesh_index[data.mBaseModel];
-            instance_entry["mesh_name"] = instance.mLabel;
-
-            instance_entry["face_list"] = LLSD::emptyArray();
-
-            // We want to be able to allow more than 8 materials...
-            //
-            S32 end = llmin((S32)data.mBaseModel->mMaterialList.size(), instance.mModel->getNumVolumeFaces()) ;
-
-            for (S32 face_num = 0; face_num < end; face_num++)
-            {
-                // multiple faces can reuse the same material
-                LLImportMaterial& material = instance.mMaterial[data.mBaseModel->mMaterialList[face_num]];
-                LLSD face_entry = LLSD::emptyMap();
-
-                LLViewerFetchedTexture *texture = NULL;
-
-                if (material.mDiffuseMapFilename.size())
-                {
-                    texture = FindViewerTexture(material);
-                }
-
-                if ((texture != NULL) &&
-                    (textures.find(texture) == textures.end()))
-                {
-                    textures.insert(texture);
-                }
-
-                std::stringstream texture_str;
-                if (texture != NULL && include_textures && mUploadTextures)
-                {
-                    if (texture->hasSavedRawImage())
-                    {
-                        LLImageDataLock lock(texture->getSavedRawImage());
-
-                        LLPointer<LLImageJ2C> upload_file =
-                            LLViewerTextureList::convertToUploadFile(texture->getSavedRawImage());
-
-                        if (!upload_file.isNull() && upload_file->getDataSize() && !upload_file->isBufferInvalid())
-                        {
-                            texture_str.write((const char*) upload_file->getData(), upload_file->getDataSize());
-                        }
-                    }
-                }
-
-                if (texture != NULL &&
-                    mUploadTextures &&
-                    texture_index.find(texture) == texture_index.end())
-                {
-                    texture_index[texture] = texture_num;
-                    std::string str = texture_str.str();
-                    res["texture_list"][texture_num] = LLSD::Binary(str.begin(),str.end());
-                    // store indexes for error handling;
-                    texture_list_dest.push_back(material.mDiffuseMapFilename);
-                    texture_num++;
-                }
-
-                // Subset of TextureEntry fields.
-                if (texture != NULL && mUploadTextures)
-                {
-                    face_entry["image"] = texture_index[texture];
-                    face_entry["scales"] = 1.0;
-                    face_entry["scalet"] = 1.0;
-                    face_entry["offsets"] = 0.0;
-                    face_entry["offsett"] = 0.0;
-                    face_entry["imagerot"] = 0.0;
-                }
-                face_entry["diffuse_color"] = ll_sd_from_color4(material.mDiffuseColor);
-                face_entry["fullbright"] = material.mFullbright;
-                instance_entry["face_list"][face_num] = face_entry;
-            }
-
-            res["instance_list"][instance_num] = instance_entry;
-            instance_num++;
+            // Reached root, root was already packed and is last non-submodel
+            break;
         }
+        packModelIntance(
+            iter.first,
+            iter.second,
+            model_name,
+            res,
+            mesh_num,
+            texture_num,
+            instance_num,
+            textures,
+            texture_index,
+            mesh_index,
+            texture_list_dest,
+            include_textures);
     }
 
     // Now handle the submodels.
     for (auto& iter : mInstance)
     {
-        LLMeshUploadData data;
-        data.mBaseModel = iter.first;
-
-        if (!data.mBaseModel->mSubmodelID)
+        if (!iter.first->mSubmodelID)
         {
             // These were handled above already...
-            //
             continue;
         }
-
-        LLModelInstance& first_instance = *(iter.second.begin());
-        for (S32 i = 0; i < 5; i++)
-        {
-            data.mModel[i] = first_instance.mLOD[i];
-        }
-
-        if (mesh_index.find(data.mBaseModel) == mesh_index.end())
-        {
-            // Have not seen this model before - create a new mesh_list entry for it.
-            if (model_name.empty())
-            {
-                model_name = data.mBaseModel->getName();
-            }
-
-            std::stringstream ostr;
-
-            LLModel::Decomposition& decomp =
-                data.mModel[LLModel::LOD_PHYSICS].notNull() ?
-                data.mModel[LLModel::LOD_PHYSICS]->mPhysics :
-                data.mBaseModel->mPhysics;
-
-            decomp.mBaseHull = mHullMap[data.mBaseModel];
-
-            LLSD mesh_header = LLModel::writeModel(
-                ostr,
-                data.mModel[LLModel::LOD_PHYSICS],
-                data.mModel[LLModel::LOD_HIGH],
-                data.mModel[LLModel::LOD_MEDIUM],
-                data.mModel[LLModel::LOD_LOW],
-                data.mModel[LLModel::LOD_IMPOSTOR],
-                decomp,
-                mUploadSkin,
-                mUploadJoints,
-                mLockScaleIfJointPosition,
-                LLModel::WRITE_BINARY,
-                false,
-                data.mBaseModel->mSubmodelID);
-
-            data.mAssetData = ostr.str();
-            std::string str = ostr.str();
-
-            res["mesh_list"][mesh_num] = LLSD::Binary(str.begin(),str.end());
-            mesh_index[data.mBaseModel] = mesh_num;
-            mesh_num++;
-        }
-
-        // For all instances that use this model
-        for (instance_list::iterator instance_iter = iter.second.begin();
-             instance_iter != iter.second.end();
-             ++instance_iter)
-        {
-
-            LLModelInstance& instance = *instance_iter;
-
-            LLSD instance_entry;
-
-            for (S32 i = 0; i < 5; i++)
-            {
-                data.mModel[i] = instance.mLOD[i];
-            }
-
-            LLVector3 pos, scale;
-            LLQuaternion rot;
-            LLMatrix4 transformation = instance.mTransform;
-            decomposeMeshMatrix(transformation,pos,rot,scale);
-            instance_entry["position"] = ll_sd_from_vector3(pos);
-            instance_entry["rotation"] = ll_sd_from_quaternion(rot);
-            instance_entry["scale"] = ll_sd_from_vector3(scale);
-
-            instance_entry["material"] = LL_MCODE_WOOD;
-            instance_entry["physics_shape_type"] = (U8)(LLViewerObject::PHYSICS_SHAPE_NONE);
-            instance_entry["mesh"] = mesh_index[data.mBaseModel];
-
-            instance_entry["face_list"] = LLSD::emptyArray();
-
-            // We want to be able to allow more than 8 materials...
-            //
-            S32 end = llmin((S32)instance.mMaterial.size(), instance.mModel->getNumVolumeFaces()) ;
-
-            for (S32 face_num = 0; face_num < end; face_num++)
-            {
-                LLImportMaterial& material = instance.mMaterial[data.mBaseModel->mMaterialList[face_num]];
-                LLSD face_entry = LLSD::emptyMap();
-
-                LLViewerFetchedTexture *texture = NULL;
-
-                if (material.mDiffuseMapFilename.size())
-                {
-                    texture = FindViewerTexture(material);
-                }
-
-                if ((texture != NULL) &&
-                    (textures.find(texture) == textures.end()))
-                {
-                    textures.insert(texture);
-                }
-
-                std::stringstream texture_str;
-                if (texture != NULL && include_textures && mUploadTextures)
-                {
-                    if (texture->hasSavedRawImage())
-                    {
-                        LLImageDataLock lock(texture->getSavedRawImage());
-
-                        LLPointer<LLImageJ2C> upload_file =
-                            LLViewerTextureList::convertToUploadFile(texture->getSavedRawImage());
-
-                        if (!upload_file.isNull() && upload_file->getDataSize())
-                        {
-                            texture_str.write((const char*) upload_file->getData(), upload_file->getDataSize());
-                        }
-                    }
-                }
-
-                if (texture != NULL &&
-                    mUploadTextures &&
-                    texture_index.find(texture) == texture_index.end())
-                {
-                    texture_index[texture] = texture_num;
-                    std::string str = texture_str.str();
-                    res["texture_list"][texture_num] = LLSD::Binary(str.begin(),str.end());
-                    texture_num++;
-                }
-
-                // Subset of TextureEntry fields.
-                if (texture != NULL && mUploadTextures)
-                {
-                    face_entry["image"] = texture_index[texture];
-                    face_entry["scales"] = 1.0;
-                    face_entry["scalet"] = 1.0;
-                    face_entry["offsets"] = 0.0;
-                    face_entry["offsett"] = 0.0;
-                    face_entry["imagerot"] = 0.0;
-                }
-                face_entry["diffuse_color"] = ll_sd_from_color4(material.mDiffuseColor);
-                face_entry["fullbright"] = material.mFullbright;
-                instance_entry["face_list"][face_num] = face_entry;
-            }
-
-            res["instance_list"][instance_num] = instance_entry;
-            instance_num++;
-        }
+        packModelIntance(
+            iter.first,
+            iter.second,
+            model_name,
+            res,
+            mesh_num,
+            texture_num,
+            instance_num,
+            textures,
+            texture_index,
+            mesh_index,
+            texture_list_dest,
+            include_textures);
     }
 
     if (model_name.empty()) model_name = "mesh model";
@@ -3077,7 +3019,7 @@ void LLMeshUploadThread::generateHulls()
 {
     bool has_valid_requests = false ;
 
-    for (instance_map::iterator iter = mInstance.begin(); iter != mInstance.end(); ++iter)
+    for (instance_map_t::iterator iter = mInstance.begin(); iter != mInstance.end(); ++iter)
     {
         LLMeshUploadData data;
         data.mBaseModel = iter->first;
@@ -3441,13 +3383,14 @@ void LLMeshRepoThread::notifyLoadedMeshes()
         }
     }
 
-    if (!mSkinInfoQ.empty() || !mSkinUnavailableQ.empty() || ! mDecompositionQ.empty())
+    if (!mSkinInfoQ.empty() || !mSkinUnavailableQ.empty() || !mDecompositionQ.empty() || !mPhysicsQ.empty())
     {
         if (mLoadedMutex->trylock())
         {
             std::deque<LLPointer<LLMeshSkinInfo>> skin_info_q;
             std::deque<UUIDBasedRequest> skin_info_unavail_q;
             std::list<LLModel::Decomposition*> decomp_q;
+            std::list<LLModel::Decomposition*> physics_q;
 
             if (! mSkinInfoQ.empty())
             {
@@ -3464,6 +3407,11 @@ void LLMeshRepoThread::notifyLoadedMeshes()
                 decomp_q.swap(mDecompositionQ);
             }
 
+            if (!mPhysicsQ.empty())
+            {
+                physics_q.swap(mPhysicsQ);
+            }
+
             mLoadedMutex->unlock();
 
             // Process the elements free of the lock
@@ -3480,9 +3428,15 @@ void LLMeshRepoThread::notifyLoadedMeshes()
 
             while (! decomp_q.empty())
             {
-                gMeshRepo.notifyDecompositionReceived(decomp_q.front());
+                gMeshRepo.notifyDecompositionReceived(decomp_q.front(), false);
                 decomp_q.pop_front();
             }
+
+            while (!physics_q.empty())
+            {
+                gMeshRepo.notifyDecompositionReceived(physics_q.front(), true);
+                physics_q.pop_front();
+            }
         }
     }
 
@@ -4724,13 +4678,13 @@ void LLMeshRepository::notifySkinInfoUnavailable(const LLUUID& mesh_id)
     }
 }
 
-void LLMeshRepository::notifyDecompositionReceived(LLModel::Decomposition* decomp)
+void LLMeshRepository::notifyDecompositionReceived(LLModel::Decomposition* decomp, bool physics_mesh)
 {
-    decomposition_map::iterator iter = mDecompositionMap.find(decomp->mMeshID);
+    LLUUID decomp_id = decomp->mMeshID; // Copy to avoid invalidation in below deletion
+    decomposition_map::iterator iter = mDecompositionMap.find(decomp_id);
     if (iter == mDecompositionMap.end())
     { //just insert decomp into map
-        mDecompositionMap[decomp->mMeshID] = decomp;
-        mLoadingDecompositions.erase(decomp->mMeshID);
+        mDecompositionMap[decomp_id] = decomp;
         sCacheBytesDecomps += decomp->sizeBytes();
     }
     else
@@ -4738,10 +4692,17 @@ void LLMeshRepository::notifyDecompositionReceived(LLModel::Decomposition* decom
         sCacheBytesDecomps -= iter->second->sizeBytes();
         iter->second->merge(decomp);
         sCacheBytesDecomps += iter->second->sizeBytes();
-
-        mLoadingDecompositions.erase(decomp->mMeshID);
         delete decomp;
     }
+
+    if (physics_mesh)
+    {
+        mLoadingPhysicsShapes.erase(decomp_id);
+    }
+    else
+    {
+        mLoadingDecompositions.erase(decomp_id);
+    }
 }
 
 void LLMeshRepository::notifyMeshLoaded(const LLVolumeParams& mesh_params, LLVolume* volume, S32 lod)
@@ -4888,7 +4849,6 @@ void LLMeshRepository::fetchPhysicsShape(const LLUUID& mesh_id)
             std::unordered_set<LLUUID>::iterator iter = mLoadingPhysicsShapes.find(mesh_id);
             if (iter == mLoadingPhysicsShapes.end())
             { //no request pending for this skin info
-                // *FIXME:  Nothing ever deletes entries, can't be right
                 mLoadingPhysicsShapes.insert(mesh_id);
                 mPendingPhysicsShapeRequests.push(mesh_id);
             }
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index ab17b921d6..01b51e753e 100644
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -521,6 +521,9 @@ public:
     // list of completed Decomposition info requests
     std::list<LLModel::Decomposition*> mDecompositionQ;
 
+    // list of completed Physics Mesh info requests
+    std::list<LLModel::Decomposition*> mPhysicsQ;
+
     //queue of requested headers
     std::queue<HeaderRequest> mHeaderReqQ;
 
@@ -668,11 +671,11 @@ public:
     LLPointer<DecompRequest> mFinalDecomp;
     volatile bool   mPhysicsComplete;
 
-    typedef std::map<LLPointer<LLModel>, std::vector<LLVector3> > hull_map;
-    hull_map        mHullMap;
+    typedef std::map<LLPointer<LLModel>, std::vector<LLVector3> > hull_map_t;
+    hull_map_t      mHullMap;
 
-    typedef std::vector<LLModelInstance> instance_list;
-    instance_list   mInstanceList;
+    typedef std::vector<LLModelInstance> instance_list_t;
+    instance_list_t mInstanceList;
 
     // Upload should happen in deterministic order, so sort instances by model name.
     struct LLUploadModelInstanceLess
@@ -686,11 +689,11 @@ public:
             }
             // Note: probably can sort by mBaseModel->mSubmodelID here as well to avoid
             // running over the list twice in wholeModelToLLSD.
-            return a->mLabel < b->mLabel;
+            return a->mLabel > b->mLabel;
         }
     };
-    typedef std::map<LLPointer<LLModel>, instance_list, LLUploadModelInstanceLess> instance_map;
-    instance_map    mInstance;
+    typedef std::map<LLPointer<LLModel>, instance_list_t, LLUploadModelInstanceLess> instance_map_t;
+    instance_map_t    mInstance;
     typedef std::map<std::string, std::string> lod_sources_map_t;
     lod_sources_map_t mLodSources;
 
@@ -709,7 +712,7 @@ public:
     std::string     mWholeModelUploadURL;
     LLUUID          mDestinationFolderId;
 
-    LLMeshUploadThread(instance_list& data, const lod_sources_map_t& sources_list,
+    LLMeshUploadThread(instance_list_t& data, const lod_sources_map_t& sources_list,
                        LLVector3& scale, bool upload_textures,
                        bool upload_skin, bool upload_joints, bool lock_scale_if_joint_position,
                        const std::string & upload_url,
@@ -745,6 +748,22 @@ public:
 
     static LLViewerFetchedTexture* FindViewerTexture(const LLImportMaterial& material);
 
+protected:
+    void packModelIntance(
+        LLModel* model,
+        LLMeshUploadThread::instance_list_t& instance_list,
+        std::string& model_name,
+        LLSD& res,
+        S32& mesh_num,
+        S32& texture_num,
+        S32& instance_num,
+        std::unordered_set<LLViewerTexture* > &textures,
+        std::unordered_map<LLViewerTexture*, S32> texture_index,
+        std::unordered_map<LLModel*, S32>& mesh_index,
+        std::vector<std::string>& texture_list_dest,
+        bool include_textures
+        );
+
 private:
     LLHandle<LLWholeModelFeeObserver> mFeeObserverHandle;
     LLHandle<LLWholeModelUploadObserver> mUploadObserverHandle;
@@ -855,7 +874,7 @@ public:
     void notifyMeshUnavailable(const LLVolumeParams& mesh_params, S32 request_lod, S32 volume_lod);
     void notifySkinInfoReceived(LLMeshSkinInfo* info);
     void notifySkinInfoUnavailable(const LLUUID& info);
-    void notifyDecompositionReceived(LLModel::Decomposition* info);
+    void notifyDecompositionReceived(LLModel::Decomposition* info, bool physics_mesh);
 
     S32 getActualMeshLOD(const LLVolumeParams& mesh_params, S32 lod);
     static S32 getActualMeshLOD(LLMeshHeader& header, S32 lod);
diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index 887d53b918..6a7c25ec0f 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -576,7 +576,7 @@ void LLModelPreview::rebuildUploadData()
         for (U32 model_ind = 0; model_ind < mModel[lod].size(); ++model_ind)
         {
             bool found_model = false;
-            for (LLMeshUploadThread::instance_list::iterator iter = mUploadData.begin(); iter != mUploadData.end(); ++iter)
+            for (LLMeshUploadThread::instance_list_t::iterator iter = mUploadData.begin(); iter != mUploadData.end(); ++iter)
             {
                 LLModelInstance& instance = *iter;
                 if (instance.mLOD[lod] == mModel[lod][model_ind])
@@ -2209,7 +2209,7 @@ void LLModelPreview::updateStatusMessages()
         total_submeshes[i] = 0;
     }
 
-    for (LLMeshUploadThread::instance_list::iterator iter = mUploadData.begin(); iter != mUploadData.end(); ++iter)
+    for (LLMeshUploadThread::instance_list_t::iterator iter = mUploadData.begin(); iter != mUploadData.end(); ++iter)
     {
         LLModelInstance& instance = *iter;
 
@@ -2626,7 +2626,16 @@ void LLModelPreview::updateStatusMessages()
         //enable = enable && !use_hull && fmp->childGetValue("physics_optimize").asBoolean();
 
         //enable/disable "analysis" UI
-        LLPanel* panel = fmp->getChild<LLPanel>("physics analysis");
+#if LL_HAVOK
+        LLPanel* panel = fmp->getChild<LLPanel>("physics simplification");
+        panel->setVisible(true);
+
+        panel = fmp->getChild<LLPanel>("physics analysis havok");
+        panel->setVisible(true);
+#else
+        LLPanel* panel = fmp->getChild<LLPanel>("physics analysis vhacd");
+        panel->setVisible(true);
+#endif
         LLView* child = panel->getFirstChild();
         while (child)
         {
@@ -2650,6 +2659,8 @@ void LLModelPreview::updateStatusMessages()
             fmp->childSetVisible("simplify_cancel", false);
             fmp->childSetVisible("Decompose", true);
             fmp->childSetVisible("decompose_cancel", false);
+            fmp->childSetVisible("Analyze", true);
+            fmp->childSetVisible("analyze_cancel", false);
 
             if (phys_hulls > 0)
             {
@@ -2659,6 +2670,7 @@ void LLModelPreview::updateStatusMessages()
             if (phys_tris || phys_hulls > 0)
             {
                 fmp->childEnable("Decompose");
+                fmp->childEnable("Analyze");
             }
         }
         else
@@ -3530,7 +3542,7 @@ bool LLModelPreview::render()
 
         if (!show_skin_weight)
         {
-            for (LLMeshUploadThread::instance_list::iterator iter = mUploadData.begin(); iter != mUploadData.end(); ++iter)
+            for (LLMeshUploadThread::instance_list_t::iterator iter = mUploadData.begin(); iter != mUploadData.end(); ++iter)
             {
                 LLModelInstance& instance = *iter;
 
@@ -3620,7 +3632,7 @@ bool LLModelPreview::render()
 
                     gGL.blendFunc(LLRender::BF_SOURCE_ALPHA, LLRender::BF_ONE_MINUS_SOURCE_ALPHA);
 
-                    for (LLMeshUploadThread::instance_list::iterator iter = mUploadData.begin(); iter != mUploadData.end(); ++iter)
+                    for (LLMeshUploadThread::instance_list_t::iterator iter = mUploadData.begin(); iter != mUploadData.end(); ++iter)
                     {
                         LLModelInstance& instance = *iter;
 
@@ -3745,7 +3757,7 @@ bool LLModelPreview::render()
                         gGL.diffuseColor4f(1.f, 0.f, 0.f, 1.f);
                         const LLVector4a scale(0.5f);
 
-                        for (LLMeshUploadThread::instance_list::iterator iter = mUploadData.begin(); iter != mUploadData.end(); ++iter)
+                        for (LLMeshUploadThread::instance_list_t::iterator iter = mUploadData.begin(); iter != mUploadData.end(); ++iter)
                         {
                             LLModelInstance& instance = *iter;
 
diff --git a/indra/newview/llmodelpreview.h b/indra/newview/llmodelpreview.h
index 7b3b699b33..92ac2d1faf 100644
--- a/indra/newview/llmodelpreview.h
+++ b/indra/newview/llmodelpreview.h
@@ -319,7 +319,7 @@ protected:
     // Amount of triangles in original(base) model
     U32 mMaxTriangleLimit;
 
-    LLMeshUploadThread::instance_list mUploadData;
+    LLMeshUploadThread::instance_list_t mUploadData;
     std::set<LLViewerFetchedTexture * > mTextureSet;
     LLLoadedCallbackEntry::source_callback_list_t mCallbackTextureList;
 
diff --git a/indra/newview/llnotificationlistitem.cpp b/indra/newview/llnotificationlistitem.cpp
index 5b8b28ebe6..9a33bcb1b9 100644
--- a/indra/newview/llnotificationlistitem.cpp
+++ b/indra/newview/llnotificationlistitem.cpp
@@ -38,6 +38,7 @@
 #include "lluicolortable.h"
 #include "message.h"
 #include "llnotificationsutil.h"
+#include "llviewercontrol.h"
 #include <boost/regex.hpp>
 
 LLNotificationListItem::LLNotificationListItem(const Params& p) : LLPanel(p),
@@ -133,10 +134,22 @@ std::string LLNotificationListItem::buildNotificationDate(const LLDate& time_sta
         default:
             timeStr = "[" + LLTrans::getString("TimeMonth") + "]/["
                 +LLTrans::getString("TimeDay")+"]/["
-                +LLTrans::getString("TimeYear")+"] ["
-                +LLTrans::getString("TimeHour")+"]:["
-                +LLTrans::getString("TimeMin")+"] ["
-                +LLTrans::getString("TimeTimezone")+"]";
+                +LLTrans::getString("TimeYear")+"] [";
+
+            static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+            if (use_24h)
+            {
+                timeStr += LLTrans::getString("TimeHour") + "]:["
+                    + LLTrans::getString("TimeMin") + "] ["
+                    + LLTrans::getString("TimeTimezone") + "]";
+            }
+            else
+            {
+                timeStr += LLTrans::getString("TimeHour12") + "]:["
+                    + LLTrans::getString("TimeMin") + "] ["
+                    + LLTrans::getString("TimeAMPM") + "] ["
+                    + LLTrans::getString("TimeTimezone") + "]";
+            }
             break;
     }
     LLSD substitution;
diff --git a/indra/newview/lloutfitgallery.cpp b/indra/newview/lloutfitgallery.cpp
index 3adee9fa16..8589afae06 100644
--- a/indra/newview/lloutfitgallery.cpp
+++ b/indra/newview/lloutfitgallery.cpp
@@ -818,6 +818,7 @@ void LLOutfitGallery::getCurrentCategories(uuid_vec_t& vcur)
 
 void LLOutfitGallery::updateAddedCategory(LLUUID cat_id)
 {
+    LL_PROFILE_ZONE_SCOPED;
     LLViewerInventoryCategory *cat = gInventory.getCategory(cat_id);
     if (!cat) return;
 
diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp
index 4e594af432..58cd9fab83 100644
--- a/indra/newview/lloutfitslist.cpp
+++ b/indra/newview/lloutfitslist.cpp
@@ -181,6 +181,7 @@ void LLOutfitsList::onOpen(const LLSD& info)
 
 void LLOutfitsList::updateAddedCategory(LLUUID cat_id)
 {
+    LL_PROFILE_ZONE_SCOPED;
     LLViewerInventoryCategory *cat = gInventory.getCategory(cat_id);
     if (!cat) return;
 
@@ -251,7 +252,9 @@ void LLOutfitsList::updateAddedCategory(LLUUID cat_id)
 
     if (AISAPI::isAvailable() && LLInventoryModelBackgroundFetch::instance().folderFetchActive())
     {
-        // for reliability just fetch it whole, linked items included
+        // For reliability just fetch it whole, linked items included
+        // Todo: list is not warrantied to exist once callback arrives
+        // Fix it!
         LLInventoryModelBackgroundFetch::instance().fetchFolderAndLinks(cat_id, [cat_id, list]
         {
             if (list)
@@ -1059,6 +1062,7 @@ void LLOutfitListBase::onIdle(void* userdata)
 
 void LLOutfitListBase::onIdleRefreshList()
 {
+    LL_PROFILE_ZONE_SCOPED;
     if (LLAppViewer::instance()->quitRequested())
     {
         mRefreshListState.CategoryUUID.setNull();
@@ -1072,7 +1076,7 @@ void LLOutfitListBase::onIdleRefreshList()
         return;
     }
 
-    const F64 MAX_TIME = 0.05f;
+    const F64 MAX_TIME = 0.005f;
     F64 curent_time = LLTimer::getTotalSeconds();
     const F64 end_time = curent_time + MAX_TIME;
 
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 514d772340..fc5c468297 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -4721,7 +4721,6 @@ void LLPanelFace::onPasteTexture(LLViewerObject* objectp, S32 te)
                 if (allow)
                 {
                     objectp->setRenderMaterialID(te, te_data["te"]["pbr"].asUUID(), false /*managing our own update*/);
-                    tep->setGLTFRenderMaterial(nullptr);
                     tep->setGLTFMaterialOverride(nullptr);
 
                     if (te_data["te"].has("pbr_override"))
@@ -4737,7 +4736,6 @@ void LLPanelFace::onPasteTexture(LLViewerObject* objectp, S32 te)
             else
             {
                 objectp->setRenderMaterialID(te, LLUUID::null, false /*send in bulk later*/ );
-                tep->setGLTFRenderMaterial(nullptr);
                 tep->setGLTFMaterialOverride(nullptr);
 
                 // blank out most override data on the server
diff --git a/indra/newview/llpanellandmarkinfo.cpp b/indra/newview/llpanellandmarkinfo.cpp
index 41373cd7f5..7596c0eba8 100644
--- a/indra/newview/llpanellandmarkinfo.cpp
+++ b/indra/newview/llpanellandmarkinfo.cpp
@@ -41,6 +41,7 @@
 #include "lllandmarkactions.h"
 #include "llparcel.h"
 #include "llslurl.h"
+#include "llviewercontrol.h"
 #include "llviewerinventory.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
@@ -326,7 +327,8 @@ void LLPanelLandmarkInfo::displayItemInfo(const LLInventoryItem* pItem)
     }
     else
     {
-        std::string timeStr = getString("acquired_date");
+        static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+        std::string timeStr = use_24h ? getString("acquired_date") : getString("acquired_date_ampm");
         LLSD substitution;
         substitution["datetime"] = (S32) time_utc;
         LLStringUtil::format (timeStr, substitution);
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index f90d6d5b3f..a31a54bb67 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -385,10 +385,7 @@ bool LLTaskInvFVBridge::removeItem()
                 return true;
             }
 
-            LLSD payload;
-            payload["task_id"] = mPanel->getTaskUUID();
-            payload["inventory_ids"].append(mUUID);
-            LLNotificationsUtil::add("RemoveItemWarn", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel));
+            LLNotificationsUtil::add("CantModifyContentInNoModTask");
             return false;
         }
     }
@@ -411,13 +408,7 @@ void LLTaskInvFVBridge::removeBatch(std::vector<LLFolderViewModelItem*>& batch)
 
     if (!object->permModify())
     {
-        LLSD payload;
-        payload["task_id"] = mPanel->getTaskUUID();
-        for (LLFolderViewModelItem* item : batch)
-        {
-            payload["inventory_ids"].append(((LLTaskInvFVBridge*)item)->getUUID());
-        }
-        LLNotificationsUtil::add("RemoveItemWarn", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel));
+        LLNotificationsUtil::add("CantModifyContentInNoModTask");
     }
     else
     {
diff --git a/indra/newview/llpanelprofile.cpp b/indra/newview/llpanelprofile.cpp
index 578bc5b9a7..24a6875d5a 100644
--- a/indra/newview/llpanelprofile.cpp
+++ b/indra/newview/llpanelprofile.cpp
@@ -859,7 +859,7 @@ void LLPanelProfileSecondLife::resetData()
     resetLoading();
 
     // Set default image and 1:1 dimensions for it
-    mSecondLifePic->setValue("Generic_Person_Large");
+    mSecondLifePic->setValue(LLUUID());
 
     LLRect imageRect = mSecondLifePicLayout->getRect();
     mSecondLifePicLayout->reshape(imageRect.getWidth(), imageRect.getWidth());
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
index 902412d359..bfdfa68e01 100644
--- a/indra/newview/llpanelteleporthistory.cpp
+++ b/indra/newview/llpanelteleporthistory.cpp
@@ -42,6 +42,7 @@
 #include "llnotificationsutil.h"
 #include "lltextbox.h"
 #include "lltoggleablemenu.h"
+#include "llviewercontrol.h"
 #include "llviewermenu.h"
 #include "lllandmarkactions.h"
 #include "llclipboard.h"
@@ -215,8 +216,18 @@ std::string LLTeleportHistoryFlatItem::getTimestamp()
     // Only show timestamp for today and yesterday
     if(time_diff < seconds_today + seconds_in_day)
     {
-        timestamp = "[" + LLTrans::getString("TimeHour12")+"]:["
-                        + LLTrans::getString("TimeMin")+"] ["+ LLTrans::getString("TimeAMPM")+"]";
+        static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+        if (use_24h)
+        {
+            timestamp = "[" + LLTrans::getString("TimeHour") + "]:["
+                + LLTrans::getString("TimeMin") + "]";
+        }
+        else
+        {
+            timestamp = "[" + LLTrans::getString("TimeHour12") + "]:["
+                + LLTrans::getString("TimeMin") + "] [" + LLTrans::getString("TimeAMPM") + "]";
+        }
+
         LLSD substitution;
         substitution["datetime"] = (S32) date.secondsSinceEpoch();
         LLStringUtil::format(timestamp, substitution);
diff --git a/indra/newview/llpanelvoicedevicesettings.cpp b/indra/newview/llpanelvoicedevicesettings.cpp
index 60877494e7..d8d6bcf5fd 100644
--- a/indra/newview/llpanelvoicedevicesettings.cpp
+++ b/indra/newview/llpanelvoicedevicesettings.cpp
@@ -240,13 +240,38 @@ void LLPanelVoiceDeviceSettings::refresh()
         if(mCtrlInputDevices)
         {
             mCtrlInputDevices->removeall();
-            mCtrlInputDevices->add(getLocalizedDeviceName(mInputDevice), mInputDevice, ADD_BOTTOM);
+            auto it = mLocalizedDeviceNames.find(mInputDevice);
+            if (it != mLocalizedDeviceNames.end())
+            {
+                mCtrlInputDevices->add(getLocalizedDeviceName(mInputDevice), mInputDevice, ADD_BOTTOM);
+            }
+            else
+            {
+                // Display name generaly doesn't match value.
+                // Value is an id so it's not nessesary readable,
+                // might not even be valid (disconnected usb).
+                // Until we get the data, don't change the device,
+                // otherwise box might override the control.
+                // But show a readable placeholder.
+                // Combo is disabled so it's safe to show
+                // a placeholder.
+                mCtrlInputDevices->add(getString("device_not_loaded"), mInputDevice, ADD_BOTTOM);
+            }
             mCtrlInputDevices->setValue(mInputDevice);
         }
         if(mCtrlOutputDevices)
         {
             mCtrlOutputDevices->removeall();
-            mCtrlOutputDevices->add(getLocalizedDeviceName(mOutputDevice), mOutputDevice, ADD_BOTTOM);
+            auto it = mLocalizedDeviceNames.find(mOutputDevice);
+            if (it != mLocalizedDeviceNames.end())
+            {
+                mCtrlOutputDevices->add(getLocalizedDeviceName(mOutputDevice), mOutputDevice, ADD_BOTTOM);
+            }
+            else
+            {
+                // Don't change the device, only the label
+                mCtrlOutputDevices->add(getString("device_not_loaded"), mOutputDevice, ADD_BOTTOM);
+            }
             mCtrlOutputDevices->setValue(mOutputDevice);
         }
     }
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 2fbdbeaf59..5916163f60 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -582,7 +582,7 @@ void LLPanelVolume::getState( )
 
     bool enable_material = editable && single_volume && material_same;
     LLCachedControl<bool> edit_linked(gSavedSettings, "EditLinkedParts", false);
-    if (!enable_material && !edit_linked())
+    if (!enable_material)
     {
         LLViewerObject* root = selection->getPrimaryObject();
         while (root && !root->isAvatar() && root->getParent())
@@ -592,6 +592,10 @@ void LLPanelVolume::getState( )
             {
                 break;
             }
+            if (!parent->isSelected())
+            {
+                break;
+            }
             root = parent;
         }
         if (root)
diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp
index 22a9dd0027..2fdec14f6d 100644
--- a/indra/newview/llscriptfloater.cpp
+++ b/indra/newview/llscriptfloater.cpp
@@ -109,25 +109,27 @@ bool LLScriptFloater::toggle(const LLUUID& notification_id)
 LLScriptFloater* LLScriptFloater::show(const LLUUID& notification_id)
 {
     LLScriptFloater* floater = LLFloaterReg::getTypedInstance<LLScriptFloater>("script_floater", notification_id);
-    floater->setNotificationId(notification_id);
-    floater->createForm(notification_id);
-
-    //LLDialog(LLGiveInventory and LLLoadURL) should no longer steal focus (see EXT-5445)
-    floater->setAutoFocus(false);
-
-    if(LLScriptFloaterManager::OBJ_SCRIPT == LLScriptFloaterManager::getObjectType(notification_id))
+    if (floater)
     {
-        floater->setSavePosition(true);
-        floater->restorePosition();
-    }
-    else
-    {
-        floater->dockToChiclet(true);
-    }
+        floater->setNotificationId(notification_id);
+        floater->createForm(notification_id);
 
-    //LLDialog(LLGiveInventory and LLLoadURL) should no longer steal focus (see EXT-5445)
-    LLFloaterReg::showTypedInstance<LLScriptFloater>("script_floater", notification_id, false);
+        //LLDialog(LLGiveInventory and LLLoadURL) should no longer steal focus (see EXT-5445)
+        floater->setAutoFocus(false);
 
+        if (LLScriptFloaterManager::OBJ_SCRIPT == LLScriptFloaterManager::getObjectType(notification_id))
+        {
+            floater->setSavePosition(true);
+            floater->restorePosition();
+        }
+        else
+        {
+            floater->dockToChiclet(true);
+        }
+
+        //LLDialog(LLGiveInventory and LLLoadURL) should no longer steal focus (see EXT-5445)
+        LLFloaterReg::showTypedInstance<LLScriptFloater>("script_floater", notification_id, false);
+    }
     return floater;
 }
 
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 329522f18c..e171136ffa 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -1996,9 +1996,96 @@ bool LLSelectMgr::selectionSetGLTFMaterial(const LLUUID& mat_id)
                     asset_id = BLANK_MATERIAL_ASSET_ID;
                 }
             }
+
+            // If this face already has the target material ID, do nothing.
+            // This prevents re-sending the same ID on OK, which can cause the server
+            // to drop overrides when queueApply is invoked with the OLD id.
+            if (objectp->getRenderMaterialID(te) == asset_id)
+            {
+                return true;
+            }
+
+            // Preserve existing texture transforms when switching to PBR material
+            LLTextureEntry* tep = objectp->getTE(te);
+            bool should_preserve_transforms = false;
+            LLGLTFMaterial* preserved_override = nullptr;
+
+            if (tep && asset_id.notNull())
+            {
+                // Only preserve transforms from existing GLTF material override
+                // Do not fall back to texture entry transforms when switching between PBR materials
+                LLGLTFMaterial* existing_override = tep->getGLTFMaterialOverride();
+                if (existing_override)
+                {
+                    // Check if existing override has non-default transforms
+                    const LLGLTFMaterial::TextureTransform& existing_transform = existing_override->mTextureTransform[0];
+                    const LLGLTFMaterial::TextureTransform& default_transform = LLGLTFMaterial::TextureTransform();
+
+                    if (existing_transform.mScale != default_transform.mScale ||
+                        existing_transform.mOffset != default_transform.mOffset ||
+                        existing_transform.mRotation != default_transform.mRotation)
+                    {
+                        // Preserve non-default transforms from current PBR material
+                        preserved_override = new LLGLTFMaterial();
+                        for (U32 i = 0; i < LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT; ++i)
+                        {
+                            preserved_override->mTextureTransform[i].mScale = existing_transform.mScale;
+                            preserved_override->mTextureTransform[i].mOffset = existing_transform.mOffset;
+                            preserved_override->mTextureTransform[i].mRotation = existing_transform.mRotation;
+                        }
+                        should_preserve_transforms = true;
+                    }
+                    // If existing override has default transforms, don't preserve anything
+                }
+                else
+                {
+                    // No existing PBR material override - check texture entry transforms
+                    // This handles the case of switching from Blinn-Phong to PBR material
+                    F32 existing_scale_s, existing_scale_t, existing_offset_s, existing_offset_t, existing_rotation;
+                    tep->getScale(&existing_scale_s, &existing_scale_t);
+                    tep->getOffset(&existing_offset_s, &existing_offset_t);
+                    existing_rotation = tep->getRotation();
+
+                    const LLGLTFMaterial::TextureTransform& default_transform = LLGLTFMaterial::TextureTransform();
+                    if (existing_scale_s != default_transform.mScale.mV[0] || existing_scale_t != default_transform.mScale.mV[1] ||
+                        existing_offset_s != default_transform.mOffset.mV[0] || existing_offset_t != default_transform.mOffset.mV[1] ||
+                        existing_rotation != default_transform.mRotation)
+                    {
+                        // Preserve non-default transforms from texture entry
+                        preserved_override = new LLGLTFMaterial();
+                        for (U32 i = 0; i < LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT; ++i)
+                        {
+                            LLVector2 pbr_scale, pbr_offset;
+                            F32 pbr_rotation;
+                            LLGLTFMaterial::convertTextureTransformToPBR(
+                                existing_scale_s, existing_scale_t,
+                                existing_offset_s, existing_offset_t,
+                                existing_rotation,
+                                pbr_scale, pbr_offset, pbr_rotation);
+                            preserved_override->mTextureTransform[i].mScale = pbr_scale;
+                            preserved_override->mTextureTransform[i].mOffset = pbr_offset;
+                            preserved_override->mTextureTransform[i].mRotation = pbr_rotation;
+                        }
+                        should_preserve_transforms = true;
+                    }
+                }
+            }
+
             objectp->clearTEWaterExclusion(te);
             // Blank out most override data on the object and send to server
             objectp->setRenderMaterialID(te, asset_id);
+            if (should_preserve_transforms && preserved_override)
+            {
+                // Apply material with preserved transforms
+                LLGLTFMaterialList::queueApply(objectp, te, asset_id, preserved_override);
+                // Update local state
+                objectp->setRenderMaterialID(te, asset_id, false, true);
+                tep->setGLTFMaterialOverride(preserved_override);
+            }
+            else
+            {
+                objectp->setRenderMaterialID(te, asset_id);
+            }
 
             return true;
         }
@@ -2265,23 +2352,9 @@ void LLSelectMgr::selectionRevertGLTFMaterials()
                     //blank override out
                     LLGLTFMaterialList::queueApply(objectp, te, asset_id);
                 }
-                if (old_asset_id != asset_id)
-                {
-                    // Restore overrides and base material
-                    // Note: might not work reliably if asset is already there, might
-                    // have a server sided problem where servers applies override
-                    // first then resets it by adding asset, in which case need
-                    // to create a server ticket and chain asset then override
-                    // application.
-                    LLGLTFMaterialList::queueApply(objectp, te, asset_id, material);
-                }
                 else
                 {
-                    // Enqueue override update to server
-                    // Note: this is suboptimal, better to send asset id as well
-                    // but there seems to be a server problem with queueApply
-                    // that ignores override in some cases
-                    LLGLTFMaterialList::queueModify(objectp, te, material);
+                    LLGLTFMaterialList::queueApply(objectp, te, asset_id, material);
                 }
             }
             return true;
diff --git a/indra/newview/llsettingspicker.cpp b/indra/newview/llsettingspicker.cpp
index 619882dc5e..5fc39b0dd8 100644
--- a/indra/newview/llsettingspicker.cpp
+++ b/indra/newview/llsettingspicker.cpp
@@ -152,7 +152,11 @@ void LLFloaterSettingsPicker::onClose(bool app_quitting)
         owner->setFocus(true);
     }
     mSettingItemID.setNull();
-    mInventoryPanel->getRootFolder()->clearSelection();
+    mInventoryPanel->clearSelection();
+    if (mInventoryPanel->getRootFolder())
+    {
+        mInventoryPanel->getRootFolder()->clearSelection();
+    }
 }
 
 void LLFloaterSettingsPicker::setValue(const LLSD& value)
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index 3d4b4fb9c1..6d50f216f5 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -487,7 +487,8 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
     }
     else
     {
-        std::string timeStr = getString("acquiredDate");
+        static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+        std::string timeStr = use_24h ? getString("acquiredDate") : getString("acquiredDateAMPM");
         LLSD substitution;
         substitution["datetime"] = (S32) time_utc;
         LLStringUtil::format (timeStr, substitution);
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index eca5ba82ac..c3c7945763 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -446,7 +446,26 @@ bool idle_startup()
     system = osString.substr (begIdx, endIdx - begIdx);
     system += "Locale";
 
-    LLStringUtil::setLocale (LLTrans::getString(system));
+    std::string locale = LLTrans::getString(system);
+    if (locale != LLStringUtil::getLocale()) // is there a reason to do this on repeat?
+    {
+        LLStringUtil::setLocale(locale);
+
+        // Not all locales have AMPM, test it
+        if (LLStringOps::sAM.empty()) // Might already be overriden from LLAppViewer::init()
+        {
+            LLDate datetime(0.0);
+            std::string val = datetime.toHTTPDateString("%p");
+            if (val.empty())
+            {
+                LL_DEBUGS("InitInfo") << "Current locale \"" << locale << "\" "
+                    << "doesn't support AM/PM time format" << LL_ENDL;
+                // fallback to declarations in strings.xml
+                LLStringOps::sAM = LLTrans::getString("dateTimeAM");
+                LLStringOps::sPM = LLTrans::getString("dateTimePM");
+            }
+        }
+    }
 
     //note: Removing this line will cause incorrect button size in the login screen. -- bao.
     gTextureList.updateImages(0.01f) ;
diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp
index 1826885069..64359b6cbe 100644
--- a/indra/newview/llsurface.cpp
+++ b/indra/newview/llsurface.cpp
@@ -28,9 +28,6 @@
 
 #include "llsurface.h"
 
-#include "llrender.h"
-
-#include "llviewertexturelist.h"
 #include "llpatchvertexarray.h"
 #include "patch_dct.h"
 #include "patch_code.h"
@@ -39,28 +36,25 @@
 #include "llregionhandle.h"
 #include "llagent.h"
 #include "llagentcamera.h"
-#include "llappviewer.h"
 #include "llworld.h"
 #include "llviewercontrol.h"
 #include "llviewertexture.h"
 #include "llsurfacepatch.h"
-#include "llvosurfacepatch.h"
 #include "llvowater.h"
 #include "pipeline.h"
 #include "llviewerregion.h"
-#include "llvlcomposition.h"
-#include "noise.h"
-#include "llviewercamera.h"
-#include "llglheaders.h"
 #include "lldrawpoolterrain.h"
-#include "lldrawable.h"
 #include "llworldmipmap.h"
 
 extern LLPipeline gPipeline;
 extern bool gShiftFrame;
 
-LLColor4U MAX_WATER_COLOR(0, 48, 96, 240);
+namespace
+{
+    static constexpr float MIN_TEXTURE_REQUEST_INTERVAL = 5.0f;
+}
 
+LLColor4U MAX_WATER_COLOR(0, 48, 96, 240);
 
 S32 LLSurface::sTextureSize = 256;
 
@@ -74,18 +68,18 @@ LLSurface::LLSurface(U32 type, LLViewerRegion *regionp) :
     mType(type),
     mDetailTextureScale(0.f),
     mOriginGlobal(0.0, 0.0, 0.0),
-    mSTexturep(NULL),
+    mSTexturep(nullptr),
     mGridsPerPatchEdge(0),
     mMetersPerGrid(1.0f),
     mMetersPerEdge(1.0f),
     mRegionp(regionp)
 {
     // Surface data
-    mSurfaceZ = NULL;
-    mNorm = NULL;
+    mSurfaceZ = nullptr;
+    mNorm = nullptr;
 
     // Patch data
-    mPatchList = NULL;
+    mPatchList = nullptr;
 
     // One of each for each camera
     mVisiblePatchCount = 0;
@@ -95,14 +89,14 @@ LLSurface::LLSurface(U32 type, LLViewerRegion *regionp) :
     mMinZ = 10000.f;
     mMaxZ = -10000.f;
 
-    mWaterObjp = NULL;
+    mWaterObjp = nullptr;
 
     // In here temporarily.
     mSurfacePatchUpdateCount = 0;
 
     for (S32 i = 0; i < 8; i++)
     {
-        mNeighbors[i] = NULL;
+        mNeighbors[i] = nullptr;
     }
 }
 
@@ -110,7 +104,7 @@ LLSurface::LLSurface(U32 type, LLViewerRegion *regionp) :
 LLSurface::~LLSurface()
 {
     delete [] mSurfaceZ;
-    mSurfaceZ = NULL;
+    mSurfaceZ = nullptr;
 
     delete [] mNorm;
 
@@ -129,7 +123,7 @@ LLSurface::~LLSurface()
     {
         gPipeline.removePool(poolp);
         // Don't enable this until we blitz the draw pool for it as well.  -- djs
-        mSTexturep = NULL;
+        mSTexturep = nullptr;
     }
     else
     {
@@ -144,7 +138,7 @@ void LLSurface::initClasses()
 void LLSurface::setRegion(LLViewerRegion *regionp)
 {
     mRegionp = regionp;
-    mWaterObjp = NULL; // depends on regionp, needs recreating
+    mWaterObjp = nullptr; // depends on regionp, needs recreating
 }
 
 // Assumes that arguments are powers of 2, and that
@@ -211,16 +205,29 @@ LLViewerTexture* LLSurface::getSTexture()
 
 void LLSurface::createSTexture()
 {
-    if (!mSTexturep)
+    if (mSTexturep.isNull())
+    {
+        mTimer.setTimerExpirySec(MIN_TEXTURE_REQUEST_INTERVAL);
+    }
+    else if (mSTexturep->hasGLTexture())
     {
-        U64 handle = mRegionp->getHandle();
+        // Unexpected: createSTexture() called when a valid texture already exists.
+        // This may indicate a logic error in the caller, as textures should not be recreated unnecessarily.
+        LL_WARNS() << "Called LLSurface::createSTexture() while we already have a valid texture!" << LL_ENDL;
+        return;
+    }
+    else if (!mTimer.checkExpirationAndReset(MIN_TEXTURE_REQUEST_INTERVAL))
+    {
+        // We haven't gotten a valid texture yet, but throttle the number of requests to avoid server flooding
+        return;
+    }
 
-        U32 grid_x, grid_y;
+    U64 handle = mRegionp->getHandle();
+    U32 grid_x, grid_y;
 
-        grid_from_region_handle(handle, &grid_x, &grid_y);
+    grid_from_region_handle(handle, &grid_x, &grid_y);
 
-        mSTexturep = LLWorldMipmap::loadObjectsTile(grid_x, grid_y, 1);
-    }
+    mSTexturep = LLWorldMipmap::loadObjectsTile(grid_x, grid_y, 1);
 }
 
 void LLSurface::initTextures()
@@ -285,7 +292,7 @@ void LLSurface::getNeighboringRegions( std::vector<LLViewerRegion*>& uniqueRegio
     S32 i;
     for (i = 0; i < 8; i++)
     {
-        if ( mNeighbors[i] != NULL )
+        if (mNeighbors[i] != nullptr)
         {
             uniqueRegions.push_back( mNeighbors[i]->getRegion() );
         }
@@ -298,7 +305,7 @@ void LLSurface::getNeighboringRegionsStatus( std::vector<S32>& regions )
     S32 i;
     for (i = 0; i < 8; i++)
     {
-        if ( mNeighbors[i] != NULL )
+        if (mNeighbors[i] != nullptr)
         {
             regions.push_back( i );
         }
@@ -498,7 +505,7 @@ void LLSurface::disconnectNeighbor(LLSurface *surfacep)
     {
         if (surfacep == mNeighbors[i])
         {
-            mNeighbors[i] = NULL;
+            mNeighbors[i] = nullptr;
         }
     }
 
@@ -518,7 +525,7 @@ void LLSurface::disconnectAllNeighbors()
         if (mNeighbors[i])
         {
             mNeighbors[i]->disconnectNeighbor(this);
-            mNeighbors[i] = NULL;
+            mNeighbors[i] = nullptr;
         }
     }
 }
@@ -910,7 +917,7 @@ LLSurfacePatch *LLSurface::resolvePatchRegion(const F32 x, const F32 y) const
         if(0 == mNumberOfPatches)
         {
             LL_WARNS() << "No patches for current region!" << LL_ENDL;
-            return NULL;
+            return nullptr;
         }
         S32 old_index = index;
         index = llclamp(old_index, 0, (mNumberOfPatches - 1));
@@ -996,7 +1003,7 @@ void LLSurface::createPatchData()
             }
             else
             {
-                patchp->setNeighborPatch(EAST, NULL);
+                patchp->setNeighborPatch(EAST, nullptr);
             }
 
             if (j < mPatchesPerEdge-1)
@@ -1005,7 +1012,7 @@ void LLSurface::createPatchData()
             }
             else
             {
-                patchp->setNeighborPatch(NORTH, NULL);
+                patchp->setNeighborPatch(NORTH, nullptr);
             }
 
             if (i > 0)
@@ -1014,7 +1021,7 @@ void LLSurface::createPatchData()
             }
             else
             {
-                patchp->setNeighborPatch(WEST, NULL);
+                patchp->setNeighborPatch(WEST, nullptr);
             }
 
             if (j > 0)
@@ -1023,7 +1030,7 @@ void LLSurface::createPatchData()
             }
             else
             {
-                patchp->setNeighborPatch(SOUTH, NULL);
+                patchp->setNeighborPatch(SOUTH, nullptr);
             }
 
             if (i < (mPatchesPerEdge-1)  &&  j < (mPatchesPerEdge-1))
@@ -1032,7 +1039,7 @@ void LLSurface::createPatchData()
             }
             else
             {
-                patchp->setNeighborPatch(NORTHEAST, NULL);
+                patchp->setNeighborPatch(NORTHEAST, nullptr);
             }
 
             if (i > 0  &&  j < (mPatchesPerEdge-1))
@@ -1041,7 +1048,7 @@ void LLSurface::createPatchData()
             }
             else
             {
-                patchp->setNeighborPatch(NORTHWEST, NULL);
+                patchp->setNeighborPatch(NORTHWEST, nullptr);
             }
 
             if (i > 0  &&  j > 0)
@@ -1050,7 +1057,7 @@ void LLSurface::createPatchData()
             }
             else
             {
-                patchp->setNeighborPatch(SOUTHWEST, NULL);
+                patchp->setNeighborPatch(SOUTHWEST, nullptr);
             }
 
             if (i < (mPatchesPerEdge-1)  &&  j > 0)
@@ -1059,7 +1066,7 @@ void LLSurface::createPatchData()
             }
             else
             {
-                patchp->setNeighborPatch(SOUTHEAST, NULL);
+                patchp->setNeighborPatch(SOUTHEAST, nullptr);
             }
 
             LLVector3d origin_global;
@@ -1077,7 +1084,7 @@ void LLSurface::destroyPatchData()
     // Delete all of the cached patch data for these patches.
 
     delete [] mPatchList;
-    mPatchList = NULL;
+    mPatchList = nullptr;
     mVisiblePatchCount = 0;
 }
 
@@ -1105,12 +1112,12 @@ LLSurfacePatch *LLSurface::getPatch(const S32 x, const S32 y) const
     if ((x < 0) || (x >= mPatchesPerEdge))
     {
         LL_ERRS() << "Asking for patch out of bounds" << LL_ENDL;
-        return NULL;
+        return nullptr;
     }
     if ((y < 0) || (y >= mPatchesPerEdge))
     {
         LL_ERRS() << "Asking for patch out of bounds" << LL_ENDL;
-        return NULL;
+        return nullptr;
     }
 
     return mPatchList + x + y*mPatchesPerEdge;
diff --git a/indra/newview/llsurface.h b/indra/newview/llsurface.h
index fc72ab7db7..a599019ca5 100644
--- a/indra/newview/llsurface.h
+++ b/indra/newview/llsurface.h
@@ -29,14 +29,8 @@
 
 #include "v3math.h"
 #include "v3dmath.h"
-#include "v4math.h"
-#include "m3math.h"
-#include "m4math.h"
-#include "llquaternion.h"
-
-#include "v4coloru.h"
-#include "v4color.h"
 
+#include "lltimer.h"
 #include "llvowater.h"
 #include "llpatchvertexarray.h"
 #include "llviewertexture.h"
@@ -65,7 +59,7 @@ class LLGroupHeader;
 class LLSurface
 {
 public:
-    LLSurface(U32 type, LLViewerRegion *regionp = NULL);
+    LLSurface(U32 type, LLViewerRegion *regionp = nullptr);
     virtual ~LLSurface();
 
     static void initClasses(); // Do class initialization for LLSurface and its child classes.
@@ -169,14 +163,13 @@ public:
 
     F32 mDetailTextureScale;    //  Number of times to repeat detail texture across this surface
 
-protected:
+private:
     void createSTexture();
     void initTextures();
 
     void createPatchData();     // Allocates memory for patches.
     void destroyPatchData();    // Deallocates memory for patches.
 
-protected:
     LLVector3d  mOriginGlobal;      // In absolute frame
     LLSurfacePatch *mPatchList;     // Array of all patches
 
@@ -212,6 +205,7 @@ protected:
 private:
     LLViewerRegion *mRegionp; // Patch whose coordinate system this surface is using.
     static S32  sTextureSize;               // Size of the surface texture
+    LLTimer     mTimer; // timer to throttle initial requests until the mSTexture is fully fetched
 };
 
 extern template bool LLSurface::idleUpdate</*PBR=*/false>(F32 max_update_time);
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index 5507ef517a..b2f2509e80 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -1012,6 +1012,8 @@ void LLFloaterTexturePicker::onBtnSetToDefault(void* userdata)
     {
         self->setImageID( self->getDefaultImageAssetID() );
         self->setTentative(false);
+        // Deselect in case inventory has a selected item with the same id
+        self->mInventoryPanel->getRootFolder()->clearSelection();
     }
     self->commitIfImmediateSet();
 }
@@ -1023,6 +1025,8 @@ void LLFloaterTexturePicker::onBtnBlank(void* userdata)
     self->setCanApply(true, true);
     self->setImageID( self->getBlankImageAssetID() );
     self->setTentative(false);
+    // Deselect in case inventory has a selected item with the same id
+    self->mInventoryPanel->getRootFolder()->clearSelection();
     self->commitIfImmediateSet();
 }
 
@@ -1034,6 +1038,8 @@ void LLFloaterTexturePicker::onBtnNone(void* userdata)
     self->setCanApply(true, true);
     self->setImageID( LLUUID::null );
     self->setTentative(false);
+    // Deselect in case inventory has a selected item with null id
+    self->mInventoryPanel->getRootFolder()->clearSelection();
     self->commitIfImmediateSet();
 }
 
@@ -1698,10 +1704,16 @@ LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p)
     mDefaultImageName(p.default_image_name),
     mFallbackImage(p.fallback_image)
 {
-
-    // Default of defaults is white image for diff tex
-    //
-    setBlankImageAssetID(IMG_WHITE);
+    if (mInventoryPickType == PICK_MATERIAL)
+    {
+        setBlankImageAssetID(BLANK_MATERIAL_ASSET_ID);
+    }
+    else
+    {
+        // Default of defaults is white image for diff tex
+        //
+        setBlankImageAssetID(IMG_WHITE);
+    }
 
     setAllowNoTexture(p.allow_no_texture);
     setCanApplyImmediately(p.can_apply_immediately);
diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 93b5806acf..f7cb0ee7ed 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -1295,10 +1295,19 @@ bool LLTextureFetchWorker::doWork(S32 param)
                 else
                 {
                     mCanUseCapability = false;
-                    mRegionRetryAttempt++;
-                    mRegionRetryTimer.setTimerExpirySec(CAP_MISSING_EXPIRATION_DELAY);
-                    // ex: waiting for caps
-                    LL_INFOS_ONCE(LOG_TXT) << "Texture not available via HTTP: empty URL." << LL_ENDL;
+                    if (gDisconnected)
+                    {
+                        // We lost connection or are shutting down.
+                        mCanUseHTTP = false;
+                        return true; // abort
+                    }
+                    else
+                    {
+                        // Ex: waiting for caps
+                        mRegionRetryAttempt++;
+                        mRegionRetryTimer.setTimerExpirySec(CAP_MISSING_EXPIRATION_DELAY);
+                        LL_INFOS_ONCE(LOG_TXT) << "Texture not available via HTTP: empty URL." << LL_ENDL;
+                    }
                 }
             }
             else
@@ -1694,10 +1703,10 @@ bool LLTextureFetchWorker::doWork(S32 param)
             mHttpReplyOffset = 0;
 
             mLoadedDiscard = mRequestedDiscard;
-            if (mLoadedDiscard < 0)
+            if (mLoadedDiscard < 0 || (mLoadedDiscard > MAX_DISCARD_LEVEL && mFormattedImage->getCodec() == IMG_CODEC_J2C))
             {
                 LL_WARNS(LOG_TXT) << mID << " mLoadedDiscard is " << mLoadedDiscard
-                                  << ", should be >=0" << LL_ENDL;
+                                  << ", should be >=0 and <=" << MAX_DISCARD_LEVEL << LL_ENDL;
             }
             setState(DECODE_IMAGE);
             if (mWriteToCacheState != NOT_WRITE)
@@ -1759,14 +1768,27 @@ bool LLTextureFetchWorker::doWork(S32 param)
             LL_DEBUGS(LOG_TXT) << mID << " DECODE_IMAGE abort: mLoadedDiscard < 0" << LL_ENDL;
             return true;
         }
+
+        llassert_always(mFormattedImage.notNull());
+        S32 discard = mHaveAllData && mFormattedImage->getCodec() != IMG_CODEC_J2C ? 0 : mLoadedDiscard;
+        if (discard > MAX_DISCARD_LEVEL) // only warn for j2c
+        {
+            // We encode j2c with fixed amount of discard levels,
+            // Trying to decode beyound that will fail.
+            LL_WARNS(LOG_TXT) << "Decode entered with invalid discard. ID = " << mID << LL_ENDL;
+
+            //abort, don't decode
+            setState(DONE);
+            LL_DEBUGS(LOG_TXT) << mID << " DECODE_IMAGE abort: mLoadedDiscard > MAX_DISCARD_LEVEL" << LL_ENDL;
+            return true;
+        }
+
         mDecodeTimer.reset();
         mRawImage = NULL;
         mAuxImage = NULL;
-        llassert_always(mFormattedImage.notNull());
 
         // if we have the entire image data (and the image is not J2C), decode the full res image
         // DO NOT decode a higher res j2c than was requested.  This is a waste of time and memory.
-        S32 discard = mHaveAllData && mFormattedImage->getCodec() != IMG_CODEC_J2C ? 0 : mLoadedDiscard;
         mDecoded  = false;
         setState(DECODE_IMAGE_UPDATE);
         LL_DEBUGS(LOG_TXT) << mID << ": Decoding. Bytes: " << mFormattedImage->getDataSize() << " Discard: " << discard
diff --git a/indra/newview/lltoastgroupnotifypanel.cpp b/indra/newview/lltoastgroupnotifypanel.cpp
index 3c3440d41a..95653dc19b 100644
--- a/indra/newview/lltoastgroupnotifypanel.cpp
+++ b/indra/newview/lltoastgroupnotifypanel.cpp
@@ -87,10 +87,21 @@ LLToastGroupNotifyPanel::LLToastGroupNotifyPanel(const LLNotificationPtr& notifi
     std::string timeStr = "[" + LLTrans::getString("TimeWeek") + "], ["
                               + LLTrans::getString("TimeMonth") + "]/["
                               + LLTrans::getString("TimeDay") + "]/["
-                              + LLTrans::getString("TimeYear") + "] ["
-                              + LLTrans::getString("TimeHour") + "]:["
-                              + LLTrans::getString("TimeMin") + "] ["
-                              + LLTrans::getString("TimeTimezone") + "]";
+                              + LLTrans::getString("TimeYear") + "] [";
+    static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+    if (use_24h)
+    {
+        timeStr += LLTrans::getString("TimeHour") + "]:["
+            + LLTrans::getString("TimeMin") + "] ["
+            + LLTrans::getString("TimeTimezone") + "]";
+    }
+    else
+    {
+        timeStr += LLTrans::getString("TimeHour12") + "]:["
+            + LLTrans::getString("TimeMin") + "] ["
+            + LLTrans::getString("TimeAMPM") + "] ["
+            + LLTrans::getString("TimeTimezone") + "]";
+    }
 
     const LLDate timeStamp = notification->getDate();
     LLDate notice_date = timeStamp.notNull() ? timeStamp : payload["received_time"].asDate();
diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp
index 0063e0b7fd..c1ec5fa183 100644
--- a/indra/newview/lltoolbarview.cpp
+++ b/indra/newview/lltoolbarview.cpp
@@ -110,7 +110,7 @@ bool LLToolBarView::postBuild()
     {
         mToolbars[i]->setStartDragCallback(boost::bind(LLToolBarView::startDragTool,_1,_2,_3));
         mToolbars[i]->setHandleDragCallback(boost::bind(LLToolBarView::handleDragTool,_1,_2,_3,_4));
-        mToolbars[i]->setHandleDropCallback(boost::bind(LLToolBarView::handleDropTool,_1,_2,_3,_4));
+        mToolbars[i]->setHandleDropCallback(boost::bind(LLToolBarView::handleDropTool,_1,_2,_3,_4,_5));
         mToolbars[i]->setButtonAddCallback(boost::bind(LLToolBarView::onToolBarButtonAdded,_1));
         mToolbars[i]->setButtonRemoveCallback(boost::bind(LLToolBarView::onToolBarButtonRemoved,_1));
     }
@@ -624,8 +624,14 @@ bool LLToolBarView::handleDragTool( S32 x, S32 y, const LLUUID& uuid, LLAssetTyp
     return false;
 }
 
-bool LLToolBarView::handleDropTool( void* cargo_data, S32 x, S32 y, LLToolBar* toolbar)
+bool LLToolBarView::handleDropTool( void* cargo_data, EDragAndDropType cargo_type, S32 x, S32 y, LLToolBar* toolbar)
 {
+    if (cargo_type == DAD_PERSON)
+    {
+        // DAD_PERSON means that cargo_data contains an uuid, not an LLInventoryObject
+        resetDragTool(NULL);
+        return false;
+    }
     bool handled = false;
     LLInventoryObject* inv_item = static_cast<LLInventoryObject*>(cargo_data);
 
@@ -647,15 +653,18 @@ bool LLToolBarView::handleDropTool( void* cargo_data, S32 x, S32 y, LLToolBar* t
             if (old_toolbar_loc != LLToolBarEnums::TOOLBAR_NONE)
             {
                 llassert(gToolBarView->mDragToolbarButton);
-                old_toolbar = gToolBarView->mDragToolbarButton->getParentByType<LLToolBar>();
-                if (old_toolbar->isReadOnly() && toolbar->isReadOnly())
-                {
-                    // do nothing
-                }
-                else
+                if (gToolBarView->mDragToolbarButton)
                 {
-                    int old_rank = LLToolBar::RANK_NONE;
-                    gToolBarView->removeCommand(command_id, old_rank);
+                    old_toolbar = gToolBarView->mDragToolbarButton->getParentByType<LLToolBar>();
+                    if (old_toolbar->isReadOnly() && toolbar->isReadOnly())
+                    {
+                        // do nothing
+                    }
+                    else
+                    {
+                        int old_rank = LLToolBar::RANK_NONE;
+                        gToolBarView->removeCommand(command_id, old_rank);
+                    }
                 }
             }
 
diff --git a/indra/newview/lltoolbarview.h b/indra/newview/lltoolbarview.h
index 7cecd81052..7212f099b7 100644
--- a/indra/newview/lltoolbarview.h
+++ b/indra/newview/lltoolbarview.h
@@ -92,7 +92,7 @@ public:
 
     static void startDragTool(S32 x, S32 y, LLToolBarButton* toolbarButton);
     static bool handleDragTool(S32 x, S32 y, const LLUUID& uuid, LLAssetType::EType type);
-    static bool handleDropTool(void* cargo_data, S32 x, S32 y, LLToolBar* toolbar);
+    static bool handleDropTool(void* cargo_data, EDragAndDropType cargo_type, S32 x, S32 y, LLToolBar* toolbar);
     static void resetDragTool(LLToolBarButton* toolbarButton);
     LLInventoryObject* getDragItem();
     LLView* getBottomToolbar() { return mBottomToolbarPanel; }
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index b4a5955be3..d0c0bdb5ce 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -29,6 +29,8 @@
 
 // library headers
 #include "llnotificationsutil.h"
+#include <vector>
+#include <tuple>
 // project headers
 #include "llagent.h"
 #include "llagentcamera.h"
@@ -1297,7 +1299,89 @@ void LLToolDragAndDrop::dropMaterialOneFace(LLViewerObject* hit_obj,
         asset_id = BLANK_MATERIAL_ASSET_ID;
     }
 
-    hit_obj->setRenderMaterialID(hit_face, asset_id);
+        // Preserve existing texture transforms when switching to PBR material
+    LLTextureEntry* tep = hit_obj->getTE(hit_face);
+    F32 existing_scale_s = LLGLTFMaterial::TextureTransform().mScale.mV[0];
+    F32 existing_scale_t = LLGLTFMaterial::TextureTransform().mScale.mV[1];
+    F32 existing_offset_s = LLGLTFMaterial::TextureTransform().mOffset.mV[0];
+    F32 existing_offset_t = LLGLTFMaterial::TextureTransform().mOffset.mV[1];
+    F32 existing_rotation = LLGLTFMaterial::TextureTransform().mRotation;
+    bool should_preserve_transforms = false;
+    LLGLTFMaterial* preserved_override = nullptr;
+
+    if (tep && asset_id.notNull())
+    {
+        // Only preserve transforms from existing GLTF material override
+        // Do not fall back to texture entry transforms when switching between PBR materials
+        LLGLTFMaterial* existing_override = tep->getGLTFMaterialOverride();
+        if (existing_override)
+        {
+            // Check if existing override has non-default transforms
+            const LLGLTFMaterial::TextureTransform& existing_transform = existing_override->mTextureTransform[0];
+            const LLGLTFMaterial::TextureTransform& default_transform = LLGLTFMaterial::TextureTransform();
+
+            if (existing_transform.mScale != default_transform.mScale ||
+                existing_transform.mOffset != default_transform.mOffset ||
+                existing_transform.mRotation != default_transform.mRotation)
+            {
+                // Preserve non-default transforms from current PBR material
+                preserved_override = new LLGLTFMaterial();
+                for (U32 i = 0; i < LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT; ++i)
+                {
+                    preserved_override->mTextureTransform[i].mScale = existing_transform.mScale;
+                    preserved_override->mTextureTransform[i].mOffset = existing_transform.mOffset;
+                    preserved_override->mTextureTransform[i].mRotation = existing_transform.mRotation;
+                }
+                should_preserve_transforms = true;
+            }
+            // If existing override has default transforms, don't preserve anything
+        }
+        else
+        {
+            // No existing PBR material override - check texture entry transforms
+            // This handles the case of switching from Blinn-Phong to PBR material
+            F32 existing_scale_s, existing_scale_t, existing_offset_s, existing_offset_t, existing_rotation;
+            tep->getScale(&existing_scale_s, &existing_scale_t);
+            tep->getOffset(&existing_offset_s, &existing_offset_t);
+            existing_rotation = tep->getRotation();
+
+            const LLGLTFMaterial::TextureTransform& default_transform = LLGLTFMaterial::TextureTransform();
+            if (existing_scale_s != default_transform.mScale.mV[0] || existing_scale_t != default_transform.mScale.mV[1] ||
+                existing_offset_s != default_transform.mOffset.mV[0] || existing_offset_t != default_transform.mOffset.mV[1] ||
+                existing_rotation != default_transform.mRotation)
+            {
+                // Preserve non-default transforms from texture entry
+                preserved_override = new LLGLTFMaterial();
+                for (U32 i = 0; i < LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT; ++i)
+                {
+                    LLVector2 pbr_scale, pbr_offset;
+                    F32 pbr_rotation;
+                    LLGLTFMaterial::convertTextureTransformToPBR(
+                        existing_scale_s, existing_scale_t,
+                        existing_offset_s, existing_offset_t,
+                        existing_rotation,
+                        pbr_scale, pbr_offset, pbr_rotation);
+                    preserved_override->mTextureTransform[i].mScale = pbr_scale;
+                    preserved_override->mTextureTransform[i].mOffset = pbr_offset;
+                    preserved_override->mTextureTransform[i].mRotation = pbr_rotation;
+                }
+                should_preserve_transforms = true;
+            }
+        }
+    }
+
+    if (should_preserve_transforms && preserved_override)
+    {
+        // Apply material with preserved transforms
+        LLGLTFMaterialList::queueApply(hit_obj, hit_face, asset_id, preserved_override);
+        // Update local state
+        hit_obj->setRenderMaterialID(hit_face, asset_id, false, true);
+        tep->setGLTFMaterialOverride(preserved_override);
+    }
+    else
+    {
+        hit_obj->setRenderMaterialID(hit_face, asset_id);
+    }
 
     dialog_refresh_all();
 
@@ -1333,7 +1417,134 @@ void LLToolDragAndDrop::dropMaterialAllFaces(LLViewerObject* hit_obj,
         asset_id = BLANK_MATERIAL_ASSET_ID;
     }
 
-    hit_obj->setRenderMaterialIDs(asset_id);
+        // Preserve existing texture transforms when switching to PBR material for all faces
+    std::vector<std::pair<bool, LLGLTFMaterial*>> preserved_transforms(hit_obj->getNumTEs());
+
+    if (asset_id.notNull())
+    {
+        for (S32 te = 0; te < hit_obj->getNumTEs(); ++te)
+        {
+            LLTextureEntry* tep = hit_obj->getTE(te);
+            if (!tep) continue;
+
+            bool should_preserve = false;
+            LLGLTFMaterial* preserved_override = nullptr;
+
+            // Only preserve transforms from existing GLTF material override
+            // Do not fall back to texture entry transforms when switching between PBR materials
+            LLGLTFMaterial* existing_override = tep->getGLTFMaterialOverride();
+            if (existing_override)
+            {
+                // Check if existing override has non-default transforms
+                const LLGLTFMaterial::TextureTransform& existing_transform = existing_override->mTextureTransform[0];
+                const LLGLTFMaterial::TextureTransform& default_transform = LLGLTFMaterial::TextureTransform();
+
+                if (existing_transform.mScale != default_transform.mScale ||
+                    existing_transform.mOffset != default_transform.mOffset ||
+                    existing_transform.mRotation != default_transform.mRotation)
+                {
+                    // Preserve non-default transforms from current PBR material
+                    preserved_override = new LLGLTFMaterial();
+                    for (U32 i = 0; i < LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT; ++i)
+                    {
+                        preserved_override->mTextureTransform[i].mScale = existing_transform.mScale;
+                        preserved_override->mTextureTransform[i].mOffset = existing_transform.mOffset;
+                        preserved_override->mTextureTransform[i].mRotation = existing_transform.mRotation;
+                    }
+                    should_preserve = true;
+                }
+                else
+                {
+                    // Existing override has default transforms, fall back to texture entry
+                    F32 existing_scale_s, existing_scale_t, existing_offset_s, existing_offset_t, existing_rotation;
+                    tep->getScale(&existing_scale_s, &existing_scale_t);
+                    tep->getOffset(&existing_offset_s, &existing_offset_t);
+                    existing_rotation = tep->getRotation();
+
+                    if (existing_scale_s != default_transform.mScale.mV[0] || existing_scale_t != default_transform.mScale.mV[1] ||
+                        existing_offset_s != default_transform.mOffset.mV[0] || existing_offset_t != default_transform.mOffset.mV[1] ||
+                        existing_rotation != default_transform.mRotation)
+                    {
+                        // Preserve non-default transforms from texture entry
+                        preserved_override = new LLGLTFMaterial();
+                        for (U32 i = 0; i < LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT; ++i)
+                        {
+                            LLVector2 pbr_scale, pbr_offset;
+                            F32 pbr_rotation;
+                            LLGLTFMaterial::convertTextureTransformToPBR(
+                                existing_scale_s, existing_scale_t,
+                                existing_offset_s, existing_offset_t,
+                                existing_rotation,
+                                pbr_scale, pbr_offset, pbr_rotation);
+                            preserved_override->mTextureTransform[i].mScale = pbr_scale;
+                            preserved_override->mTextureTransform[i].mOffset = pbr_offset;
+                            preserved_override->mTextureTransform[i].mRotation = pbr_rotation;
+                        }
+                        should_preserve = true;
+                    }
+                }
+            }
+            else
+            {
+                // No existing PBR material override - check texture entry transforms
+                // This handles the case of switching from Blinn-Phong to PBR material
+                F32 existing_scale_s, existing_scale_t, existing_offset_s, existing_offset_t, existing_rotation;
+                tep->getScale(&existing_scale_s, &existing_scale_t);
+                tep->getOffset(&existing_offset_s, &existing_offset_t);
+                existing_rotation = tep->getRotation();
+
+                const LLGLTFMaterial::TextureTransform& default_transform = LLGLTFMaterial::TextureTransform();
+                if (existing_scale_s != default_transform.mScale.mV[0] || existing_scale_t != default_transform.mScale.mV[1] ||
+                    existing_offset_s != default_transform.mOffset.mV[0] || existing_offset_t != default_transform.mOffset.mV[1] ||
+                    existing_rotation != default_transform.mRotation)
+                {
+                    // Preserve non-default transforms from texture entry
+                    preserved_override = new LLGLTFMaterial();
+                    for (U32 i = 0; i < LLGLTFMaterial::GLTF_TEXTURE_INFO_COUNT; ++i)
+                    {
+                        LLVector2 pbr_scale, pbr_offset;
+                        F32 pbr_rotation;
+                        LLGLTFMaterial::convertTextureTransformToPBR(
+                            existing_scale_s, existing_scale_t,
+                            existing_offset_s, existing_offset_t,
+                            existing_rotation,
+                            pbr_scale, pbr_offset, pbr_rotation);
+                        preserved_override->mTextureTransform[i].mScale = pbr_scale;
+                        preserved_override->mTextureTransform[i].mOffset = pbr_offset;
+                        preserved_override->mTextureTransform[i].mRotation = pbr_rotation;
+                    }
+                    should_preserve = true;
+                }
+            }
+
+            preserved_transforms[te] = std::make_pair(should_preserve, preserved_override);
+        }
+    }
+
+    // Apply materials with preserved transforms
+    if (asset_id.notNull())
+    {
+        for (S32 te = 0; te < hit_obj->getNumTEs(); ++te)
+        {
+            LLGLTFMaterial* preserved_override = preserved_transforms[te].second;
+            if (preserved_override)
+            {
+                // Apply material with preserved transforms
+                LLGLTFMaterialList::queueApply(hit_obj, te, asset_id, preserved_override);
+                // Update local state
+                hit_obj->setRenderMaterialID(te, asset_id, false, true);
+                hit_obj->getTE(te)->setGLTFMaterialOverride(preserved_override);
+            }
+            else
+            {
+                hit_obj->setRenderMaterialID(te, asset_id, false, true);
+            }
+        }
+    }
+    else
+    {
+        hit_obj->setRenderMaterialIDs(asset_id);
+    }
     dialog_refresh_all();
     // send the update to the simulator
     hit_obj->sendTEUpdate();
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 6a3be8c882..c15fa52aa4 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -68,6 +68,8 @@
 #include "llrender.h"
 #include "llnavigationbar.h"
 #include "llnotificationsutil.h"
+#include "llfloaterpreference.h"
+#include "llfloaterreg.h"
 #include "llfloatertools.h"
 #include "llpaneloutfitsinventory.h"
 #include "llpanellogin.h"
@@ -150,6 +152,21 @@ static bool handleDebugAvatarJointsChanged(const LLSD& newvalue)
     return true;
 }
 
+static bool handleDebugQualityPerformanceChanged(const LLSD& newvalue)
+{
+    // control was set directly or after adjusting Preference setting, no need to update
+    if (gSavedSettings.getU32("RenderQualityPerformance") != gSavedSettings.getU32("DebugQualityPerformance"))
+    {
+        LLFloaterPreference* instance = LLFloaterReg::getTypedInstance<LLFloaterPreference>("preferences");
+        if (instance)
+        {
+            gSavedSettings.setU32("RenderQualityPerformance", newvalue.asInteger());
+            instance->onChangeQuality(newvalue);
+        }
+    }
+    return true;
+}
+
 static bool handleAvatarHoverOffsetChanged(const LLSD& newvalue)
 {
     if (isAgentAvatarValid())
@@ -947,6 +964,7 @@ void settings_setup_listeners()
     setting_setup_signal_listener(gSavedSettings, "SpellCheckDictionary", handleSpellCheckChanged);
     setting_setup_signal_listener(gSavedSettings, "LoginLocation", handleLoginLocationChanged);
     setting_setup_signal_listener(gSavedSettings, "DebugAvatarJoints", handleDebugAvatarJointsChanged);
+    setting_setup_signal_listener(gSavedSettings, "DebugQualityPerformance", handleDebugQualityPerformanceChanged);
 
     setting_setup_signal_listener(gSavedSettings, "TargetFPS", handleTargetFPSChanged);
     setting_setup_signal_listener(gSavedSettings, "AutoTuneFPS", handleAutoTuneFPSChanged);
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index f6ad29d085..4a4a43c2b9 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -1566,6 +1566,11 @@ void render_ui(F32 zoom_factor, int subfield)
                 render_disconnected_background();
             }
         }
+        else
+        {
+            // Make sure particle effects disappear
+            LLHUDObject::renderAllForTimer();
+        }
 
         if (render_ui)
         {
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 6155058f14..ec5381ddfc 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -419,7 +419,9 @@ void LLViewerInventoryItem::updateServer(bool is_new) const
                          << LL_ENDL;
         return;
     }
-    if(gAgent.getID() != mPermissions.getOwner())
+    LLUUID owner = mPermissions.getOwner();
+    if(gAgent.getID() != owner
+        && owner.notNull()) // incomplete?
     {
         // *FIX: deal with this better.
         LL_WARNS(LOG_INV) << "LLViewerInventoryItem::updateServer() - for unowned item "
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 452a2cec50..374a2ae075 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -6531,7 +6531,7 @@ bool handle_zoom_to_object(const LLUUID& object_id)
 
     LLViewerObject* object = gObjectList.findObject(object_id);
 
-    if (object)
+    if (object && object->isReachable())
     {
         gAgentCamera.setFocusOnAvatar(false, ANIMATE);
 
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index b0401b1425..c13e541da0 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -5091,11 +5091,10 @@ void LLViewerObject::setNumTEs(const U8 num_tes)
                     if (base_material && override_material)
                     {
                         tep->setGLTFMaterialOverride(new LLGLTFMaterial(*override_material));
-
-                        LLGLTFMaterial* render_material = new LLFetchedGLTFMaterial();
-                        *render_material = *base_material;
-                        render_material->applyOverride(*override_material);
-                        tep->setGLTFRenderMaterial(render_material);
+                    }
+                    if (base_material)
+                    {
+                        initRenderMaterial(i);
                     }
                 }
             }
@@ -5271,6 +5270,9 @@ void LLViewerObject::updateTEMaterialTextures(U8 te)
                 });
         }
         getTE(te)->setGLTFMaterial(mat);
+        initRenderMaterial(te);
+        mat = (LLFetchedGLTFMaterial*) getTE(te)->getGLTFRenderMaterial();
+        llassert(mat == nullptr || dynamic_cast<LLFetchedGLTFMaterial*>(getTE(te)->getGLTFRenderMaterial()) != nullptr);
     }
     else if (mat_id.isNull() && mat != nullptr)
     {
@@ -5660,6 +5662,42 @@ S32 LLViewerObject::setTEMaterialParams(const U8 te, const LLMaterialPtr pMateri
     return retval;
 }
 
+// Set render material if there are overrides or if the base material is has a
+// baked texture. Otherwise, set it to null.
+// If you are setting the material override and not sending an update message,
+// you should probably call this function.
+S32 LLViewerObject::initRenderMaterial(U8 te)
+{
+    LL_PROFILE_ZONE_SCOPED;
+
+    LLTextureEntry* tep = getTE(te);
+    if (!tep) { return 0; }
+    const LLFetchedGLTFMaterial* base_material = static_cast<LLFetchedGLTFMaterial*>(tep->getGLTFMaterial());
+    llassert(base_material);
+    if (!base_material) { return 0; }
+    const LLGLTFMaterial* override_material = tep->getGLTFMaterialOverride();
+    LLFetchedGLTFMaterial* render_material = nullptr;
+    bool need_render_material = override_material;
+    if (!need_render_material)
+    {
+        for (const LLUUID& texture_id : base_material->mTextureId)
+        {
+            if (LLAvatarAppearanceDefines::LLAvatarAppearanceDictionary::isBakedImageId(texture_id))
+            {
+                need_render_material = true;
+                break;
+            }
+        }
+    }
+    if (need_render_material)
+    {
+        render_material = new LLFetchedGLTFMaterial(*base_material);
+        if (override_material) { render_material->applyOverride(*override_material); }
+        render_material->clearFetchedTextures();
+    }
+    return tep->setGLTFRenderMaterial(render_material);
+}
+
 S32 LLViewerObject::setTEGLTFMaterialOverride(U8 te, LLGLTFMaterial* override_mat)
 {
     LL_PROFILE_ZONE_SCOPED;
@@ -5693,22 +5731,13 @@ S32 LLViewerObject::setTEGLTFMaterialOverride(U8 te, LLGLTFMaterial* override_ma
 
     if (retval)
     {
+        retval = initRenderMaterial(te) | retval;
         if (override_mat)
         {
-            LLFetchedGLTFMaterial* render_mat = new LLFetchedGLTFMaterial(*src_mat);
-            render_mat->applyOverride(*override_mat);
-            tep->setGLTFRenderMaterial(render_mat);
-            retval = TEM_CHANGE_TEXTURE;
-
             for (LLGLTFMaterial::local_tex_map_t::value_type &val : override_mat->mTrackingIdToLocalTexture)
             {
                 LLLocalBitmapMgr::getInstance()->associateGLTFMaterial(val.first, override_mat);
             }
-
-        }
-        else if (tep->setGLTFRenderMaterial(nullptr))
-        {
-            retval = TEM_CHANGE_TEXTURE;
         }
     }
 
@@ -7578,25 +7607,15 @@ void LLViewerObject::setRenderMaterialID(S32 te_in, const LLUUID& id, bool updat
             // the overrides have not changed due to being only texture
             // transforms. Re-apply the overrides to the render material here,
             // if present.
-            const LLGLTFMaterial* override_material = tep->getGLTFMaterialOverride();
-            if (override_material)
+            // Also, sometimes, the material has baked textures, which requires
+            // a copy unique to this object.
+            // Currently, we do not deduplicate render materials.
+            new_material->onMaterialComplete([obj_id = getID(), te]()
             {
-                new_material->onMaterialComplete([obj_id = getID(), te]()
-                    {
-                        LLViewerObject* obj = gObjectList.findObject(obj_id);
-                        if (!obj) { return; }
-                        LLTextureEntry* tep = obj->getTE(te);
-                        if (!tep) { return; }
-                        const LLGLTFMaterial* new_material = tep->getGLTFMaterial();
-                        if (!new_material) { return; }
-                        const LLGLTFMaterial* override_material = tep->getGLTFMaterialOverride();
-                        if (!override_material) { return; }
-                        LLGLTFMaterial* render_material = new LLFetchedGLTFMaterial();
-                        *render_material = *new_material;
-                        render_material->applyOverride(*override_material);
-                        tep->setGLTFRenderMaterial(render_material);
-                    });
-            }
+                LLViewerObject* obj = gObjectList.findObject(obj_id);
+                if (!obj) { return; }
+                obj->initRenderMaterial(te);
+            });
         }
     }
 
@@ -7718,6 +7737,51 @@ void LLViewerObject::clearTEWaterExclusion(const U8 te)
     }
 }
 
+bool LLViewerObject::isReachable()
+{
+    LLViewerRegion* agent_region = gAgent.getRegion();
+    LLViewerRegion* object_region = getRegion();
+
+    if (!agent_region || !object_region)
+    {
+        return false;
+    }
+    if (agent_region == object_region)
+    {
+        return true;
+    }
+
+    std::unordered_set<LLViewerRegion*> visited;
+    std::queue<LLViewerRegion*> pending;
+    visited.insert(agent_region);
+    pending.push(agent_region);
+
+    while (!pending.empty())
+    {
+        LLViewerRegion* current = pending.front();
+        pending.pop();
+
+        std::vector<LLViewerRegion*> neighbors;
+        current->getNeighboringRegions(neighbors);
+
+        for (LLViewerRegion* neighbor : neighbors)
+        {
+            if (!neighbor) continue;
+
+            if (neighbor == object_region)
+            {
+                return true;
+            }
+            // region's neighbors were not checked
+            if (visited.insert(neighbor).second)
+            {
+                pending.push(neighbor);
+            }
+        }
+    }
+    return false;
+}
+
 class ObjectPhysicsProperties : public LLHTTPNode
 {
 public:
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 972f8cf846..6e26da74e7 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -249,6 +249,9 @@ public:
     // Accessor functions
     LLViewerRegion* getRegion() const               { return mRegionp; }
 
+    // Check if object is reachable from agent region by traversing loaded neighboring regions
+    bool isReachable();
+
     bool isSelected() const                         { return mUserSelected; }
     // Check whole linkset
     bool isAnySelected() const;
@@ -389,6 +392,7 @@ public:
     /*virtual*/ S32     setTEGlow(const U8 te, const F32 glow);
     /*virtual*/ S32     setTEMaterialID(const U8 te, const LLMaterialID& pMaterialID);
     /*virtual*/ S32     setTEMaterialParams(const U8 te, const LLMaterialPtr pMaterialParams);
+    S32 initRenderMaterial(const U8 te);
     virtual     S32     setTEGLTFMaterialOverride(U8 te, LLGLTFMaterial* mat);
 
     // Used by Materials update functions to properly kick off rebuilds
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index c15fd86f71..0a6197a67a 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -1070,7 +1070,7 @@ void LLViewerObjectList::fetchObjectCostsCoro(std::string url)
 
     if (diff.empty())
     {
-        LL_INFOS() << "No outstanding object IDs to request. Pending count: " << mPendingObjectCost.size() << LL_ENDL;
+        LL_DEBUGS() << "No outstanding object IDs to request. Pending count: " << mPendingObjectCost.size() << LL_ENDL;
         return;
     }
 
@@ -1205,7 +1205,7 @@ void LLViewerObjectList::fetchPhisicsFlagsCoro(std::string url)
 
     if (idList.size() < 1)
     {
-        LL_INFOS() << "No outstanding object physics flags to request." << LL_ENDL;
+        LL_DEBUGS() << "No outstanding object physics flags to request." << LL_ENDL;
         return;
     }
 
diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index e40f109e55..b669ec2c31 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -2153,7 +2153,7 @@ bool LLViewerFetchedTexture::updateFetch()
         }
 
         const U32 override_tex_discard_level = gSavedSettings.getU32("TextureDiscardLevel");
-        if (override_tex_discard_level != 0)
+        if (override_tex_discard_level != 0 && override_tex_discard_level <= MAX_DISCARD_LEVEL)
         {
             desired_discard = override_tex_discard_level;
         }
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 9942ea3de8..bcd6ba4ec2 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1466,18 +1466,43 @@ void LLViewerWindow::handleMouseLeave(LLWindow *window)
     LLToolTipMgr::instance().blockToolTips();
 }
 
-bool LLViewerWindow::handleCloseRequest(LLWindow *window)
+bool LLViewerWindow::handleCloseRequest(LLWindow *window, bool from_user)
 {
     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
+        if (from_user)
+        {
+            // User has indicated they want to close, but we may need to ask
+            // about modified documents.
+            LLAppViewer::instance()->userQuit();
+            // Don't quit immediately
+        }
+        else
+        {
+            // OS is asking us to quit, assume we have time and start cleanup
+            LLAppViewer::instance()->requestQuit();
+        }
     }
     return false;
 }
 
+bool LLViewerWindow::handleSessionExit(LLWindow* window)
+{
+    if (!LLApp::isExiting() && !LLApp::isStopped())
+    {
+        // Viewer received WM_ENDSESSION and app will be killed soon if it doesn't respond
+        LLAppViewer* app = LLAppViewer::instance();
+        app->sendSimpleLogoutRequest();
+        app->earlyExitNoNotify();
+
+        // Not viewer's fault, remove marker files so
+        // that statistics won't consider this to be a crash
+        app->removeMarkerFiles();
+        return false;
+    }
+    return true;
+}
+
 void LLViewerWindow::handleQuit(LLWindow *window)
 {
     if (gNonInteractive)
@@ -1897,7 +1922,7 @@ LLViewerWindow::LLViewerWindow(const Params& p)
         p.ignore_pixel_depth,
         0,
         max_core_count,
-        max_gl_version); //don't use window level anti-aliasing
+        max_gl_version); //don't use window level anti-aliasing, windows only
 
     if (NULL == mWindow)
     {
@@ -3317,7 +3342,31 @@ void LLViewerWindow::clearPopups()
 
 void LLViewerWindow::moveCursorToCenter()
 {
-    if (! gSavedSettings.getBOOL("DisableMouseWarp"))
+    bool mouse_warp = false;
+    LLCachedControl<S32> mouse_warp_mode(gSavedSettings, "MouseWarpMode", 1);
+
+    switch (mouse_warp_mode())
+    {
+    case 0:
+        // For Windows:
+        // Mouse usually uses 'delta' position since it isn't aware of own location, keep it centered.
+        // Touch screen reports absolute or virtual absolute position and warping a physical
+        // touch is pointless, so don't move it.
+        //
+        // MacOS
+        // If 'decoupled', CGAssociateMouseAndMouseCursorPosition can make mouse stay in
+        // one place and not move, do not move it (needs testing).
+        mouse_warp = mWindow->isWrapMouse();
+        break;
+    case 1:
+        mouse_warp = true;
+        break;
+    default:
+        mouse_warp = false;
+        break;
+    }
+
+    if (mouse_warp)
     {
         S32 x = getWorldViewWidthScaled() / 2;
         S32 y = getWorldViewHeightScaled() / 2;
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index d55c2d3817..61aa84394c 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -197,7 +197,8 @@ public:
     /*virtual*/ bool handleUnicodeChar(llwchar uni_char, MASK mask);    // NOT going to handle extended
     /*virtual*/ bool handleMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask);
     /*virtual*/ bool handleMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask);
-    /*virtual*/ bool handleCloseRequest(LLWindow *window);
+    /*virtual*/ bool handleCloseRequest(LLWindow *window, bool from_user);
+    /*virtual*/ bool handleSessionExit(LLWindow* window);
     /*virtual*/ void handleQuit(LLWindow *window);
     /*virtual*/ bool handleRightMouseDown(LLWindow *window,  LLCoordGL pos, MASK mask);
     /*virtual*/ bool handleRightMouseUp(LLWindow *window,  LLCoordGL pos, MASK mask);
diff --git a/indra/newview/llvocache.cpp b/indra/newview/llvocache.cpp
index 52a6afc2d0..5d456b1a19 100644
--- a/indra/newview/llvocache.cpp
+++ b/indra/newview/llvocache.cpp
@@ -498,7 +498,7 @@ void LLVOCacheEntry::updateDebugSettings()
     sNearRadius = MIN_RADIUS + ((clamped_min_radius - MIN_RADIUS) * adjust_factor);
 
     // a percentage of draw distance beyond which all objects outside of view frustum will be unloaded, regardless of pixel threshold
-    static LLCachedControl<F32> rear_max_radius_frac(gSavedSettings,"SceneLoadRearMaxRadiusFraction");
+    static LLCachedControl<F32> rear_max_radius_frac(gSavedSettings,"SceneLoadRearMaxRadiusFraction", .75f);
     const F32 min_radius_plus_one = sNearRadius + 1.f;
     const F32 max_radius = rear_max_radius_frac * draw_radius;
     const F32 clamped_max_radius = llclamp(max_radius, min_radius_plus_one, draw_radius); // [sNearRadius, mDrawDistance]
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
index e1667c505e..8059914ed7 100644
--- a/indra/newview/llvoicewebrtc.cpp
+++ b/indra/newview/llvoicewebrtc.cpp
@@ -296,10 +296,10 @@ void LLWebRTCVoiceClient::terminate()
     LL_INFOS("Voice") << "Terminating WebRTC" << LL_ENDL;
 
     mVoiceEnabled = false;
+    sShuttingDown = true; // so that coroutines won't post more work.
     llwebrtc::terminate();
-    mWebRTCDeviceInterface = nullptr;
 
-    sShuttingDown = true;
+    mWebRTCDeviceInterface = nullptr;
 }
 
 //---------------------------------------------------
@@ -2674,6 +2674,11 @@ void LLVoiceWebRTCConnection::breakVoiceConnectionCoro(connectionPtr_t connectio
 void LLVoiceWebRTCSpatialConnection::requestVoiceConnection()
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_VOICE;
+    if (LLWebRTCVoiceClient::isShuttingDown())
+    {
+        mOutstandingRequests--;
+        return;
+    }
 
     LLViewerRegion *regionp = LLWorld::instance().getRegionFromID(mRegionID);
 
@@ -3281,6 +3286,12 @@ void LLVoiceWebRTCAdHocConnection::requestVoiceConnection()
 {
     LL_PROFILE_ZONE_SCOPED_CATEGORY_VOICE;
 
+    if (LLWebRTCVoiceClient::isShuttingDown())
+    {
+        mOutstandingRequests--;
+        return;
+    }
+
     LLViewerRegion *regionp = LLWorld::instance().getRegionFromID(mRegionID);
 
     LL_DEBUGS("Voice") << "Requesting voice connection." << LL_ENDL;
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index acdb1a3edb..63b35cf30c 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -6764,7 +6764,7 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace
                 && te->getShiny()
                 && can_be_shiny)
             { //shiny
-                if (tex->getPrimaryFormat() == GL_ALPHA)
+                if (tex && tex->getPrimaryFormat() == GL_ALPHA)
                 { //invisiprim+shiny
                     if (!facep->getViewerObject()->isAttachment() && !facep->getViewerObject()->isRiggedMesh())
                     {
@@ -6804,7 +6804,7 @@ U32 LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, LLFace
             }
             else
             { //not alpha and not shiny
-                if (!is_alpha && tex->getPrimaryFormat() == GL_ALPHA)
+                if (!is_alpha && tex && tex->getPrimaryFormat() == GL_ALPHA)
                 { //invisiprim
                     if (!facep->getViewerObject()->isAttachment() && !facep->getViewerObject()->isRiggedMesh())
                     {
diff --git a/indra/newview/llworldmap.cpp b/indra/newview/llworldmap.cpp
index 7962c28e6d..153bee3aef 100644
--- a/indra/newview/llworldmap.cpp
+++ b/indra/newview/llworldmap.cpp
@@ -32,6 +32,7 @@
 #include "message.h"
 #include "lltracker.h"
 #include "lluistring.h"
+#include "llviewercontrol.h"
 #include "llviewertexturelist.h"
 #include "lltrans.h"
 #include "llgltexture.h"
@@ -492,9 +493,20 @@ bool LLWorldMap::insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID&
         case MAP_ITEM_MATURE_EVENT:
         case MAP_ITEM_ADULT_EVENT:
         {
-            std::string timeStr = "["+ LLTrans::getString ("TimeHour")+"]:["
-                                       +LLTrans::getString ("TimeMin")+"] ["
-                                       +LLTrans::getString ("TimeAMPM")+"]";
+            std::string timeStr;
+
+            static bool use_24h = gSavedSettings.getBOOL("Use24HourClock");
+            if (use_24h)
+            {
+                timeStr = "[" + LLTrans::getString("TimeHour") + "]:["
+                    + LLTrans::getString("TimeMin") + "]";
+            }
+            else
+            {
+                timeStr = "[" + LLTrans::getString("TimeHour12") + "]:["
+                    + LLTrans::getString("TimeMin") + "] ["
+                    + LLTrans::getString("TimeAMPM") + "]";
+            }
             LLSD substitution;
             substitution["datetime"] = (S32) extra;
             LLStringUtil::format (timeStr, substitution);
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index dde8b8ed2a..1415e40ed8 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4509,7 +4509,7 @@ void LLPipeline::renderPhysicsDisplay()
     gGL.flush();
     gDebugProgram.bind();
 
-    LLGLEnable(GL_POLYGON_OFFSET_LINE);
+    LLGLEnable polygon_offset_line(GL_POLYGON_OFFSET_LINE);
     glPolygonOffset(3.f, 3.f);
     //glLineWidth(3.f);
     LLGLEnable blend(GL_BLEND);
@@ -11997,21 +11997,24 @@ public:
     }
 };
 
-
+// Called from LLViewHighlightTransparent when "Highlight Transparent" is toggled
 void LLPipeline::rebuildDrawInfo()
 {
-    for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin();
-        iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
+    const U32 types_to_traverse[] =
     {
-        LLViewerRegion* region = *iter;
-
-        LLOctreeDirty dirty;
-
-        LLSpatialPartition* part = region->getSpatialPartition(LLViewerRegion::PARTITION_VOLUME);
-        dirty.traverse(part->mOctree);
+        LLViewerRegion::PARTITION_VOLUME,
+        LLViewerRegion::PARTITION_BRIDGE,
+        LLViewerRegion::PARTITION_AVATAR
+    };
 
-        part = region->getSpatialPartition(LLViewerRegion::PARTITION_BRIDGE);
-        dirty.traverse(part->mOctree);
+    LLOctreeDirty dirty;
+    for (LLViewerRegion* region : LLWorld::getInstance()->getRegionList())
+    {
+        for (U32 type : types_to_traverse)
+        {
+            LLSpatialPartition* part = region->getSpatialPartition(type);
+            dirty.traverse(part->mOctree);
+        }
     }
 }
 
diff --git a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
index d52845160b..e5ad86b315 100644
--- a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml
@@ -15,6 +15,9 @@
 	<panel.string name="acquiredDate">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</panel.string>
+  <panel.string name="acquiredDateAMPM">
+    [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local] [ampm,datetime,local] [year,datetime,local]
+  </panel.string>
 	<panel.string name="origin_inventory">
 		(Beholdning)
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
index 168bb14248..3570ccacd2 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
@@ -21,6 +21,9 @@
 	<panel.string name="acquiredDate">
 		[wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
 	</panel.string>
+  <panel.string name="acquiredDateAMPM">
+    [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local] [ampm,datetime,local] [year,datetime,local]
+  </panel.string>
 	<panel.string name="origin_inventory">
 		(Inventar)
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 7284e4e6a8..a17eb22d89 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -5074,10 +5074,10 @@ Bitte überprüfen Sie http://status.secondlifegrid.net, um herauszufinden, ob e
 		[MDAY]
 	</string>
 	<string name="dateTimeAM">
-		Uhr
+		AM
 	</string>
 	<string name="dateTimePM">
-		Uhr
+		PM
 	</string>
 	<string name="LocalEstimateUSD">
 		[AMOUNT] US$
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index 0d22d37085..80774c329d 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -232,6 +232,8 @@ SDL Copyright (C) 1997-2024 Sam Lantinga
 
 SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 
+V-HACD Copyright (c) 2011, Khaled Mamou (kmamou at gmail dot com)
+
 xxHash Copyright (C) 2012-2020 Yann Collet.
 
 zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml
index 508aba6ae1..c5b42b6dae 100644
--- a/indra/newview/skins/default/xui/en/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en/floater_about_land.xml
@@ -125,6 +125,9 @@
              name="no_selection_text">
                 No parcel selected.
             </panel.string>
+            <panel.string name="time_stamp_template_ampm">
+              [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt] [year,datetime,slt]
+            </panel.string>
             <panel.string name="time_stamp_template">
               [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt]
             </panel.string>
diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml
index 9403d58441..a083683c23 100644
--- a/indra/newview/skins/default/xui/en/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/en/floater_inspect.xml
@@ -12,6 +12,10 @@
  title="INSPECT OBJECTS"
  width="400">
     <floater.string
+     name="timeStampAMPM">
+      [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt] [year,datetime,slt]
+    </floater.string>
+    <floater.string
      name="timeStamp">
         [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt]
     </floater.string>
diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index f11d687840..39e9de0980 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -40,7 +40,7 @@
   <string name="simplifying">Simplifying...</string>
   <string name="tbd">TBD</string>
   <string name="ModelTextureScaling">One or more textures in this model were scaled to be within the allowed limits.</string>
-  
+
   <!-- Warnings and info from model loader-->
   <string name="TooManyJoint">Skinning disabled due to too many joints: [JOINTS], maximum: [MAX]</string>
   <string name="UnrecognizedJoint">Rigged to unrecognized joint name [NAME]</string>
@@ -807,7 +807,7 @@
           help_topic="upload_model_physics"
           label="Physics"
           name="physics_panel">
-            
+
             <!-- ==== STEP 1: Level of Detail ==== -->
             <view_border
               bevel_style="none"
@@ -873,7 +873,7 @@
                     <!-- <check_box name="physics_optimize" follows="left|top" width="130" left="10" top_pad="5" height="20" label="Optimize"/>
                     <check_box name="physics_use_hull" follows="left|top" width="130" left_pad="5" height="20" label="Use Convex Hull"/> -->
                 </panel>
-            
+
             <!-- ==== STEP 2: Analyze ==== -->
             <view_border
               bevel_style="none"
@@ -890,9 +890,9 @@
                   height="65"
                   follows="top|left"
                   left="18"
-                  name="physics analysis"
+                  name="physics analysis havok"
                   top_pad="10"
-                  visible="true"
+                  visible="false"
                   width="589">
                     <text
                       follows="left|top"
@@ -980,7 +980,131 @@
                       visible="false"
                       width="90"/>
                 </panel>
-            
+                <panel
+                  bg_alpha_color="0 0 0 0"
+                  bg_opaque_color="0 0 0 0.3"
+                  height="65"
+                  follows="top|left"
+                  left="18"
+                  name="physics analysis vhacd"
+                  top_delta="0"
+                  visible="false"
+                  width="589">
+                    <text
+                      follows="left|top"
+                      font="SansSerif"
+                      height="20"
+                      layout="topleft"
+                      left="0"
+                      name="method_label"
+                      text_color="White"
+                      top_pad="0">
+                      Step 2: Convert to hulls (optional)
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      layout="topleft"
+                      name="analysis_method_label"
+                      top_pad="10"
+                      width="100">
+                      Fill Mode:
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      name="quality_label"
+                      layout="topleft"
+                      left_pad="5"
+                      width="85">
+                      Resolution:
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      name="quality_label"
+                      layout="topleft"
+                      left_pad="25"
+                      width="95">
+                      Hulls per Mesh:
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      name="smooth_method_label"
+                      layout="topleft"
+                      left_pad="5"
+                      width="95">
+                      Vertices per hull:
+                    </text>
+                    <text
+                      follows="top|left"
+                      height="15"
+                      name="tolerance_label"
+                      layout="topleft"
+                      left_pad="5"
+                      width="100">
+                      Error tolerance:
+                    </text>
+                    <combo_box
+                      follows="top|left"
+                      layout="topleft"
+                      left="0"
+                      name="Fill Mode"
+                      top_pad="0"
+                      height="20"
+                      width="100"/>
+                    <combo_box
+                      follows="top|left"
+                      layout="topleft"
+                      left_pad="5"
+                      name="Voxel Resolution"
+                      height="20"
+                      width="100"/>
+                    <spinner
+                      follows="top|left"
+                      name="Num Hulls"
+                      height="20"
+                      left_pad="10"
+                      width="60"
+                      decimal_digits="0"
+                      allow_digits_only="true"/>
+                    <spinner
+                      follows="top|left"
+                      name="Num Vertices"
+                      height="20"
+                      left_pad="40"
+                      width="60"
+                      decimal_digits="0"
+                      allow_digits_only="true"/>
+                    <spinner
+                      follows="top|left"
+                      name="Error Tolerance"
+                      height="20"
+                      left_pad="40"
+                      width="60"
+                      decimal_digits="4"
+                      allow_digits_only="true"/>
+                    <button
+                      bottom="1"
+                      follows="top|right"
+                      height="20"
+                      label="Analyze"
+                      layout="bottomleft"
+                      name="Analyze"
+                      right="-1"
+                      width="90"/>
+                    <button
+                      follows="top|left"
+                      height="20"
+                      label="Cancel"
+                      layout="topleft"
+                      left_delta="0"
+                      name="analyze_cancel"
+                      visible="false"
+                      width="90"/>
+                </panel>
+
             <!-- ==== STEP 3: Simplify ==== -->
             <view_border
               bevel_style="none"
@@ -999,7 +1123,8 @@
                   left="18"
                   name="physics simplification"
                   top_pad="10"
-                  width="589">
+                  width="589"
+                  visible="false">
                     <text
                       text_color="White"
                       follows="left|top"
@@ -1088,7 +1213,7 @@
                       name="simplify_cancel"
                       width="90"/>
                 </panel>
-            
+
             <!-- ==== Results ==== -->
             <view_border
               bevel_style="none"
@@ -1186,7 +1311,7 @@
        name="modifiers_panel"
        help_topic="upload_model_modifiers">
          <view_border
-          bevel_style="none"  
+          bevel_style="none"
           follows="top|left"
           height="306"
           layout="topleft"
@@ -1593,7 +1718,7 @@ Model:
 [MODEL]
         </text>
       </panel>
-       <!-- 
+       <!--
        Streaming breakdown numbers are available but not fully understood
        uncommenting the following sections will display the numbers for debugging purposes
        <text
@@ -1695,7 +1820,7 @@ Analysed:
          width="462"
          visible="true">
          You don't have rights to upload mesh models. [[VURL] Find out how] to get certified.
-       </text> 
+       </text>
        <text
          text_color="Yellow"
          layout="topleft"
@@ -1706,7 +1831,7 @@ Analysed:
        </text>
     </panel>
   </panel>
-  
+
   <text
    follows="left|top"
    layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index be40ca2f1f..5b9144e535 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1670,7 +1670,7 @@ The new skin will appear after you restart [APP_NAME].
    icon="alertmodal.tga"
    name="ChangeLanguage"
    type="alertmodal">
-Changing language will take effect after you restart [APP_NAME].
+Changing language or time format will take effect after you restart [APP_NAME].
   </notification>
 
   <notification
@@ -2244,7 +2244,7 @@ Couldn&apos;t open uploaded sound file for reading:
 Model upload is not yet available on Apple Silicon, but will be supported in an upcoming release.
    
 Workaround: Right-click the Second Life app in Finder, select
-"Get Info", then check "Open using Rosetta"
+&apos;Get Info&apos;, then check &apos;Open using Rosetta&apos;
   <tag>fail</tag>
   </notification>
 
@@ -6595,6 +6595,22 @@ Do you want to replace it with the selected object?
   </notification>
 
   <notification
+   icon="alertmodal.tga"
+   name="CantLinkNotecard"
+   type="alertmodal">
+    You must save the notecard before creating a link to it.
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantLinkMaterial"
+   type="alertmodal">
+    You must save the material before creating a link to it.
+    <tag>fail</tag>
+  </notification>
+
+  <notification
    icon="alert.tga"
    label="Do Not Disturb Mode Warning"
    name="DoNotDisturbModePay"
diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 02e135a2c7..868d54401e 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel
- height="750"
+ height="770"
  label="Members &amp; Roles"
  layout="topleft"
  left="0"
@@ -18,9 +18,9 @@
     <panel.string
      name="help_text" />
     <tab_container
-    border="false"
+     border="false"
      follows="left|top|right"
-     height="552"
+     height="770"
      halign="center"
      layout="topleft"
      left="0"
@@ -29,16 +29,10 @@
      tab_position="top"
      tab_height="22"
      tab_min_width="90"
-     top="0"
-     width="304">
+     top="0">
         <panel
          border="false"
-         follows="all"
-         height="303"
          label="MEMBERS"
-         layout="topleft"
-         left="0"
-         right="-1"
          help_topic="roles_members_tab"
          name="members_sub_tab"
          tool_tip="Members"
@@ -65,16 +59,16 @@ clicking on their names.
              name="power_partial_icon" translate="false">
                 Checkbox_Off
             </panel.string>
-         <filter_editor
-         layout="topleft"
-         top="5"
-         left="5"
-         right="-5"
-         height="22"
-         search_button_visible="false"
-         follows="left|top|right"
-         label="Filter Members"
-         name="filter_input" />
+            <filter_editor
+             layout="topleft"
+             top="5"
+             left="5"
+             right="-5"
+             height="22"
+             search_button_visible="false"
+             follows="left|top|right"
+             label="Filter Members"
+             name="filter_input" />
             <name_list
              column_padding="2"
              draw_heading="true"
@@ -90,11 +84,11 @@ clicking on their names.
                 <name_list.columns
                  label="Member"
                  name="name"
-               relative_width="0.44" />
+                 relative_width="0.44" />
                 <name_list.columns
                  label="Donation"
                  name="donated"
-         		 relative_width="0.2" />
+                 relative_width="0.2" />
                 <name_list.columns
                  label="Status"
                  name="online"
@@ -118,25 +112,21 @@ clicking on their names.
              left_pad="10"
              name="member_eject"
              width="100" />
-      <button
-       height="23"
-       label="Ban Member(s)"
-       follows="top|left"
-       left_pad="10"
-       name="member_ban"
-       width="100" />
+            <button
+             height="23"
+             label="Ban Member(s)"
+             follows="top|left"
+             left_pad="10"
+             name="member_ban"
+             width="100" />
         </panel>
         <panel
          border="false"
-         height="303"
          label="ROLES"
-         layout="topleft"
-         left="0"
-         right="-1"
          help_topic="roles_roles_tab"
          name="roles_sub_tab"
          class="panel_group_roles_subtab">
-           <!-- <button
+            <!--<button
              enabled="false"
              height="20"
              label="Show All"
@@ -145,411 +135,393 @@ clicking on their names.
              right="-5"
              name="show_all_button"
              width="100" />-->
-      <panel.string
-       name="help_text">
-        Roles have a title and an allowed list of Abilities
-        that Members can perform. Members can belong to
-        one or more Roles. A group can have up to 10 Roles,
-        including the Everyone and Owner Roles.
-      </panel.string>
-      <panel.string
-       name="cant_delete_role">
-        The &apos;Everyone&apos; and &apos;Owners&apos; Roles are special and can't be deleted.
-      </panel.string>
-      <panel.string
-       name="power_folder_icon" translate="false">
-        Inv_FolderClosed
-      </panel.string>
-      <panel.string
-       name="power_all_have_icon" translate="false">
-        Checkbox_On
-      </panel.string>
-      <panel.string
-       name="power_partial_icon" translate="false">
-        Checkbox_Off
-      </panel.string>
-      <filter_editor
-      layout="topleft"
-      top="5"
-      left="5"
-      right="-5"
-      height="22"
-      search_button_visible="false"
-      follows="left|top|right"
-      label="Filter Roles"
-      name="filter_input" />
-      <scroll_list
-       column_padding="0"
-       draw_heading="true"
-       draw_stripes="false"
-       heading_height="23"
-       height="132"
-       layout="topleft"
-       search_column="1"
-       left="0"
-       follows="left|top|right"
-       right="-1"
-       name="role_list"
-       top_pad="2"
-       width="310">
-        <scroll_list.columns
-         label="Role"
-         name="name"
-       relative_width="0.45"  />
-        <scroll_list.columns
-         label="Title"
-         name="title"
-       relative_width="0.45"  />
-        <scroll_list.columns
-         label="#"
-         name="members"
-       relative_width="0.15"  />
-      </scroll_list>
-      <button
-      follows="top|left"
-       height="23"
-       label="New Role"
-       layout="topleft"
-       left="0"
-       name="role_create"
-       width="100" />
-      <button
-       follows="top|left"
-       height="23"
-       label="Copy Role"
-       layout="topleft"
-       left_pad="10"
-       name="role_copy"
-       width="100" />
-      <button
-       height="23"
-       follows="top|left"
-       label="Delete Role"
-       layout="topleft"
-       left_pad="10"
-       name="role_delete"
-       width="100" />
-    </panel>
+            <panel.string
+             name="help_text">
+                Roles have a title and an allowed list of Abilities
+that Members can perform. Members can belong to
+one or more Roles. A group can have up to 10 Roles,
+including the Everyone and Owner Roles.
+            </panel.string>
+            <panel.string
+             name="cant_delete_role">
+                The &apos;Everyone&apos; and &apos;Owners&apos; Roles are special and can't be deleted.
+            </panel.string>
+            <panel.string
+             name="power_folder_icon" translate="false">
+                Inv_FolderClosed
+            </panel.string>
+            <panel.string
+             name="power_all_have_icon" translate="false">
+                Checkbox_On
+            </panel.string>
+            <panel.string
+             name="power_partial_icon" translate="false">
+                Checkbox_Off
+            </panel.string>
+            <filter_editor
+             layout="topleft"
+             top="5"
+             left="5"
+             right="-5"
+             height="22"
+             search_button_visible="false"
+             follows="left|top|right"
+             label="Filter Roles"
+             name="filter_input" />
+            <scroll_list
+             column_padding="0"
+             draw_heading="true"
+             draw_stripes="false"
+             heading_height="23"
+             height="138"
+             layout="topleft"
+             search_column="1"
+             left="0"
+             follows="left|top|right"
+             right="-1"
+             name="role_list"
+             top_pad="2">
+                <scroll_list.columns
+                 label="Role"
+                 name="name"
+                 relative_width="0.45" />
+                <scroll_list.columns
+                 label="Title"
+                 name="title"
+                 relative_width="0.45" />
+                <scroll_list.columns
+                 label="#"
+                 name="members"
+                 relative_width="0.15" />
+            </scroll_list>
+            <button
+             follows="top|left"
+             height="23"
+             label="New Role"
+             layout="topleft"
+             left="0"
+             name="role_create"
+             width="100" />
+            <button
+             follows="top|left"
+             height="23"
+             label="Copy Role"
+             layout="topleft"
+             left_pad="10"
+             name="role_copy"
+             width="100" />
+            <button
+             height="23"
+             follows="top|left"
+             label="Delete Role"
+             layout="topleft"
+             left_pad="10"
+             name="role_delete"
+             width="100" />
+        </panel>
+        <panel
+         border="false"
+         label="ABILITIES"
+         help_topic="roles_actions_tab"
+         name="actions_sub_tab"
+         class="panel_group_actions_subtab"
+         tool_tip="You can view an Ability&apos;s Description and which Roles and Members can execute the Ability.">
+            <panel.string
+             name="help_text">
+                Abilities allow Members in Roles to do specific
+things in this group. There&apos;s a broad variety of Abilities.
+            </panel.string>
+            <panel.string
+             name="power_folder_icon" translate="false">
+                Inv_FolderClosed
+            </panel.string>
+            <panel.string
+             name="power_all_have_icon" translate="false">
+                Checkbox_On
+            </panel.string>
+            <panel.string
+             name="power_partial_icon" translate="false">
+                Checkbox_Off
+            </panel.string>
+            <filter_editor
+             layout="topleft"
+             top="5"
+             left="5"
+             right="-5"
+             height="22"
+             search_button_visible="false"
+             follows="left|top|right"
+             label="Filter Abilities"
+             name="filter_input" />
+            <scroll_list
+             column_padding="0"
+             draw_stripes="true"
+             height="200"
+             follows="left|top|right"
+             layout="topleft"
+             left="0"
+             right="-1"
+             name="action_list"
+             search_column="2"
+             tool_tip="Select an Ability to view more details"
+             top_pad="5">
+                <scroll_list.columns
+                 label=""
+                 name="icon"
+                 width="2" />
+                <scroll_list.columns
+                 label=""
+                 name="checkbox"
+                 width="20" />
+                <scroll_list.columns
+                 label=""
+                 name="action" />
+            </scroll_list>
+        </panel>
+        <panel
+         border="false"
+         label="BANNED RESIDENTS"
+         help_topic="roles_banlist_tab"
+         name="banlist_sub_tab"
+         class="panel_group_banlist_subtab"
+         tool_tip="View the banned residents from this group.">
+            <panel.string
+             name="help_text">
+                Any resident on the ban list will be unable to join the group.
+            </panel.string>
+            <panel.string
+             name="ban_count_template">
+                Ban count: [COUNT]/[LIMIT]
+            </panel.string>
+            <name_list
+             column_padding="0"
+             draw_heading="true"
+             height="714"
+             follows="left|top|right"
+             layout="topleft"
+             left="0"
+             right="-1"
+             multi_select="true"
+             name="ban_list"
+             short_names="false"
+             top_pad="5">
+                <name_list.columns
+                 label="Resident"
+                 name="name"
+                 font.name="SANSSERIF_SMALL"
+                 font.style="NORMAL"
+                 relative_width="0.7" />
+                <name_list.columns
+                 label="Date Banned"
+                 name="ban_date"
+                 relative_width="0.3" />
+            </name_list>
+            <button
+             follows="top|left"
+             height="23"
+             label="Ban Resident(s)"
+             layout="topleft"
+             left="3"
+             name="ban_create"
+             tool_tip="Ban residents from your group"
+             width="120" />
+            <button
+             follows="top|left"
+             height="23"
+             label="Remove Ban(s)"
+             layout="topleft"
+             left_pad="5"
+             name="ban_delete"
+             tool_tip="Unban selected residents from your group"
+             width="120" />
+            <button
+             follows="top|left"
+             height="23"
+             width="23"
+             image_overlay="Refresh_Off"
+             layout="topleft"
+             left_pad="5"
+             name="ban_refresh"
+             tool_tip="Refresh the ban list" />
+            <text
+             type="string"
+             height="18"
+             left_pad="5"
+             follows="top|left"
+             layout="topleft"
+             name="ban_count"
+             width="100">
+            </text>
+        </panel>
+    </tab_container>
     <panel
-     border="false"
-     height="303"
-     label="ABILITIES"
+     height="350"
+     background_visible="false"
+     bg_alpha_color="FloaterUnfocusBorderColor"
      layout="topleft"
+     follows="top|left|right"
      left="0"
      right="-1"
-     help_topic="roles_actions_tab"
-     name="actions_sub_tab"
-     class="panel_group_actions_subtab"
-     tool_tip="You can view an Ability&apos;s Description and which Roles and Members can execute the Ability."
-     width="310">
-      <panel.string
-       name="help_text">
-        Abilities allow Members in Roles to do specific
-        things in this group. There&apos;s a broad variety of Abilities.
-      </panel.string>
-      <panel.string
-       name="power_folder_icon" translate="false">
-        Inv_FolderClosed
-      </panel.string>
-      <panel.string
-       name="power_all_have_icon" translate="false">
-        Checkbox_On
-      </panel.string>
-      <panel.string
-       name="power_partial_icon" translate="false">
-        Checkbox_Off
-      </panel.string>
-      <filter_editor
-      layout="topleft"
-      top="5"
-      left="5"
-      right="-5"
-      height="22"
-      search_button_visible="false"
-      follows="left|top|right"
-      label="Filter Abilities"
-      name="filter_input" />
-      <scroll_list
-       column_padding="0"
-       draw_stripes="true"
-       height="200"
-       follows="left|top|right"
-       layout="topleft"
-       left="0"
-       right="-1"
-       name="action_list"
-       search_column="2"
-       tool_tip="Select an Ability to view more details"
-       top_pad="5"
-       width="300">
-        <scroll_list.columns
-         label=""
-         name="icon"
-         width="2" />
-        <scroll_list.columns
-         label=""
-         name="checkbox"
-         width="20" />
-        <scroll_list.columns
-         label=""
-         name="action" />
-      </scroll_list>
+     mouse_opaque="false"
+     name="members_footer"
+     top="325"
+     visible="false">
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         top="8"
+         text_color="EmphasisColor"
+         name="static"
+         width="300">
+            Assigned Roles
+        </text>
+        <scroll_list
+         draw_stripes="true"
+         follows="left|top|right"
+         height="150"
+         layout="topleft"
+         left="0"
+         right="-1"
+         name="member_assigned_roles"
+         top_pad="0">
+            <scroll_list.columns
+             label=""
+             name="checkbox"
+             width="20" />
+            <scroll_list.columns
+             label=""
+             name="role"
+             width="270" />
+        </scroll_list>
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         top_pad="5"
+         text_color="EmphasisColor"
+         name="static2"
+         width="285">
+            Allowed Abilities
+        </text>
+        <scroll_list
+         draw_stripes="true"
+         follows="left|top|right"
+         height="150"
+         layout="topleft"
+         left="0"
+         right="-1"
+         name="member_allowed_actions"
+         search_column="2"
+         tool_tip="For details of each allowed ability see the abilities tab"
+         top_pad="0">
+            <scroll_list.columns
+             label=""
+             name="icon"
+             width="2" />
+            <scroll_list.columns
+             label=""
+             name="checkbox"
+             width="20" />
+            <scroll_list.columns
+             label=""
+             name="action"
+             width="270" />
+        </scroll_list>
     </panel>
     <panel
-     border="false"
-     height="303"
-     label="BANNED RESIDENTS"
+     height="90"
+     background_visible="false"
+     bg_alpha_color="FloaterUnfocusBorderColor"
      layout="topleft"
+     follows="top|left|right"
      left="0"
      right="-1"
-     help_topic="roles_banlist_tab"
-     name="banlist_sub_tab"
-     class="panel_group_banlist_subtab"
-     tool_tip="View the banned residents from this group."
-     width="310">
-      <panel.string
-       name="help_text">
-        Any resident on the ban list will be unable to join the group.
-      </panel.string>
-      <panel.string
-       name="ban_count_template">
-        Ban count: [COUNT]/[LIMIT]
-      </panel.string>
-      <name_list
-           column_padding="0"
-           draw_heading="true"
-           height="400"
-           follows="left|top|right"
-           layout="topleft"
-           left="0"
-           right="-1"
-           multi_select="true"
-           name="ban_list"
-           short_names="false"
-           top_pad="5">
-        <name_list.columns
-         label="Resident"
-         name="name"
-         font.name="SANSSERIF_SMALL"
-         font.style="NORMAL"
-         relative_width="0.7" />
-        <name_list.columns
-         label="Date Banned"
-         name="ban_date"
-         relative_width="0.3" />
-      </name_list>
-      <button
-        follows="top|left"
-        height="23"
-        label="Ban Resident(s)"
-        layout="topleft"
-        left="3"
-        name="ban_create"
-        tool_tip="Ban residents from your group"
-        width="120" />
-      <button
-        follows="top|left"
-        height="23"
-        label="Remove Ban(s)"
-        layout="topleft"
-        left_pad="5"
-        name="ban_delete"
-        tool_tip="Unban selected residents from your group"
-        width="120" />
-      <button
-        follows="top|left"
-        height="23"
-        width="23"
-        image_overlay="Refresh_Off"
-        layout="topleft"
-        left_pad="5"
-        name="ban_refresh"
-        tool_tip="Refresh the ban list"
-        />
-      <text
-        type="string"
-        height="18"
-        left_pad="5"
-        follows="top|left"
-        layout="topleft"
-        name="ban_count"
-        width="100">
-      </text>
+     mouse_opaque="false"
+     name="members_header"
+     top_pad="3"
+     visible="false">
+        <text_editor
+         bg_readonly_color="Transparent"
+         text_readonly_color="EmphasisColor"
+         font="SansSerifSmall"
+         type="string"
+         enabled="false"
+         halign="left"
+         layout="topleft"
+         top_pad="0"
+         follows="left|top|right"
+         left="0"
+         right="-1"
+         height="90"
+         max_length="512"
+         name="member_action_description"
+         word_wrap="true">
+            This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
+        </text_editor>
     </panel>
-  </tab_container>
-  <panel
-   height="350"
-   background_visible="false"
-   bg_alpha_color="FloaterUnfocusBorderColor"
-   layout="topleft"
-   follows="top|left|right"
-   left="0"
-   right="-1"
-   width="313"
-   mouse_opaque="false"
-   name="members_footer"
-   top="325"
-   visible="false">
-    <text
-     type="string"
-     height="16"
-     layout="topleft"
-     follows="left|top"
-     left="5"
-     top="8"
-     text_color="EmphasisColor"
-     name="static"
-     width="300">
-      Assigned Roles
-    </text>
-    <scroll_list
-     draw_stripes="true"
-    follows="left|top|right"
-     height="150"
+    <panel
+     height="460"
+     background_visible="false"
+     bg_alpha_color="FloaterUnfocusBorderColor"
      layout="topleft"
+     follows="top|left|right"
      left="0"
      right="-1"
-     name="member_assigned_roles"
-     top_pad="0">
-      <scroll_list.columns
-       label=""
-       name="checkbox"
-       width="20" />
-      <scroll_list.columns
-       label=""
-       name="role"
-       width="270" />
-    </scroll_list>
-    <text
-   type="string"
-   height="16"
-   layout="topleft"
-   follows="left|top"
-   left="5"
-   top_pad="5"
-   text_color="EmphasisColor"
-   name="static2"
-   width="285">
-      Allowed Abilities
-    </text>
-    <scroll_list
-     draw_stripes="true"
+     mouse_opaque="false"
+     name="roles_footer"
+     top_delta="0"
+     top="215"
+     visible="false">
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         top="5"
+         name="static"
+         width="300">
+            Role Name
+        </text>
+        <line_editor
+         type="string"
+         height="20"
+         layout="topleft"
+         left="0"
          follows="left|top|right"
-     height="150"
-     layout="topleft"
-     left="0"
-     right="-1"
-     name="member_allowed_actions"
-     search_column="2"
-     tool_tip="For details of each allowed ability see the abilities tab"
-     top_pad="0">
-      <scroll_list.columns
-       label=""
-       name="icon"
-       width="2" />
-      <scroll_list.columns
-       label=""
-       name="checkbox"
-       width="20" />
-      <scroll_list.columns
-       label=""
-       name="action"
-       width="270" />
-    </scroll_list>
-  </panel>
-  <panel
-   height="90"
-   background_visible="false"
-   bg_alpha_color="FloaterUnfocusBorderColor"
-   layout="topleft"
-   follows="top|left|right"
-   left="0"
-   right="-1"
-   width="313"
-   mouse_opaque="false"
-   name="members_header"
-   top_pad="3"
-   visible="false">
-    <text_editor
-     bg_readonly_color="Transparent"
-     text_readonly_color="EmphasisColor"
-     font="SansSerifSmall"
-     type="string"
-     enabled="false"
-     halign="left"
-     layout="topleft"
-     top_pad="0"
-     follows="left|top|right"
-     left="0"
-     right="-1"
-     height="90"
-     max_length="512"
-     name="member_action_description"
-     word_wrap="true">
-      This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
-   </text_editor>
-  </panel>
-  <panel
-   height="460"
-   background_visible="false"
-   bg_alpha_color="FloaterUnfocusBorderColor"
-   layout="topleft"
-   follows="top|left|right"
-   left="0"
-   right="-1"
-   width="313"
-   mouse_opaque="false"
-   name="roles_footer"
-   top_delta="0"
-   top="209"
-   visible="false">
-    <text
-     type="string"
-     height="16"
-     layout="topleft"
-     follows="left|top"
-     left="5"
-     top="5"
-     name="static"
-     width="300">
-      Role Name
-    </text>
-    <line_editor
-     type="string"
-     height="20"
-     layout="topleft"
-     left="0"
-     follows="left|top|right"
-     right="-1"
-     max_length_bytes="20"
-     name="role_name"
-     top_pad="0"
-     width="300">
-    </line_editor>
-    <text
-     type="string"
-     height="16"
-     layout="topleft"
-     follows="left|top"
-     left="5"
-     name="static3"
-     top_pad="5"
-     width="300">
-      Role Title
-    </text>
-    <line_editor
-     type="string"
-     height="20"
-     layout="topleft"
-     left="0"
-     follows="left|top|right"
-     right="-1"
-     max_length_bytes="20"
-     name="role_title"
-     top_pad="0"
-     width="300">
-    </line_editor>
-    <text
+         right="-1"
+         max_length_bytes="20"
+         name="role_name"
+         top_pad="0">
+        </line_editor>
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         name="static3"
+         top_pad="5"
+         width="300">
+            Role Title
+        </text>
+        <line_editor
+         type="string"
+         height="20"
+         layout="topleft"
+         left="0"
+         follows="left|top|right"
+         right="-1"
+         max_length_bytes="20"
+         name="role_title"
+         top_pad="0">
+        </line_editor>
+        <text
          type="string"
          height="16"
          layout="topleft"
@@ -558,192 +530,185 @@ clicking on their names.
          name="static2"
          top_pad="5"
          width="200">
-      Description
-    </text>
-    <text_editor
-     type="string"
-     layout="topleft"
-     left="0"
-     follows="left|top|right"
-     right="-1"
-     max_length="295"
-     height="35"
-     name="role_description"
-     top_pad="0"
-     width="300"
-     word_wrap="true">
-    </text_editor>
-    <text
-     type="string"
-     height="16"
-     layout="topleft"
-     follows="left|top"
-     left="5"
-     text_color="EmphasisColor"
-     name="static4"
-     top_pad="5"
-     width="300">
-      Assigned Members
-    </text>
-    <name_list
-     draw_stripes="true"
-     height="128"
-     layout="topleft"
-     left="0"
-     follows="left|top|right"
-     right="-1"
-     name="role_assigned_members"
-     top_pad="0"
-     width="300" />
-    <check_box
-     height="15"
-     label="Reveal members"
-     left="5"
-     layout="topleft"
-     name="role_visible_in_list"
-     tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group."
-     top_pad="4"
-     width="300" />
-    <text
-    type="string"
-    height="16"
-    layout="topleft"
-    follows="left|top"
-    left="5"
-    text_color="EmphasisColor"
-    name="static5"
-    top_pad="2"
-    width="300">
-      Allowed Abilities
-    </text>
-    <scroll_list
-     draw_stripes="true"
-     height="140"
-     layout="topleft"
-     left="0"
-     follows="left|top|right"
-     right="-1"
-     name="role_allowed_actions"
-     search_column="2"
-     tool_tip="For details of each allowed ability see the abilities tab"
-     top_pad="0"
-     width="300">
-      <scroll_list.columns
-       label=""
-       name="icon"
-       width="2" />
-      <scroll_list.columns
-       label=""
-       name="checkbox"
-       width="20" />
-      <scroll_list.columns
-       label=""
-       name="action" />
-    </scroll_list>
-  </panel>
-  <panel
-   height="90"
-   background_visible="false"
-   bg_alpha_color="FloaterUnfocusBorderColor"
-   layout="topleft"
-   follows="top|left|right"
-   left="0"
-   right="-1"
-   width="313"
-   mouse_opaque="false"
-   name="roles_header"
-   top_pad="3"
-   visible="false">
-    <text_editor
-     bg_readonly_color="Transparent"
-     text_readonly_color="EmphasisColor"
-     font="SansSerifSmall"
-     type="string"
-     enabled="false"
-     halign="left"
-     layout="topleft"
-     top_pad="0"
-     follows="left|top|right"
-     left="0"
-     right="-1"
+            Description
+        </text>
+        <text_editor
+         type="string"
+         layout="topleft"
+         left="0"
+         follows="left|top|right"
+         right="-1"
+         max_length="295"
+         height="35"
+         name="role_description"
+         top_pad="0"
+         word_wrap="true">
+        </text_editor>
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         text_color="EmphasisColor"
+         name="static4"
+         top_pad="5"
+         width="300">
+            Assigned Members
+        </text>
+        <name_list
+         draw_stripes="true"
+         height="128"
+         layout="topleft"
+         left="0"
+         follows="left|top|right"
+         right="-1"
+         name="role_assigned_members"
+         top_pad="0" />
+        <check_box
+         height="15"
+         label="Reveal members"
+         left="5"
+         layout="topleft"
+         name="role_visible_in_list"
+         tool_tip="Sets whether members of this role are visible in the General tab to people outside of the group."
+         top_pad="4"
+         width="300" />
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         text_color="EmphasisColor"
+         name="static5"
+         top_pad="2"
+         width="300">
+            Allowed Abilities
+        </text>
+        <scroll_list
+         draw_stripes="true"
+         height="140"
+         layout="topleft"
+         left="0"
+         follows="left|top|right"
+         right="-1"
+         name="role_allowed_actions"
+         search_column="2"
+         tool_tip="For details of each allowed ability see the abilities tab"
+         top_pad="0">
+          <scroll_list.columns
+           label=""
+           name="icon"
+           width="2" />
+          <scroll_list.columns
+           label=""
+           name="checkbox"
+           width="20" />
+          <scroll_list.columns
+           label=""
+           name="action" />
+        </scroll_list>
+    </panel>
+    <panel
      height="90"
-     max_length="512"
-     name="role_action_description"
-     word_wrap="true">
-      This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
-    </text_editor>
-  </panel>
-  <panel
-    height="424"
-    background_visible="false"
-    bg_alpha_color="FloaterUnfocusBorderColor"
-    layout="topleft"
-    follows="top|left|right"
-    left="0"
-    right="-1"
-    width="313"
-    mouse_opaque="false"
-    name="actions_footer"
-    top_delta="0"
-    top="255"
-    visible="false">
-    <text_editor
-   bg_readonly_color="Transparent"
-   text_readonly_color="EmphasisColor"
-   font="SansSerifSmall"
-     type="string"
-     enabled="false"
-     halign="left"
+     background_visible="false"
+     bg_alpha_color="FloaterUnfocusBorderColor"
      layout="topleft"
-     follows="left|top|right"
+     follows="top|left|right"
      left="0"
      right="-1"
-     height="90"
-     max_length="512"
-     name="action_description"
-     top="0"
-     word_wrap="true">
-      This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
-    </text_editor>
-    <text
-     type="string"
-     height="16"
-     layout="topleft"
-     follows="left|top"
-     left="5"
-     name="static2"
-     top_pad="1"
-     width="300">
-      Roles with this ability
-    </text>
-    <scroll_list
-     height="172"
-     layout="topleft"
-     follows="left|top|right"
-     left="5"
-     right="-1"
-     name="action_roles"
-     top_pad="0"
-     width="300" />
-    <text
-     type="string"
-     height="16"
-     layout="topleft"
-     follows="left|top"
-     left="5"
-     name="static3"
-     top_pad="5"
-     width="300">
-      Members with this ability
-    </text>
-    <name_list
-     height="122"
-     follows="left|top|right"
+     mouse_opaque="false"
+     name="roles_header"
+     top_pad="3"
+     visible="false">
+        <text_editor
+         bg_readonly_color="Transparent"
+         text_readonly_color="EmphasisColor"
+         font="SansSerifSmall"
+         type="string"
+         enabled="false"
+         halign="left"
+         layout="topleft"
+         top_pad="0"
+         follows="left|top|right"
+         left="0"
+         right="-1"
+         height="90"
+         max_length="512"
+         name="role_action_description"
+         word_wrap="true">
+            This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
+        </text_editor>
+    </panel>
+    <panel
+     height="513"
+     background_visible="false"
+     bg_alpha_color="FloaterUnfocusBorderColor"
      layout="topleft"
-     left="5"
+     follows="top|left|right"
+     left="0"
      right="-1"
-     name="action_members"
-     top_pad="0"
-     width="300" />
-  </panel>
+     mouse_opaque="false"
+     name="actions_footer"
+     top_delta="0"
+     top="255"
+     visible="false">
+        <text_editor
+         bg_readonly_color="Transparent"
+         text_readonly_color="EmphasisColor"
+         font="SansSerifSmall"
+         type="string"
+         enabled="false"
+         halign="left"
+         layout="topleft"
+         follows="left|top|right"
+         left="0"
+         right="-1"
+         height="90"
+         max_length="512"
+         name="action_description"
+         top="0"
+         word_wrap="true">
+            This Ability is &apos;Eject Members from this Group&apos;. Only an Owner can eject another Owner.
+        </text_editor>
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         name="static2"
+         top_pad="1"
+         width="300">
+            Roles with this ability
+        </text>
+        <scroll_list
+         height="216"
+         layout="topleft"
+         follows="left|top|right"
+         left="5"
+         right="-1"
+         name="action_roles"
+         top_pad="0" />
+        <text
+         type="string"
+         height="16"
+         layout="topleft"
+         follows="left|top"
+         left="5"
+         name="static3"
+         top_pad="5"
+         width="300">
+            Members with this ability
+        </text>
+        <name_list
+         height="167"
+         follows="left|top|right"
+         layout="topleft"
+         left="5"
+         right="-1"
+         name="action_members"
+         top_pad="0" />
+    </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index e25145dd2a..9cb64e7a13 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -40,6 +40,10 @@
         Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.
     </string>
     <string
+     name="acquired_date_ampm">
+        [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt] [year,datetime,slt]
+    </string>
+    <string
      name="acquired_date">
         [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt]
     </string>
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 9aa0907a38..66cd1cacf1 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -89,6 +89,10 @@
         Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.
     </string>
     <string
+     name="acquired_date_ampm">
+        [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour12,datetime,local]:[min,datetime,local]:[second,datetime,local] [ampm,datetime,local] [year,datetime,local]
+    </string>
+    <string
      name="acquired_date">
         [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
     </string>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 101c506309..ddddb4855f 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -91,6 +91,37 @@
          name="Traditional Chinese"
          value="zh" />
     </combo_box>
+   <text
+     type="string"
+     length="1"
+     follows="left|top"
+     height="15"
+     layout="topleft"
+     left="255"
+     name="time_format_textbox"
+     top="10"
+     width="200">
+        Time Format:
+    </text>
+    <combo_box
+     follows="left|top"
+     height="23"
+     layout="topleft"
+     left="255"
+     max_chars="135"
+     name="time_format_combobox"
+     width="70">
+        <combo_box.item
+         enabled="true"
+         label="1:00 AM"
+         name="12H"
+         value="0" />
+        <combo_box.item
+         enabled="true"
+         label="13:00"
+         name="24H"
+         value="1" />
+    </combo_box>
     <text
  font="SansSerifSmall"
      type="string"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 395efe3169..b3fdc42933 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -202,9 +202,43 @@
    height="10"
    layout="topleft"
    left="86"
-   name="single_click_action_lbl"
+   name="mouse_warp_lbl"
    width="150"
    top_pad="20">
+    Mouse Warp:
+  </text>
+  <combo_box
+   control_name="MouseWarpMode"
+   height="23"
+   layout="topleft"
+   left_pad="10"
+   top_delta="-6"
+   name="mouse_warp_combo"
+   tooltip="Controls warping of the mouse to the center of the screen during alt-zoom and mouse look."
+   width="200">
+    <combo_box.item
+     label="Automatic"
+     name="0"
+     value="0"/>
+    <combo_box.item
+     label="On"
+     name="1"
+     value="1"/>
+    <combo_box.item
+     label="Off"
+     name="2"
+     value="2"/>
+  </combo_box>
+  <text
+   follows="left|top"
+   type="string"
+   length="1"
+   height="10"
+   layout="topleft"
+   left="86"
+   name="single_click_action_lbl"
+   width="150"
+   top_pad="12">
     Single click on land:
   </text>
   <combo_box
diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index 6554dd0952..831b631505 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -22,7 +22,6 @@
     <profile_image
      name="real_world_pic"
      image_name="Generic_Person_Large"
-     show_loading="false"
      follows="top|left"
      layout="topleft"
      top="10"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index e361a0f28c..4d4c7f2252 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -74,7 +74,6 @@ Account: [ACCTTYPE]
       <profile_image
        name="2nd_life_pic"
        image_name="Generic_Person_Large"
-       show_loading="false"
        layout="topleft"
        follows="all"
        interactable="true"
@@ -191,7 +190,7 @@ Account: [ACCTTYPE]
      visible="false">
       <icon
        name="badge_icon"
-       image_name="Beta_Tester"
+       image_name="Profile_Badge_Beta"
        layout="topleft"
        follows="left|top"
        top="10"
diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml
index 7598f7d7e5..b858d0ed02 100644
--- a/indra/newview/skins/default/xui/en/panel_sound_devices.xml
+++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml
@@ -20,6 +20,10 @@
      name="name_default_system_device">
         Default System Device
     </string>
+    <string
+     name="device_not_loaded">
+        Device not loaded
+    </string>
     <icon
      follows="left|top"
      height="18"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
index 1cb3eca2eb..40a88d4121 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml
@@ -32,6 +32,10 @@
     Owner can:
   </panel.string>
   <panel.string
+    name="acquiredDateAMPM">
+    [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour12,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [ampm,datetime,slt] [year,datetime,slt]
+  </panel.string>
+  <panel.string
     name="acquiredDate">
     [wkday,datetime,slt] [mth,datetime,slt] [day,datetime,slt] [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt] [year,datetime,slt]
   </panel.string>
diff --git a/indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml b/indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml
index 83f204648d..db833e2c8e 100644
--- a/indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml
+++ b/indra/newview/skins/default/xui/ja/control_table_contents_columns_basic.xml
@@ -2,6 +2,6 @@
 <contents>
 	<columns label="アクション" name="lst_action"/>
 	<columns label="優先コントロール" name="lst_ctrl1"/>
-	<columns label="代�り１" name="lst_ctrl2"/>
-	<columns label="代�り２" name="lst_ctrl3"/>
+	<columns label="代替1" name="lst_ctrl2"/>
+	<columns label="代替2" name="lst_ctrl3"/>
 </contents>
diff --git a/indra/newview/skins/default/xui/ja/floater_360capture.xml b/indra/newview/skins/default/xui/ja/floater_360capture.xml
index d0a6eef0e0..4199327e88 100644
--- a/indra/newview/skins/default/xui/ja/floater_360capture.xml
+++ b/indra/newview/skins/default/xui/ja/floater_360capture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="360capture" title="３６�度Ｓショット">
+<floater name="360capture" title="360度スナップショット">
 	<panel name="ui_panel_left">
 		<text name="quality_level_label">
 			�質
@@ -11,7 +11,7 @@
 			<radio_item label="最高��" name="maximum_quality" value="2048" tool_tip="最高�質"/>
 		</radio_group>
 		<check_box label="ア�ターを���隠�" name="360_hide_avatar"/>
-		<button label="３６�度画�を作�" name="capture_button"/>
+		<button label="360度画�を作�" name="capture_button"/>
 		<button label="��を����存…" name="save_local_button"/>
 	</panel>
 	<panel name="ui_panel_right">
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index 7da5f41f90..ed057704fe 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -45,7 +45,7 @@
 				[AREA]㎡
 			</panel.string>
 			<panel.string name="auction_id_text">
-				オークションＩＤ：[ID]
+				オークションID：[ID]
 			</panel.string>
 			<panel.string name="need_tier_to_modify">
 				��土地を修正変更�る���購入を承��る必���り��。
@@ -72,7 +72,7 @@
 				区画��択�れ����ん。
 			</panel.string>
 			<panel.string name="time_stamp_template">
-				[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]
+				[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
 			</panel.string>
 			<text name="Name:">
 				��：
@@ -85,7 +85,7 @@
 				種類：
 			</text>
 			<text name="LandTypeText">
-				メインランド�入�地
+				メインランド / ホームステッド
 			</text>
 			<text name="ContentRating">
 				区分：
@@ -136,7 +136,7 @@
 				4048m²
 			</text>
 			<text name="Traffic:">
-				トラフィック：
+				交通�：
 			</text>
 			<text name="DwellText">
 				読�込ん����…
@@ -178,7 +178,7 @@
 				���動産��約款��り��ん。
 			</text_editor>
 			<text name="covenant_timestamp_text">
-				最後更新：1969年12月31日水曜日　16：00：00
+				最後更新：1969年12月31日水曜日 16:00:00
 			</text>
 			<text font="SansSerifLarge" name="region_section_lbl">
 				地域：
@@ -190,7 +190,7 @@
 				種類：
 			</text>
 			<text name="region_landtype_text">
-				メインランド�入�地
+				メインランド / ホームステッド
 			</text>
 			<text name="region_maturity_lbl">
 				区分：
@@ -270,7 +270,7 @@
 				[COUNT]個
 			</text>
 			<text name="Autoreturn">
-				他者�オブジェクト�自動返�（分�����自動返���）：
+				他者�オブジェクト�自動返�（分���0�自動返���）：
 			</text>
 			<line_editor name="clean other time"/>
 			<text name="Object Owners:">
@@ -291,7 +291,7 @@
 				��区画を検索�果�表示�る
 			</panel.string>
 			<panel.string name="search_disabled_small_tooltip">
-				区画���１２８㎡未満������オプション�無効��。
+				区画���128㎡未満������オプション�無効��。
 大��区画��検索�表示��る����能��。
 			</panel.string>
 			<panel.string name="search_disabled_permissions_tooltip">
@@ -385,7 +385,7 @@
 			<text name="with media:">
 				種類：
 			</text>
-			<combo_box name="media type" tool_tip="動画や�Webページ���他�メディア�ＵＲＬを指定���。"/>
+			<combo_box name="media type" tool_tip="動画や�Webページ���他�メディア�URLを指定���。"/>
 			<text name="at URL:">
 				ホームページ：
 			</text>
@@ -402,11 +402,11 @@
 				��テクス�ャを使用�るオブジェクト�「�生�をクリック�る��動画やWebページを表示���。テクス�ャを変更�る��サム�イルを�択������。
 			</text>
 			<check_box label="スケールを自動設定" name="media_auto_scale" tool_tip="��オプションを�ェック�る����区画�コンテンツ�スケール�自動的�設定�れ��。動作速度�画質�少�低下�る����り����他�テクス�ャ�スケーリングや整列�必���る����り��ん。"/>
-			<text name="media_size" tool_tip="レンダリング�るWebメディア�サイズ��。デフォルト���������。">
+			<text name="media_size" tool_tip="レンダリング�るWebメディア�サイズ��。デフォルト�0�������。">
 				サイズ：
 			</text>
-			<spinner name="media_size_width" tool_tip="レンダリング�るWebメディア�サイズ��。デフォルト���������。"/>
-			<spinner name="media_size_height" tool_tip="レンダリング�るWebメディア�サイズ��。デフォルト���������。"/>
+			<spinner name="media_size_width" tool_tip="レンダリング�るWebメディア�サイズ��。デフォルト�0�������。"/>
+			<spinner name="media_size_height" tool_tip="レンダリング�るWebメディア�サイズ��。デフォルト�0�������。"/>
 			<text name="pixels">
 				ピクセル
 			</text>
@@ -417,7 +417,7 @@
 		</panel>
 		<panel label="サウンド" name="land_audio_panel">
 			<text name="MusicURL:">
-				音楽ＵＲＬ：
+				音楽URL：
 			</text>
 			<text name="Sound:">
 				サウンド：
@@ -443,7 +443,7 @@
 				１�以上�オプション���動産レベル�設定�れ����。
 			</panel.string>
 			<check_box label="誰�も訪��（��オプションをオフ��る�立入�止ライン�作��れ��）" name="public_access"/>
-			<check_box label="１８歳以上��る必���り��。[ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="��区画�アクセス�る���１８歳以上���れ��り��ん。詳細��������[SUPPORT_SITE]を�覧��������。"/>
+			<check_box label="18歳以上��る必���り��。[ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="��区画�アクセス�る���18歳以上���れ��り��ん。詳細��������[SUPPORT_SITE]を�覧��������。"/>
 			<check_box label="支払情報�登録�れ��る必���り��。[ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="アカウント�支払情報�登録�れ����場����区画�アクセス�る�������ん。詳細��������[SUPPORT_SITE]を�覧��������。"/>
 			<check_box label="制約���グループ[GROUP]を許��る。" name="GroupCheck" tool_tip="「一般�タブ��グループを�択������。"/>
 			<check_box label="入場許�を販売：" name="PassCheck" tool_tip="��区画��一時的�アクセスを許����。"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml b/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
index fb2cd37cc3..b420bf7d20 100644
--- a/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
+++ b/indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
@@ -5,7 +5,7 @@
 	</floater.string>
 	<panel label="wrapper_panel" name="wrapper_panel">
 		<text name="title_txt">
-			支払�方法を登録��リンデンドルを購入��Second Lifeをも��楽����ょ�。
+			支払�方法を追加��リンデンドルを購入��Second Lifeをも��楽����ょ�。
 		</text>
 		<button label="始���ょ�" name="continue_btn"/>
 		<button label="��後�"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
index 5de3486ea1..a4909c18fd 100644
--- a/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
@@ -6,13 +6,13 @@
 	<scroll_container name="profile_scroll">
 		<panel name="scroll_content_panel">
 			<text name="label">
-				ベークド
+				ベイク済�
 テクス�ャ
 			</text>
 			<text name="composite_label">
 				��テクス�ャ
 			</text>
-			<button label="ＩＤをコンソール�ダンプ" label_selected="ダンプ" name="Dump"/>
+			<button label="IDをコンソール�ダンプ" label_selected="ダンプ" name="Dump"/>
 			<panel name="scroll_content_panel2">
 				<texture_picker label="髪" name="hair-baked"/>
 				<texture_picker label="髪" name="hair_grain"/>
@@ -53,12 +53,12 @@
 				<texture_picker label="左腕�タトゥ" name="leftarm_tattoo"/>
 				<texture_picker label="左足" name="leftleg-baked"/>
 				<texture_picker label="左足�タトゥ" name="leftleg_tattoo"/>
-				<texture_picker label="予備１" name="aux1-baked"/>
-				<texture_picker label="予備１タトゥ" name="aux1_tattoo"/>
-				<texture_picker label="予備２" name="aux2-baked"/>
-				<texture_picker label="予備２タトゥ" name="aux2_tattoo"/>
-				<texture_picker label="予備３" name="aux3-baked"/>
-				<texture_picker label="予備３タトゥ" name="aux3_tattoo"/>
+				<texture_picker label="予備1" name="aux1-baked"/>
+				<texture_picker label="予備1タトゥ" name="aux1_tattoo"/>
+				<texture_picker label="予備2" name="aux2-baked"/>
+				<texture_picker label="予備2タトゥ" name="aux2_tattoo"/>
+				<texture_picker label="予備3" name="aux3-baked"/>
+				<texture_picker label="予備3タトゥ" name="aux3_tattoo"/>
 			</panel>
 		</panel>
 	</scroll_container>
diff --git a/indra/newview/skins/default/xui/ja/floater_bumps.xml b/indra/newview/skins/default/xui/ja/floater_bumps.xml
index 8cd9c0cff9..c48296fa8f 100644
--- a/indra/newview/skins/default/xui/ja/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bumps.xml
@@ -4,21 +4,21 @@
 		検出��
 	</floater.string>
 	<floater.string name="bump">
-		[TIME]　[NAME]�����������。
+		[TIME]  [NAME]�����������。
 	</floater.string>
 	<floater.string name="llpushobject">
-		[TIME]　[NAME]�スクリプト����を押����。
+		[TIME]  [NAME]�スクリプト����を押����。
 	</floater.string>
 	<floater.string name="selected_object_collide">
-		[TIME]　[NAME]��オブジェクト����を�����。
+		[TIME]  [NAME]��オブジェクト����を�����。
 	</floater.string>
 	<floater.string name="scripted_object_collide">
-		[TIME]　[NAME]��スクリプト�オブジェクト����を�����。
+		[TIME]  [NAME]��スクリプト�オブジェクト����を�����。
 	</floater.string>
 	<floater.string name="physical_object_collide">
-		[TIME]　[NAME]��物�オブジェクト����を�����。
+		[TIME]  [NAME]��物�オブジェクト����を�����。
 	</floater.string>
 	<floater.string name="timeStr">
-		[[hour,datetime,slt]：[min,datetime,slt]：[second,datetime,slt]]
+		[[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
 	</floater.string>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
index f75564cd4c..a72836bbbc 100644
--- a/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml
@@ -13,7 +13,7 @@
 		自分�作���デイサイクルを編集�る���希望�設定�調節���「�存�をクリック���。
 	</string>
 	<string name="time_label">
-		（[HH]：[MM]）
+		（[HH]:[MM]）
 	</string>
 	<string name="sky_track_label">
 		空[ALT]
@@ -42,9 +42,9 @@
 			<layout_stack name="content_stack">
 				<layout_panel name="timeline_track_selection">
 					<panel name="timeline_layers">
-						<button label="空４" name="sky4_track"/>
-						<button label="空３" name="sky3_track"/>
-						<button label="空２" name="sky2_track"/>
+						<button label="空4" name="sky4_track"/>
+						<button label="空3" name="sky3_track"/>
+						<button label="空2" name="sky2_track"/>
 						<button label="地�" name="sky1_track"/>
 						<button label="水�" name="water_track"/>
 					</panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_god_tools.xml b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
index 3c96e2e340..d82be80c95 100644
--- a/indra/newview/skins/default/xui/ja/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_god_tools.xml
@@ -20,17 +20,17 @@
 			<button label="地形を元�戻�" label_selected="地形を元�戻�" name="Revert Terrain" tool_tip="�在�地形をデフォルト�置����。"/>
 			<button label="地形を交�" label_selected="地形を交�" name="Swap Terrain" tool_tip="�在�地形をデフォルト�入れ替���。"/>
 			<text name="estate id">
-				�動産ＩＤ：
+				�動産ID：
 			</text>
 			<text name="parent id">
-				親ＩＤ：
+				親ID：
 			</text>
 			<line_editor name="parentestate" tool_tip="�れ����リージョン（地域）�親�動産��。"/>
 			<text name="Grid Pos: ">
 				グリッド�置：
 			</text>
-			<line_editor name="gridposx" tool_tip="�れ����リージョン（地域）�グリッドＸ座標��。"/>
-			<line_editor name="gridposy" tool_tip="�れ����リージョン（地域）�グリッドＹ座標��。"/>
+			<line_editor name="gridposx" tool_tip="�れ����リージョン（地域）�グリッドX座標��。"/>
+			<line_editor name="gridposy" tool_tip="�れ����リージョン（地域）�グリッドY座標��。"/>
 			<text name="Redirect to Grid: ">
 				グリッド�リダイレクト：
 			</text>
@@ -85,7 +85,7 @@
 				<combo_box.item label="コライダー＜ステップ＞" name="item1"/>
 				<combo_box.item label="スクリプト＜回数＞�＜オプション・パターン＞" name="item2"/>
 				<combo_box.item label="オブジェクト＜パターン＞" name="item3"/>
-				<combo_box.item label="rez ＜アセットＩＤ＞" name="item4"/>
+				<combo_box.item label="rez ＜アセットID＞" name="item4"/>
 			</combo_box>
 			<text name="Parameter:">
 				パラメーター：
diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
index 319db34879..5b09d2da53 100644
--- a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
@@ -4,7 +4,7 @@
 		5
 	</floater.string>
 	<floater.string name="localchat">
-		近隣�ボイス�ャット
+		近��ボイス�ャット
 	</floater.string>
 	<floater.string name="anonymous">
 		匿�ユーザー
diff --git a/indra/newview/skins/default/xui/ja/floater_inspect.xml b/indra/newview/skins/default/xui/ja/floater_inspect.xml
index fca7b2eab8..0a859f9142 100644
--- a/indra/newview/skins/default/xui/ja/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inspect.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="inspect" title="オブジェクト�調査">
 	<floater.string name="timeStamp">
-		[year,datetime,slt]年[mth,datetime,slt]月[day,datetime,slt]日（[wkday,datetime,slt]）　[hour,datetime,slt]：[min,datetime,slt]：[second,datetime,slt]
+		[year,datetime,slt]年[mth,datetime,slt]月[day,datetime,slt]日（[wkday,datetime,slt]） [hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]
 	</floater.string>
 	<scroll_list name="object_list" tool_tip="��リスト�らオブジェクトを�択���インワールド��イライト���。">
 		<scroll_list.columns label="オブジェクト�" name="object_name"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_joystick.xml b/indra/newview/skins/default/xui/ja/floater_joystick.xml
index 559ecee5a8..0d3f0992a2 100644
--- a/indra/newview/skins/default/xui/ja/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/ja/floater_joystick.xml
@@ -6,9 +6,9 @@
 	<text name="joystick_lbl">
 		ジョイスティック：
 	</text>
-	<spinner label="Ｘ軸マッピング" name="JoystickAxis1"/>
-	<spinner label="Ｙ軸マッピング" name="JoystickAxis2"/>
-	<spinner label="Ｚ軸マッピング" name="JoystickAxis0"/>
+	<spinner label="X軸マッピング" name="JoystickAxis1"/>
+	<spinner label="Y軸マッピング" name="JoystickAxis2"/>
+	<spinner label="Z軸マッピング" name="JoystickAxis0"/>
 	<spinner label="ピッ�・マッピング" name="JoystickAxis4"/>
 	<spinner label="ヨー・マッピング" name="JoystickAxis5"/>
 	<spinner label="ロール・マッピング" name="JoystickAxis3"/>
@@ -23,19 +23,19 @@
 	<check_box label="造る" name="JoystickBuildEnabled"/>
 	<check_box label="フライ・カメラ" name="JoystickFlycamEnabled"/>
 	<text name="XScale">
-		Ｘスケール
+		Xスケール
 	</text>
 	<spinner name="AvatarAxisScale1"/>
 	<spinner name="BuildAxisScale1"/>
 	<spinner name="FlycamAxisScale1"/>
 	<text name="YScale">
-		Ｙスケール
+		Yスケール
 	</text>
 	<spinner name="AvatarAxisScale2"/>
 	<spinner name="BuildAxisScale2"/>
 	<spinner name="FlycamAxisScale2"/>
 	<text name="ZScale">
-		Ｚスケール
+		Zスケール
 	</text>
 	<spinner name="AvatarAxisScale0"/>
 	<spinner name="BuildAxisScale0"/>
@@ -58,19 +58,19 @@
 	<spinner name="BuildAxisScale3"/>
 	<spinner name="FlycamAxisScale3"/>
 	<text name="XDeadZone">
-		Ｘデッド・ゾーン
+		Xデッド・ゾーン
 	</text>
 	<spinner name="AvatarAxisDeadZone1"/>
 	<spinner name="BuildAxisDeadZone1"/>
 	<spinner name="FlycamAxisDeadZone1"/>
 	<text name="YDeadZone">
-		Ｙデッド・ゾーン
+		Yデッド・ゾーン
 	</text>
 	<spinner name="AvatarAxisDeadZone2"/>
 	<spinner name="BuildAxisDeadZone2"/>
 	<spinner name="FlycamAxisDeadZone2"/>
 	<text name="ZDeadZone">
-		Ｚデッド・ゾーン
+		Zデッド・ゾーン
 	</text>
 	<spinner name="AvatarAxisDeadZone0"/>
 	<spinner name="BuildAxisDeadZone0"/>
@@ -110,12 +110,12 @@
 	<button label="ＯＫ" label_selected="ＯＫ" name="ok_btn"/>
 	<button label="キャンセル" label_selected="キャンセル" name="cancel_btn"/>
 	<stat_view label="ジョイスティック・モニター" name="axis_view">
-		<stat_bar label="軸�" name="axis0"/>
-		<stat_bar label="軸１" name="axis1"/>
-		<stat_bar label="軸２" name="axis2"/>
-		<stat_bar label="軸３" name="axis3"/>
-		<stat_bar label="軸４" name="axis4"/>
-		<stat_bar label="軸５" name="axis5"/>
+		<stat_bar label="軸0" name="axis0"/>
+		<stat_bar label="軸1" name="axis1"/>
+		<stat_bar label="軸2" name="axis2"/>
+		<stat_bar label="軸3" name="axis3"/>
+		<stat_bar label="軸4" name="axis4"/>
+		<stat_bar label="軸5" name="axis5"/>
 	</stat_view>
 	<string name="NoDevice">
 		デ�イス�検出�れ��ん���。
diff --git a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
index e7830bbd25..67b4e29e45 100644
--- a/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lagmeter.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_lagmeter" title="ラグメーター">
 	<floater.string name="max_title_msg">
-		�延計測器
+		ラグメーター
 	</floater.string>
 	<floater.string name="max_width_px">
 		360
diff --git a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
index 31009cb2e0..cd32fac8ac 100644
--- a/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_land_holdings.xml
@@ -17,13 +17,13 @@
 		<column label="��" name="area"/>
 	</scroll_list>
 	<text name="allowed_label">
-		�在�支払�プラン�利用�能�入�地：
+		�在�支払�プラン�所有�能�土地:
 	</text>
 	<text name="allowed_text">
 		[AREA]㎡
 	</text>
 	<text name="current_label">
-		�在��有地：
+		�在所有���る土地:
 	</text>
 	<text name="current_text">
 		[AREA]㎡
diff --git a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
index 4bb370f6ea..f362bff2bd 100644
--- a/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/ja/floater_lsl_guide.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="script ed float" title="ＬＳＬレファレンス">
+<floater name="script ed float" title="LSLレファレンス">
 	<check_box label="カーソルを追�" name="lock_check"/>
 	<combo_box label="ロック" name="history_combo"/>
 	<button label="戻る" name="back_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
index 69629f357f..123421a97d 100644
--- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
@@ -233,7 +233,7 @@
 			</panel>
 			<panel label="アップロード�オプション" name="modifiers_panel">
 				<text name="scale_label">
-					スケール（１�増減��）：
+					スケール（1�増減��）：
 				</text>
 				<spinner name="import_scale" value="1.0"/>
 				<text name="dimensions_label">
@@ -250,7 +250,7 @@
 				<check_box label="ジョイント�置を�む" name="upload_joints"/>
 				<check_box label="ジョイント�置�定義�れ��る場��スケールをロック" name="lock_scale_if_joint_position"/>
 				<text name="pelvis_offset_label">
-					Ｚオフセット（ア�ターを上下調整）：
+					Zオフセット（ア�ターを上下調整）：
 				</text>
 				<spinner name="pelvis_offset" value="0.0"/>
 			</panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
index d74b714b1a..35f4cd3ca3 100644
--- a/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_outgoing_call.xml
@@ -4,7 +4,7 @@
 		5
 	</floater.string>
 	<floater.string name="localchat">
-		近隣�ボイス�ャット
+		近��ボイス�ャット
 	</floater.string>
 	<floater.string name="anonymous">
 		匿�ユーザー
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
index 00742aef23..092b564455 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
@@ -32,7 +32,7 @@
 			<scroll_list.columns label="��" name="name"/>
 			<scroll_list.columns label="説明" name="description"/>
 			<scroll_list.columns label="所有者" name="owner"/>
-			<scroll_list.columns label="ＣＰＵ" name="cpu_time"/>
+			<scroll_list.columns label="CPU" name="cpu_time"/>
 			<scroll_list.columns label="高度" name="altitude"/>
 		</scroll_list>
 		<text name="messaging_status">
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
index 218fade27b..72d9f4b44a 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
@@ -89,17 +89,17 @@
 			</text>
 			<combo_box name="show_heatmap_mode">
 				<combo_box.item label="表示���" name="show_heatmap_mode_none"/>
-				<combo_box.item label="キャラクタータイプＡ" name="show_heatmap_mode_a"/>
-				<combo_box.item label="キャラクタータイプＢ" name="show_heatmap_mode_b"/>
-				<combo_box.item label="キャラクタータイプＣ" name="show_heatmap_mode_c"/>
-				<combo_box.item label="キャラクタータイプＤ" name="show_heatmap_mode_d"/>
+				<combo_box.item label="キャラクタータイプA" name="show_heatmap_mode_a"/>
+				<combo_box.item label="キャラクタータイプB" name="show_heatmap_mode_b"/>
+				<combo_box.item label="キャラクタータイプC" name="show_heatmap_mode_c"/>
+				<combo_box.item label="キャラクタータイプD" name="show_heatmap_mode_d"/>
 			</combo_box>
 			<check_box label="歩行�能" name="show_walkables"/>
 			<check_box label="素�ボリューム" name="show_material_volumes"/>
 			<check_box label="�的障害物" name="show_static_obstacles"/>
 			<check_box label="除外ボリューム" name="show_exclusion_volumes"/>
 			<check_box label="水上飛行機" name="show_water_plane"/>
-			<check_box label="Ｘ線表示" name="show_xray"/>
+			<check_box label="X線表示" name="show_xray"/>
 		</panel>
 		<panel label="パスをテスト" name="test_panel">
 			<text name="ctrl_click_label">
@@ -113,17 +113,17 @@
 			</text>
 			<slider name="character_width" value="1"/>
 			<text name="character_width_unit_label">
-				�
+				m
 			</text>
 			<text name="character_type_label">
 				キャラクタータイプ
 			</text>
 			<combo_box name="path_character_type">
 				<combo_box.item label="��" name="path_character_type_none"/>
-				<combo_box.item label="Ａ" name="path_character_type_a"/>
-				<combo_box.item label="ï¼¢" name="path_character_type_b"/>
-				<combo_box.item label="ï¼£" name="path_character_type_c"/>
-				<combo_box.item label="Ｄ" name="path_character_type_d"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
 			</combo_box>
 			<button label="経路をクリア" name="clear_path"/>
 		</panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
index 0189cbd47b..0bf9b6a308 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
@@ -119,10 +119,10 @@
 			<scroll_list.columns label="ランドインパクト" name="land_impact"/>
 			<scroll_list.columns label="�離" name="dist_from_you"/>
 			<scroll_list.columns label="経路探索�使用" name="linkset_use"/>
-			<scroll_list.columns label="Ａ％" name="a_percent"/>
-			<scroll_list.columns label="Ｂ％" name="b_percent"/>
-			<scroll_list.columns label="Ｃ％" name="c_percent"/>
-			<scroll_list.columns label="Ｄ％" name="d_percent"/>
+			<scroll_list.columns label="A %" name="a_percent"/>
+			<scroll_list.columns label="B %" name="b_percent"/>
+			<scroll_list.columns label="C %" name="c_percent"/>
+			<scroll_list.columns label="D %" name="d_percent"/>
 		</scroll_list>
 		<text name="messaging_status">
 			リンクセット：
@@ -150,21 +150,21 @@
 			歩行�能性：
 		</text>
 		<text name="edit_a_label">
-			Ａ
+			A
 		</text>
-		<line_editor name="edit_a_value" tool_tip="タイプＡ�キャラクター�歩行�能性。キャラクタータイプ�例�ヒューマノイド��。"/>
+		<line_editor name="edit_a_value" tool_tip="タイプA�キャラクター�歩行�能性。キャラクタータイプ�例�ヒューマノイド��。"/>
 		<text name="edit_b_label">
-			ï¼¢
+			B
 		</text>
-		<line_editor name="edit_b_value" tool_tip="タイプＢ�キャラクター�歩行�能性。キャラクタータイプ�例�クリー�ャー��。"/>
+		<line_editor name="edit_b_value" tool_tip="タイプB�キャラクター�歩行�能性。キャラクタータイプ�例�クリー�ャー��。"/>
 		<text name="edit_c_label">
-			ï¼£
+			C
 		</text>
-		<line_editor name="edit_c_value" tool_tip="タイプＣ�キャラクター�歩行�能性。キャラクタータイプ�例�メカニカル��。"/>
+		<line_editor name="edit_c_value" tool_tip="タイプC�キャラクター�歩行�能性。キャラクタータイプ�例�メカニカル��。"/>
 		<text name="edit_d_label">
-			Ｄ
+			D
 		</text>
-		<line_editor name="edit_d_value" tool_tip="タイプＤ�キャラクター�歩行�能性。キャラクタータイプ�例���他��。"/>
+		<line_editor name="edit_d_value" tool_tip="タイプD�キャラクター�歩行�能性。キャラクタータイプ�例���他��。"/>
 		<button label="変更を�用" name="apply_edit_values"/>
 		<text name="suggested_use_a_label">
 			（ヒューマノイド）
diff --git a/indra/newview/skins/default/xui/ja/floater_performance.xml b/indra/newview/skins/default/xui/ja/floater_performance.xml
index e2efc152a4..ecb00dd58c 100644
--- a/indra/newview/skins/default/xui/ja/floater_performance.xml
+++ b/indra/newview/skins/default/xui/ja/floater_performance.xml
@@ -39,7 +39,7 @@
 		</panel>
 		<panel name="nearby_subpanel">
 			<text name="avatars_nearby_lbl">
-				近隣�ア�ター
+				近��ア�ター
 			</text>
 			<text name="avatars_nearby_desc">
 				近���るア�ター������タイプ�ア�ターを完全�表示�る�を管����。
@@ -51,16 +51,16 @@
 				ア�ター�複雑度
 			</text>
 			<text name="complexity_info">
-				ＦＰＳ�出��場���ア�ター�複雑度を減ら������。
+				FPS�出��場���ア�ター�複雑度を減ら������。
 			</text>
 			<icon name="icon_arrow4"/>
 		</panel>
 		<panel name="huds_subpanel">
 			<text name="huds_lbl">
-				アクティブ�ＨＵＤ
+				アクティブ�HUD
 			</text>
 			<text name="huds_desc">
-				使用�����ＨＵＤを外���速度��上�る�能性��り��。
+				使用�����HUDを外���速度��上�る�能性��り��。
 			</text>
 			<icon name="icon_arrow4"/>
 		</panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences.xml b/indra/newview/skins/default/xui/ja/floater_preferences.xml
index c26bad3176..f75026c6a6 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences.xml
@@ -15,7 +15,7 @@
 		<panel label="色" name="colors"/>
 		<panel label="プライ�シー" name="im"/>
 		<panel label="セットアップ" name="input"/>
-		<panel label="æ‹¡å¼µ" name="advanced1"/>
+		<panel label="アド�ンス" name="advanced1"/>
 		<panel label="アップロード" name="uploads"/>
 		<panel label="�作" name="controls"/>
 	</tab_container>
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
index 66a416f416..9a2ed64291 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="prefs_graphics_advanced" title="拡張グラフィック設定">
+<floater name="prefs_graphics_advanced" title="グラフィック詳細設定">
 	<text name="GeneralText">
 		全般
 	</text>
 	<slider label="�画�離：" name="DrawDistance"/>
 	<text name="DrawDistanceMeterText2">
-		�
+		m
 	</text>
 	<slider label="最大パーティクル数：" name="MaxParticleCount"/>
 	<slider label="�ストプロセス�質：" name="RenderPostProcess"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
index 5efbbf7e17..5f686e41e4 100644
--- a/indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
@@ -4,14 +4,14 @@
 		カメラ�オフセット：
 	</text>
 	<spinner name="camera_x"/>
-	<spinner label="ï¼¹" name="camera_y"/>
-	<spinner label="Ｚ" name="camera_z"/>
+	<spinner label="Y" name="camera_y"/>
+	<spinner label="Z" name="camera_z"/>
 	<text name="focus_offset_lbl">
 		焦点�オフセット：
 	</text>
 	<spinner name="focus_x"/>
-	<spinner label="ï¼¹" name="focus_y"/>
-	<spinner label="Ｚ" name="focus_z"/>
+	<spinner label="Y" name="focus_y"/>
+	<spinner label="Z" name="focus_z"/>
 	<text name="offset_scale_lbl">
 		カメラ�オフセット�率：
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml b/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
index 43d5223ecc..b43d54001c 100644
--- a/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
@@ -4,7 +4,7 @@
 		<container_view name="statistics_view">
 			<stat_view name="basic" label="基本">
 				<stat_bar label="フレーム���ピクセル差" name="frame difference" unit_label="％"/>
-				<stat_bar label="ＵＤＰデータ��信�" name="bandwidth" unit_label="kbps"/>
+				<stat_bar label="UDPデータ��信�" name="bandwidth" unit_label="kbps"/>
 				<stat_bar label="パケットロス" name="packet_loss" unit_label="％"/>
 			</stat_view>
 			<stat_view name="advanced" label="æ‹¡å¼µ">
@@ -57,15 +57,15 @@
 						<stat_bar name="simsimphysicsshapeupdatemsec" label="　物�形状更新" unit_label="㎳"/>
 						<stat_bar name="simsimphysicsothermsec" label="　他�物�作用" unit_label="㎳"/>
 						<stat_bar name="simsleepmsec" label="　スリープ時間" unit_label="㎳"/>
-						<stat_bar name="simpumpiomsec" label="　�ンプＩ�Ｏ" unit_label="㎳"/>
+						<stat_bar name="simpumpiomsec" label="　�ンプIO" unit_label="㎳"/>
 					</stat_view>
 				</stat_view>
 			</stat_view>
 			<stat_view name="frame_stats" label="フレーム�内訳">
 				<stat_bar name="scenery_frame_pct" label="景色" unit_label="％"/>
 				<stat_bar name="avatar_frame_pct" label="ア�ター" unit_label="％"/>
-				<stat_bar name="ui_frame_pct" label="ＵＩ" unit_label="％"/>
-				<stat_bar name="huds_frame_pct" label="ＨＵＤ" unit_label="％"/>
+				<stat_bar name="ui_frame_pct" label="UI" unit_label="ï¼…"/>
+				<stat_bar name="huds_frame_pct" label="HUD" unit_label="ï¼…"/>
 				<stat_bar name="swap_frame_pct" label="スワップ" unit_label="％"/>
 				<stat_bar name="idle_frame_pct" label="タスク" unit_label="％"/>
 			</stat_view>
diff --git a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
index f304ab9769..ef1947dbce 100644
--- a/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/ja/floater_settings_debug.xml
@@ -16,10 +16,10 @@
 	</radio_group>
 	<line_editor name="val_text"/>
 	<color_swatch label="色" name="val_color_swatch"/>
-	<spinner label="Ｘ" name="val_spinner_1"/>
-	<spinner label="Ｘ" name="val_spinner_2"/>
-	<spinner label="Ｘ" name="val_spinner_3"/>
-	<spinner label="Ｘ" name="val_spinner_4"/>
+	<spinner label="x" name="val_spinner_1"/>
+	<spinner label="x" name="val_spinner_2"/>
+	<spinner label="x" name="val_spinner_3"/>
+	<spinner label="x" name="val_spinner_4"/>
 	<button label="デフォルト�リセット" name="default_btn"/>
 	<check_box label="変更�れ�設定��表示" name="hide_default"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_snapshot.xml b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
index 8035e8a13f..be9c52fb12 100644
--- a/indra/newview/skins/default/xui/ja/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/ja/floater_snapshot.xml
@@ -49,7 +49,7 @@
 			<combo_box.item label="色深度" name="Depth" value="depth"/>
 		</combo_box>
 		<check_box label="インターフェース" name="ui_check"/>
-		<check_box label="ＨＵＤ" name="hud_check"/>
+		<check_box label="HUD" name="hud_check"/>
 		<check_box label="フレームをフリーズ（全画�）" name="freeze_frame_check"/>
 		<check_box label="自動リフレッシュ" name="auto_snapshot_check"/>
 		<text name="filter_list_label">
@@ -93,6 +93,6 @@
 		[SIZE]㎅
 	</text>
 	<text name="360_label">
-		３６�度Ｓショットを撮影
+		360度スナップショットを撮影
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml
index 0c28b47351..41a482a4b9 100644
--- a/indra/newview/skins/default/xui/ja/floater_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_stats.xml
@@ -3,15 +3,15 @@
 	<scroll_container name="statistics_scroll">
 		<container_view name="statistics_view">
 			<stat_view label="基本" name="basic">
-				<stat_bar label="ＦＰＳ" name="fps" unit_label="�秒"/>
+				<stat_bar label="FPS" name="fps" unit_label="�秒"/>
 				<stat_bar name="frame_mean" label="フレーム（平�）" unit_label="㎳"/>
 				<stat_bar name="frame_median" label="フレーム（中央値）" unit_label="㎳"/>
 				<stat_bar name="framet_jitter" label="ジッタ"/>
-				<stat_bar label="�信��ＵＤＰデータ" name="bandwidth"/>
+				<stat_bar label="�信��UDPデータ" name="bandwidth"/>
 				<stat_bar label="パケットロス" name="packet_loss"/>
 				<stat_bar label="シム�Ping" name="ping"/>
 			</stat_view>
-			<stat_view label="æ‹¡å¼µ" name="advanced">
+			<stat_view label="詳細" name="advanced">
 				<stat_view label="�画" name="render">
 					<stat_bar label="フレーム��り�KTris" name="ktrisframe" unit_label="ktris�フレーム"/>
 					<stat_bar label="秒��り�KTris" name="ktrissec"/>
@@ -27,15 +27,15 @@
 					<stat_bar label="キャッシュヒット率" name="texture_cache_hits"/>
 					<stat_bar label="キャッシュ読��り�延" name="texture_cache_read_latency"/>
 					<stat_bar label="カウント" name="numimagesstat"/>
-					<stat_bar label="ＲＡＷカウント" name="numrawimagesstat"/>
-					<stat_bar label="ＧＬメモリ" name="gltexmemstat"/>
+					<stat_bar label="Rawカウント" name="numrawimagesstat"/>
+					<stat_bar label="GLメモリ" name="gltexmemstat"/>
 					<stat_bar label="フォーマット済メモリ" name="formattedmemstat"/>
-					<stat_bar label="ＲＡＷメモリ" name="rawmemstat"/>
+					<stat_bar label="Rawメモリ" name="rawmemstat"/>
 					<stat_bar label="統�メモリ" name="glboundmemstat"/>
 				</stat_view>
 				<stat_view label="メモリ使用�" name="memory">
-					<stat_bar label="ＬＬトレース" name="LLTrace"/>
-					<stat_bar label="ＵＩ" name="LLView"/>
+					<stat_bar label="LLトレース" name="LLTrace"/>
+					<stat_bar label="UI" name="LLView"/>
 					<stat_bar label="フォント" name="LLFontFreetype"/>
 					<stat_bar label="インベントリ" name="LLInventoryObject"/>
 					<stat_bar label="ビューアオブジェクト" name="LLViewerObject"/>
@@ -47,7 +47,7 @@
 					<stat_bar label="�画情報" name="LLDrawInfo"/>
 					<stat_bar label="テクス�ャデータ" name="LLTexture"/>
 					<stat_bar label="画�データ" name="LLImage"/>
-					<stat_bar label="ＧＬ画�データ" name="LLImageGL"/>
+					<stat_bar label="GL画�データ" name="LLImageGL"/>
 					<stat_bar label="頂点�ッファ" name="LLVertexBuffer"/>
 				</stat_view>
 				<stat_view label="�ットワーク" name="network">
@@ -63,11 +63,11 @@
 			</stat_view>
 			<stat_view label="シミュレーター" name="sim">
 				<stat_bar label="�延時間" name="simtimedilation"/>
-				<stat_bar label="シム�ＦＰＳ" name="simfps"/>
-				<stat_bar label="物�作用�ＦＰＳ" name="simphysicsfps"/>
+				<stat_bar label="シム�FPS" name="simfps"/>
+				<stat_bar label="物�作用�FPS" name="simphysicsfps"/>
 				<stat_view label="物�作用�詳細" name="physicsdetail">
 					<stat_bar label="ピン留�オブジェクト" name="physicspinnedtasks"/>
-					<stat_bar label="低ＬＯＤオブジェクト" name="physicslodtasks"/>
+					<stat_bar label="低LODオブジェクト" name="physicslodtasks"/>
 					<stat_bar label="メモリ�分" name="physicsmemoryallocated"/>
 				</stat_view>
 				<stat_bar label="エージェント�更新�秒" name="simagentups"/>
@@ -79,7 +79,7 @@
 				<stat_bar label="スクリプト実行" name="simpctscriptsrun"/>
 				<stat_bar label="スクリプトイベント" name="simscripteps" unit_label="eps"/>
 				<stat_view label="経路探索" name="simpathfinding">
-					<stat_bar label="ＡＩステップ時間" name="simsimaistepmsec"/>
+					<stat_bar label="AIステップ時間" name="simsimaistepmsec"/>
 					<stat_bar label="スキップ�れ�シルエットステップ" name="simsimskippedsilhouettesteps" unit_label="�秒"/>
 					<stat_bar label="更新�れ�キャラクター" name="simsimpctsteppedcharacters" unit_label="％"/>
 				</stat_view>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index fb95a71ce0..f14d8f7241 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -40,7 +40,7 @@
 		土地をクリック��ドラッグ���択
 	</floater.string>
 	<floater.string name="status_selectcount">
-		�択�れ��るオブジェクト�[OBJ_COUNT]個�土地�負��[LAND_IMPACT]　[secondlife:///app/openfloater/object_weights 詳細]
+		�択�れ��るオブジェクト�[OBJ_COUNT]個�土地�負��[LAND_IMPACT] [secondlife:///app/openfloater/object_weights 詳細]
 	</floater.string>
 	<floater.string name="status_remaining_capacity">
 		残り�許容数[LAND_CAPACITY]
@@ -123,7 +123,7 @@
 		何も�択�れ����ん。
 	</text>
 	<text name="remaining_capacity">
-		[CAPACITY_STRING]　[secondlife:///app/openfloater/object_weights 詳細]
+		[CAPACITY_STRING] [secondlife:///app/openfloater/object_weights 詳細]
 	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="一般" name="General">
@@ -232,22 +232,22 @@
 				<check_box label="コピー" name="checkbox next owner can copy" tool_tip="譲渡先�所有者����オブジェクトを無制��コピー����。コピー��制作者�情報���れ�コピー元�アイテム����許����関�制約��り��。"/>
 				<check_box label="�販・譲渡" name="checkbox next owner can transfer" tool_tip="譲渡先�所有者����オブジェクトを他人�譲渡��り�販�る�������。"/>
 				<text name="B:">
-					Ｂ：
+					B：
 				</text>
 				<text name="O:">
-					Ｃ：
+					O：
 				</text>
 				<text name="G:">
-					Ｇ：
+					G：
 				</text>
 				<text name="E:">
-					Ｅ：
+					E：
 				</text>
 				<text name="N:">
-					Ｎ：
+					N：
 				</text>
 				<text name="F:">
-					Ｆ：
+					F：
 				</text>
 			</panel>
 			<panel name="pathfinding_attrs_panel">
@@ -264,21 +264,21 @@
 			<text name="label position">
 				�置（メートル）
 			</text>
-			<spinner label="Ｘ" name="Pos X"/>
-			<spinner label="ï¼¹" name="Pos Y"/>
-			<spinner label="Ｚ" name="Pos Z"/>
+			<spinner label="X" name="Pos X"/>
+			<spinner label="Y" name="Pos Y"/>
+			<spinner label="Z" name="Pos Z"/>
 			<text name="label size">
 				サイズ（メートル）
 			</text>
-			<spinner label="Ｘ" name="Scale X"/>
-			<spinner label="ï¼¹" name="Scale Y"/>
-			<spinner label="Ｚ" name="Scale Z"/>
+			<spinner label="X" name="Scale X"/>
+			<spinner label="Y" name="Scale Y"/>
+			<spinner label="Z" name="Scale Z"/>
 			<text name="label rotation">
 				回転（度）
 			</text>
-			<spinner label="Ｘ" name="Rot X"/>
-			<spinner label="ï¼¹" name="Rot Y"/>
-			<spinner label="Ｚ" name="Rot Z"/>
+			<spinner label="X" name="Rot X"/>
+			<spinner label="Y" name="Rot Y"/>
+			<spinner label="Z" name="Rot Z"/>
 			<combo_box name="comboBaseType">
 				<combo_box.item label="ボックス" name="Box"/>
 				<combo_box.item label="シリンダー" name="Cylinder"/>
@@ -320,13 +320,13 @@
 			<text name="scale_hole">
 				穴寸法
 			</text>
-			<spinner label="Ｘ" name="Taper Scale X"/>
-			<spinner label="ï¼¹" name="Taper Scale Y"/>
+			<spinner label="X" name="Taper Scale X"/>
+			<spinner label="Y" name="Taper Scale Y"/>
 			<text name="text topshear">
 				上部層
 			</text>
-			<spinner label="Ｘ" name="Shear X"/>
-			<spinner label="ï¼¹" name="Shear Y"/>
+			<spinner label="X" name="Shear X"/>
+			<spinner label="Y" name="Shear Y"/>
 			<text name="advanced_cut">
 				プロフィールカット（始点�終点）
 			</text>
@@ -341,8 +341,8 @@
 			<text name="text taper2">
 				テーパー
 			</text>
-			<spinner label="Ｘ" name="Taper X"/>
-			<spinner label="ï¼¹" name="Taper Y"/>
+			<spinner label="X" name="Taper X"/>
+			<spinner label="Y" name="Taper Y"/>
 			<text name="text radius delta">
 				�径
 			</text>
@@ -350,7 +350,7 @@
 				回転体
 			</text>
 			<texture_picker label="スカルプトテクス�ャ" name="sculpt texture control" tool_tip="クリック��画�を�択������。"/>
-			<check_box label="ミラー" name="sculpt mirror control" tool_tip="スカルプトプリムをＸ軸上��転����"/>
+			<check_box label="ミラー" name="sculpt mirror control" tool_tip="スカルプトプリムをX軸上��転����"/>
 			<check_box label="�返�" name="sculpt invert control" tool_tip="スカルプトプリムを�転����返���"/>
 			<text name="label sculpt type">
 				縫�目�タイプ
@@ -379,20 +379,20 @@
 				オブジェクト�特徴を編集：
 			</text>
 			<check_box label="アニメーションメッシュ" name="Animated Mesh Checkbox Ctrl" tool_tip="リグ入りメッシュオブジェクトを��れ�れアニメーション��る�����るよ���り��。"/>
-			<check_box label="フレキシブルパス" name="Flexible1D Checkbox Ctrl" tool_tip="Ｚ軸を中心��オブジェクト�屈曲を有効����。（クライアント���）"/>
+			<check_box label="フレキシブルパス" name="Flexible1D Checkbox Ctrl" tool_tip="Z軸を中心��オブジェクト�屈曲を有効����。（クライアント���）"/>
 			<spinner label="柔軟性" name="FlexNumSections"/>
 			<spinner label="�力" name="FlexGravity"/>
 			<spinner label="ドラッグ" name="FlexFriction"/>
 			<spinner label="風" name="FlexWind"/>
 			<spinner label="ç·Šå¼µ" name="FlexTension"/>
-			<spinner label="Ｘ軸方��力" name="FlexForceX"/>
-			<spinner label="Ｙ軸方��力" name="FlexForceY"/>
-			<spinner label="Ｚ軸方��力" name="FlexForceZ"/>
+			<spinner label="X軸方��力" name="FlexForceX"/>
+			<spinner label="Y軸方��力" name="FlexForceY"/>
+			<spinner label="Z軸方��力" name="FlexForceZ"/>
 			<check_box label="発光" name="Light Checkbox Ctrl" tool_tip="オブジェクト�発光���"/>
 			<color_swatch label="" name="colorswatch" tool_tip="クリック��カラーピッカーを開���"/>
 			<texture_picker label="" name="light texture control" tool_tip="クリック�投影画を�択���（�延レンダリング有効時��）"/>
 			<spinner label="�度" name="Light Intensity"/>
-			<spinner label="ＦＯＶ" name="Light FOV"/>
+			<spinner label="FOV" name="Light FOV"/>
 			<spinner label="�径" name="Light Radius"/>
 			<spinner label="焦点" name="Light Focus"/>
 			<spinner label="弱�る" name="Light Falloff"/>
@@ -412,7 +412,7 @@
 			</combo_box>
 			<spinner label="�力" name="Physics Gravity"/>
 			<spinner label="摩擦" name="Physics Friction"/>
-			<spinner label="密度（１���/㎥）" name="Physics Density"/>
+			<spinner label="密度（100�/㎥）" name="Physics Density"/>
 			<spinner label="復元" name="Physics Restitution"/>
 		</panel>
 		<panel label="�質" name="Texture"/>
@@ -426,13 +426,13 @@
 			区画情報
 		</text>
 		<text name="label_area_price">
-			価格：[AREA]㎡　L$ [PRICE]
+			価格：[AREA]㎡ L$ [PRICE]
 		</text>
 		<text name="label_area">
 			��：[AREA]㎡
 		</text>
 		<button label="土地情報" label_selected="土地情報" name="button about land"/>
-		<check_box label="所有者を表示" name="checkbox show owners" tool_tip="所有者�種類別�区画を色����：緑色�����土地　水色�����グループ所有地　赤色�他人�所有�る土地　黄色 = 売り出�中　紫色�オークション　�色�公共領域"/>
+		<check_box label="所有者を表示" name="checkbox show owners" tool_tip="所有者�種類別�区画を色����：&#10;&#10;緑色�����土地 &#10;水色�����グループ所有地 &#10;赤色�他人�所有�る土地 &#10;黄色 = 売り出�中 &#10;紫色�オークション &#10;�色�公共領域"/>
 		<text name="label_parcel_modify">
 			区画�編集
 		</text>
diff --git a/indra/newview/skins/default/xui/ja/floater_top_objects.xml b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
index 86ab64cb3e..69d527a087 100644
--- a/indra/newview/skins/default/xui/ja/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
@@ -22,7 +22,7 @@
 		何も見��り��ん���。
 	</floater.string>
 	<floater.string name="URLs">
-		ＵＲＬ
+		URL
 	</floater.string>
 	<floater.string name="memory">
 		メモリ（㎅）
@@ -41,7 +41,7 @@
 		<scroll_list.columns label="メモリ（㎅）" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
-		物体ＩＤ：
+		物体ID:
 	</text>
 	<button label="標識を表示" name="show_beacon_btn"/>
 	<text name="obj_name_text">
diff --git a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
index 8bbcbcdfed..dbe5c3007a 100644
--- a/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
+++ b/indra/newview/skins/default/xui/ja/floater_translation_settings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_translation_settings" title="�ャット�翻訳設定">
 	<string name="azure_api_key_not_verified">
-		Azureサービス識別���証�����ん���。ステータス：[STATUS]　設定を�確���上�も�一度やり直������。
+		Azureサービス識別���証�����ん���。ステータス：[STATUS] 設定を�確���上�も�一度やり直������。
 	</string>
 	<string name="google_api_key_not_verified">
-		Google APIキー��証�����ん���。ステータス：[STATUS]　設定を�確���上�も�一度やり直������。
+		Google APIキー��証�����ん���。ステータス：[STATUS] 設定を�確���上�も�一度やり直������。
 	</string>
 	<string name="deepl_api_key_not_verified">
-		DeepL Authキー��証�����ん���。ステータス：[STATUS]　設定を�確���上�も�一度やり直������。
+		DeepL Authキー��証�����ん���。ステータス：[STATUS] 設定を�確���上�も�一度やり直������。
 	</string>
 	<string name="azure_api_key_verified">
 		Azureサービス識別���証�れ���。
diff --git a/indra/newview/skins/default/xui/ja/floater_ui_preview.xml b/indra/newview/skins/default/xui/ja/floater_ui_preview.xml
index b907b4e8d7..c3d70e7055 100644
--- a/indra/newview/skins/default/xui/ja/floater_ui_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_ui_preview.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="gui_preview_tool" title="ＸＵＩプレビューツール">
+<floater name="gui_preview_tool" title="XUIプレビューツール">
 	<string name="ExternalEditorNotSet">
 		環境変数LL_XUI_EDITOR���ExternalEditor設定を設定�る��[EDITOR PATH]フィールド���パスを指定���エディターを�択���。
 	</string>
@@ -10,11 +10,11 @@
 		<combo_box name="language_select_combo">
 			<combo_box.item label="ja" name="item1" value="ja"/>
 		</combo_box>
-		<button label="表示" label_selected="表示" name="display_floater" tool_tip="�択��ＸＭＬファイル�定義�れ�ＸＵＩフロータを表示���。"/>
+		<button label="表示" label_selected="表示" name="display_floater" tool_tip="�択��XMLファイル�定義�れ�XUIフロータを表示���。"/>
 		<button label="�表示" label_selected="�表示" name="close_displayed_floater" tool_tip="�在表示�れ��るフローター�存在�る場����れを閉���。"/>
-		<button label="編集…" label_selected="編集…" name="edit_floater" tool_tip="�択��ＸＭＬファイル�よ��定義�れ�ＸＵＩフローターを編集���。（外部エディターを開���）ローカライズ�れ��ージョン�存在���場���en�ージョンを開���。"/>
-		<button label="�存" label_selected="�存" name="save_floater" tool_tip="�択��ＸＭＬファイル�定義�れ�ＸＵＩフロータを�存���。"/>
-		<button label="全��存" label_selected="全��存" name="save_all_floaters" tool_tip="�択��言語�定義�れ�����ＸＵＩフロータを�存���。"/>
+		<button label="編集…" label_selected="編集…" name="edit_floater" tool_tip="�択��XMLファイル�よ��定義�れ�XUIフローターを編集���。（外部エディターを開���）ローカライズ�れ��ージョン�存在���場���en�ージョンを開���。"/>
+		<button label="�存" label_selected="�存" name="save_floater" tool_tip="�択��XMLファイル�定義�れ�XUIフロータを�存���。"/>
+		<button label="全��存" label_selected="全��存" name="save_all_floaters" tool_tip="�択��言語�定義�れ�����XUIフロータを�存���。"/>
 		<button label="≫" label_selected="≪" name="toggle_overlap_panel" tool_tip="�����る�素�強調表示�表示パ�ルを切り替���。�素を�クリック�����機能用��択���。�択���素��赤�四角形�マーク�れ��。"/>
 		<text name="select_language_label_2">
 			二次言語：
@@ -22,7 +22,7 @@
 		<combo_box name="language_select_combo_2">
 			<combo_box.item label="en" name="item1" value="en"/>
 		</combo_box>
-		<button label="表示" name="display_floater_2" tool_tip="�択��ＸＭＬファイル�定義�れ�ＸＵＩフロータを表示���。"/>
+		<button label="表示" name="display_floater_2" tool_tip="�択��XMLファイル�定義�れ�XUIフロータを表示���。"/>
 		<button enabled="false" label="�表示" name="close_displayed_floater_2" tool_tip="�在表示�れ��るフローター�存在�る場����れを閉���。"/>
 		<button label="スキーマをエクス�ート" name="export_schema"/>
 		<check_box label="四角形を表示" name="show_rectangles"/>
@@ -35,8 +35,8 @@
 			<text name="editor_path_label">
 				エディタ�パス：
 			</text>
-			<line_editor name="executable_path_field" tool_tip="フローターＸＭＬファイルを編集�る���エディター（実行�能ファイル）��フルパス。（引用符�必��り��ん）"/>
-			<button follows="left|bottom" label="ブラウズ…" label_selected="ブラウズ…" name="browse_for_executable" tool_tip="フローターＸＭＬファイルを編集�る���エディター（実行�能ファイル）を�照���。"/>
+			<line_editor name="executable_path_field" tool_tip="フローターXMLファイルを編集�る���エディター（実行�能ファイル）��フルパス。（引用符�必��り��ん）"/>
+			<button follows="left|bottom" label="ブラウズ…" label_selected="ブラウズ…" name="browse_for_executable" tool_tip="フローターXMLファイルを編集�る���エディター（実行�能ファイル）を�照���。"/>
 			<text name="executable_args_label">
 				エディタ�引数：
 			</text>
@@ -46,7 +46,7 @@
 			<text name="diff_file_label">
 				差分ファイル：
 			</text>
-			<line_editor name="vlt_diff_path_field" tool_tip="Viewer Localization Toolkit�よ��生��れ�ＸＭＬ�D0�D1言語差分ファイル��フルパス"/>
+			<line_editor name="vlt_diff_path_field" tool_tip="Viewer Localization Toolkit�よ��生��れ�XML�D0�D1言語差分ファイル��フルパス"/>
 			<button label="ブラウズ…" label_selected="ブラウズ…" name="browse_for_vlt_diffs" tool_tip="VLT�生��れ�D0�D1差分ファイルを�照���変更�れ�ファイル��素を強調表示���。"/>
 			<button label="差分を�イライト" label_selected="�イライトを解除" name="toggle_vlt_diff_highlight" tool_tip="変更�れ�言語データを�むファイル��素�強調表示を切り替���。"/>
 		</panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_url_entry.xml b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
index 3ff50854a5..534e0156c5 100644
--- a/indra/newview/skins/default/xui/ja/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_url_entry.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="url_entry">
 	<text name="media_label">
-		メディアＵＲＬ：
+		メディアURL：
 	</text>
 	<combo_box name="media_entry"/>
 	<button label="ＯＫ" name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
index be59547bf3..fd8e75da87 100644
--- a/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
+++ b/indra/newview/skins/default/xui/ja/floater_whitelist_entry.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="whitelist_entry" title="ホワイトリスト�入力">
 	<text name="media_label">
-		ＵＲＬ�ＵＲＬパターンを入力���許��るドメインをリスト�追加���。
+		URL�URLパターンを入力���許��るドメインをリスト�追加���。
 	</text>
-	<line_editor name="whitelist_entry" tool_tip="ＵＲＬ�ＵＲＬパターンをホワイトリスト�入力���。"/>
+	<line_editor name="whitelist_entry" tool_tip="URL�URLパターンをホワイトリスト�入力���。"/>
 	<button label="ＯＫ" name="ok_btn"/>
 	<button label="キャンセル" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
index 284449d59d..87f469f91d 100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
@@ -2,7 +2,7 @@
 <context_menu name="Avatar Pie">
 	<menu_item_call label="プロフィールを見る" name="Profile..."/>
 	<menu_item_call label="フレンド�追加" name="Add Friend"/>
-	<menu_item_call label="ＩＭ" name="Send IM..."/>
+	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="コール" name="Call"/>
 	<menu_item_call label="グループ�招待…" name="Invite..."/>
 	<menu_item_separator/>
@@ -14,7 +14,7 @@
 	<menu_item_call label="フリーズ" name="Freeze..."/>
 	<menu_item_call label="追放" name="Eject..."/>
 	<menu_item_call label="テクス�ャ�デ�ッグ" name="Debug..."/>
-	<menu_item_call label="ＸＭＬ���ダンプ" name="Dump XML"/>
+	<menu_item_call label="XML���ダンプ" name="Dump XML"/>
 	<menu_item_call label="ズームイン" name="Zoom In"/>
 	<menu_item_call label="支払�" name="Pay..."/>
 	<menu_item_separator/>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
index a7989b35c8..0a022d16a1 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
@@ -2,7 +2,7 @@
 <context_menu name="Avatar Pie">
 	<menu_item_call label="プロフィールを見る" name="Profile..."/>
 	<menu_item_call label="フレンド�追加" name="Add Friend"/>
-	<menu_item_call label="ＩＭ" name="Send IM..."/>
+	<menu_item_call label="IM" name="Send IM..."/>
 	<menu_item_call label="コール" name="Call"/>
 	<menu_item_call label="グループ�招待" name="Invite..."/>
 	<menu_item_separator/>
@@ -14,7 +14,7 @@
 	<menu_item_call label="フリーズ" name="Freeze..."/>
 	<menu_item_call label="追放" name="Eject..."/>
 	<menu_item_call label="テクス�ャ�デ�ッグ" name="Debug..."/>
-	<menu_item_call label="ＸＭＬ���ダンプ" name="Dump XML"/>
+	<menu_item_call label="XML���ダンプ" name="Dump XML"/>
 	<menu_item_call label="ズームイン" name="Zoom In"/>
 	<menu_item_call label="支払�" name="Pay..."/>
 	<menu_item_separator/>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation.xml b/indra/newview/skins/default/xui/ja/menu_conversation.xml
index 047f5d57cf..163feb5b56 100644
--- a/indra/newview/skins/default/xui/ja/menu_conversation.xml
+++ b/indra/newview/skins/default/xui/ja/menu_conversation.xml
@@ -5,7 +5,7 @@
 	<menu_item_call label="ボイス�ャットを切断�る" name="disconnect_from_voice"/>
 	<menu_item_call label="�択��項目を閉�る" name="close_selected_conversations"/>
 	<menu_item_call label="プロフィールを表示" name="view_profile"/>
-	<menu_item_call label="ＩＭ" name="im"/>
+	<menu_item_call label="IM" name="im"/>
 	<menu_item_call label="テレ�ート�オファー" name="offer_teleport"/>
 	<menu_item_call label="ボイスコール" name="voice_call"/>
 	<menu_item_call label="�ャット�履歴…" name="chat_history"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
index 78c46d13b4..438b0c304b 100644
--- a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="ＩＭ…" name="IM"/>
+	<menu_item_call label="IM..." name="IM"/>
 	<menu_item_call label="ボイスコール…" name="Call"/>
 	<menu_item_call label="�ャット�履歴を開�…" name="Chat history"/>
 	<menu_item_call label="プロフィールを表示" name="View Profile"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
index bcda112d2f..2012eb88cc 100644
--- a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
@@ -3,5 +3,5 @@
 	<menu_item_check label="���並�替�" name="sort_by_name"/>
 	<menu_item_check label="日付�並�替�" name="sort_by_date"/>
 	<menu_item_check label="上��フレンドを並�替�" name="sort_by_friends"/>
-	<menu_item_call label="近隣�ャット�履歴を表示…" name="view_nearby_chat_history"/>
+	<menu_item_call label="�ャット履歴を表示…" name="view_nearby_chat_history"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
index e1f24cdb39..3a8fd36ceb 100644
--- a/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_gesture_gear.xml
@@ -4,7 +4,7 @@
 	<menu_item_call label="��変更" name="rename"/>
 	<menu_item_call label="コピー" name="copy_gesture"/>
 	<menu_item_call label="ペースト" name="paste"/>
-	<menu_item_call label="ＵＵＩＤをコピー" name="copy_uuid"/>
+	<menu_item_call label="UUIDをコピー" name="copy_uuid"/>
 	<menu_item_call label="�在�アウトフィット��存" name="save_to_outfit"/>
 	<menu_item_call label="編集" name="edit_gesture"/>
 	<menu_item_call label="調�る" name="inspect"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_inventory.xml b/indra/newview/skins/default/xui/ja/menu_inventory.xml
index c7cba4845d..d602823fe4 100644
--- a/indra/newview/skins/default/xui/ja/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/menu_inventory.xml
@@ -82,7 +82,7 @@
 	<menu_item_call label="オリジナルを開�" name="Open Original"/>
 	<menu_item_call label="プロパティ" name="Properties"/>
 	<menu_item_call label="��を変更" name="Rename"/>
-	<menu_item_call label="アセット�ＵＵＩＤをコピー" name="Copy Asset UUID"/>
+	<menu_item_call label="アセット�UUIDをコピー" name="Copy Asset UUID"/>
 	<menu_item_call label="メインパ�ル�表示" name="Show in Main Panel"/>
 	<menu_item_call label="カット" name="Cut"/>
 	<menu_item_call label="コピー" name="Copy"/>
@@ -113,7 +113,7 @@
 	<menu_item_separator name="Wearable And Object Separator"/>
 	<menu_item_call label="装�" name="Wearable And Object Wear"/>
 	<menu label="装�先" name="Attach To"/>
-	<menu label="HUD 装�先" name="Attach To HUD"/>
+	<menu label="HUD�装�先" name="Attach To HUD"/>
 	<menu_item_call label="触る" name="Attachment Touch"/>
 	<menu_item_call label="編集" name="Wearable Edit"/>
 	<menu_item_call label="追加" name="Wearable Add"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_list.xml b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
index ebce5f7e6b..5756e3f8b5 100644
--- a/indra/newview/skins/default/xui/ja/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/ja/menu_participant_list.xml
@@ -4,7 +4,7 @@
 	<menu_item_check label="最近�発言者�並�替�" name="SortByRecentSpeakers"/>
 	<menu_item_call label="プロフィール�表示" name="View Profile"/>
 	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="ＩＭ" name="IM"/>
+	<menu_item_call label="IM" name="IM"/>
 	<menu_item_call label="コール" name="Call"/>
 	<menu_item_call label="共有" name="Share"/>
 	<menu_item_call label="支払�" name="Pay"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
index bbe842a37e..13c940abf4 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
 	<menu_item_call label="プロフィールを表示" name="view_profile"/>
-	<menu_item_call label="ＩＭ" name="im"/>
+	<menu_item_call label="IM" name="im"/>
 	<menu_item_call label="テレ�ートを�る" name="offer_teleport"/>
 	<menu_item_call label="ボイスコール" name="voice_call"/>
 	<menu_item_call label="�ャット�履歴を表示…" name="chat_history"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
index 4e3dbd3279..e8b8f0f694 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
@@ -2,7 +2,7 @@
 <context_menu name="Multi-Selected People Context Menu">
 	<menu_item_call label="フレンド登録" name="add_friends"/>
 	<menu_item_call label="フレンドを削除" name="remove_friends"/>
-	<menu_item_call label="ＩＭ" name="im"/>
+	<menu_item_call label="IM" name="im"/>
 	<menu_item_call label="コール" name="call"/>
 	<menu_item_call label="共有" name="share"/>
 	<menu_item_call label="支払�" name="pay"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_other.xml b/indra/newview/skins/default/xui/ja/menu_profile_other.xml
index 0247a60803..9803735afc 100644
--- a/indra/newview/skins/default/xui/ja/menu_profile_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_profile_other.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Avatar Profile Menu">
-	<menu_item_call label="ＩＭ" name="im"/>
+	<menu_item_call label="IM" name="im"/>
 	<menu_item_call label="テレ�ート�オファー" name="offer_teleport"/>
 	<menu_item_call label="テレ�ート�リクエスト" name="request_teleport"/>
 	<menu_item_call label="ボイスコール" name="voice_call"/>
@@ -19,5 +19,5 @@
 	<menu_item_separator name="separator_copy_options"/>
 	<menu_item_call label="表示�をコピー" name="copy_display_name"/>
 	<menu_item_call label="エージェント�をコピー" name="copy_name"/>
-	<menu_item_call label="エージェントＩＤをコピー" name="copy_id"/>
+	<menu_item_call label="エージェントIDをコピー" name="copy_id"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_profile_self.xml b/indra/newview/skins/default/xui/ja/menu_profile_self.xml
index 7c9570378e..f39593e417 100644
--- a/indra/newview/skins/default/xui/ja/menu_profile_self.xml
+++ b/indra/newview/skins/default/xui/ja/menu_profile_self.xml
@@ -8,5 +8,5 @@
 	<menu_item_separator name="separator_copy_options"/>
 	<menu_item_call label="表示�をコピー" name="copy_display_name"/>
 	<menu_item_call label="エージェント�をコピー" name="copy_name"/>
-	<menu_item_call label="エージェントＩＤをコピー" name="copy_id"/>
+	<menu_item_call label="エージェントIDをコピー" name="copy_id"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_settings_gear.xml b/indra/newview/skins/default/xui/ja/menu_settings_gear.xml
index a8ff0d3721..3f5d30073b 100644
--- a/indra/newview/skins/default/xui/ja/menu_settings_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_settings_gear.xml
@@ -6,5 +6,5 @@
 	<menu_item_call label="リージョン（地域）��用" name="Settings Apply Region"/>
 	<menu_item_call label="コピー" name="copy_settings"/>
 	<menu_item_call label="ペースト" name="paste_settings"/>
-	<menu_item_call label="ＵＵＩＤをコピー" name="copy_uuid"/>
+	<menu_item_call label="UUIDをコピー" name="copy_uuid"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_slurl.xml b/indra/newview/skins/default/xui/ja/menu_slurl.xml
index 820cc3cd53..e68128e429 100644
--- a/indra/newview/skins/default/xui/ja/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/ja/menu_slurl.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu name="Popup">
-	<menu_item_call label="ＵＲＬ����" name="about_url"/>
-	<menu_item_call label="ＵＲＬ�テレ�ート�る" name="teleport_to_url"/>
+	<menu_item_call label="URL����" name="about_url"/>
+	<menu_item_call label="URL�テレ�ート�る" name="teleport_to_url"/>
 	<menu_item_call label="マップ" name="show_on_map"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
index 9ce9a070f2..d06f4896b2 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
 	<menu_item_call label="プロフィールを表示" name="show_agent"/>
-	<menu_item_call label="ＩＭを�信…" name="send_im"/>
+	<menu_item_call label="IMを�信…" name="send_im"/>
 	<menu_item_call label="フレンドを追加…" name="add_friend"/>
 	<menu_item_call label="フレンドを削除…" name="remove_friend"/>
 	<menu_item_call label="嫌�ら��報告" name="report_abuse"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_http.xml b/indra/newview/skins/default/xui/ja/menu_url_http.xml
index ae97e8bd8d..c3da8a8686 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_http.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_http.xml
@@ -3,5 +3,5 @@
 	<menu_item_call label="Web ページを開�" name="url_open"/>
 	<menu_item_call label="内蔵ブラウザ�開�" name="url_open_internal"/>
 	<menu_item_call label="外部ブラウザ�開�" name="url_open_external"/>
-	<menu_item_call label="ＵＲＬをクリップボード�コピー" name="url_copy"/>
+	<menu_item_call label="URLをクリップボード�コピー" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index f6b10bb121..41df8fdbb1 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -17,7 +17,7 @@
 		<menu_item_call label="アカウント�ダッシュボード…" name="Manage My Account"/>
 		<menu_item_call label="[Membership]" name="Membership"/>
 		<menu_item_separator/>
-		<menu_item_call label="�期設定…" name="Preferences"/>
+		<menu_item_call label="環境設定…" name="Preferences"/>
 		<menu_item_call label="ツール�ー�ボタン…" name="Toolbars"/>
 		<menu_item_call label="全��コントロールを隠�" name="Hide UI" shortcut="control|shift|U"/>
 		<menu_item_check label="HUDを表示" name="Show HUD Attachments" shortcut="alt|shift|H"/>
@@ -47,7 +47,7 @@
 				<menu_item_separator/>
 				<menu_item_call label="�����装" name="All Clothes"/>
 			</menu>
-			<menu label="ＨＵＤ" name="Avatar Detach HUD"/>
+			<menu label="HUD" name="Avatar Detach HUD"/>
 			<menu label="�り外�" name="Avatar Detach"/>
 			<menu_item_call label="全�を�り外�" name="Detach All"/>
 		</menu>
@@ -70,7 +70,7 @@
 	</menu>
 	<menu label="コミュニケーション" name="Communicate">
 		<menu_item_check label="会話…" name="Conversations"/>
-		<menu_item_check label="近隣��ャット…" name="Nearby Chat"/>
+		<menu_item_check label="周辺�ャット…" name="Nearby Chat"/>
 		<menu_item_check label="ボイス�ャット" name="Speak"/>
 		<menu_item_check name="Conversation Log..." label="会話ログ…"/>
 		<menu_item_separator/>
@@ -95,7 +95,7 @@
 		<menu_item_call label="�在地をホーム�設定" name="Set Home to Here"/>
 		<menu_item_separator/>
 		<menu_item_call label="スナップショット" name="Take Snapshot"/>
-		<menu_item_call label="３６�度スナップショット" name="Capture 360"/>
+		<menu_item_call label="360度スナップショット" name="Capture 360"/>
 		<menu_item_separator/>
 		<menu_item_call label="場所�プロフィール" name="Place Profile"/>
 		<menu_item_call label="土地情報" name="About Land"/>
@@ -112,14 +112,14 @@
 			<menu_item_check label="座標" name="Coordinates"/>
 			<menu_item_check label="区画�プロパティ" name="Parcel Properties"/>
 			<menu_item_separator/>
-			<menu_item_check label="拡張メニュー" name="Show Advanced Menu"/>
+			<menu_item_check label="アド�ンスメニュー" name="Show Advanced Menu"/>
 		</menu>
 		<menu_item_check label="グラフィック性能�最�化…" name="Performance"/>
 		<menu_item_separator/>
 		<menu label="環境" name="Environment">
-			<menu_item_check label="夜明�" name="Sunrise"/>
+			<menu_item_check label="日�出" name="Sunrise"/>
 			<menu_item_check label="正�" name="Noon"/>
-			<menu_item_check label="夕方" name="Sunset"/>
+			<menu_item_check label="日没" name="Sunset"/>
 			<menu_item_check label="深夜" name="Midnight"/>
 			<menu_item_check label="共有�れ�環境を使用" name="Use Shared Environment"/>
 			<menu_item_separator/>
@@ -188,7 +188,7 @@
 			<menu_item_check label="�択ビームを表示�る" name="Show Selection Beam"/>
 			<menu_item_separator/>
 			<menu_item_check label="グリッド��" name="Snap to Grid"/>
-			<menu_item_call label="オブジェクト�ＸＹ軸をグリッド���" name="Snap Object XY to Grid"/>
+			<menu_item_call label="オブジェクト�XY軸をグリッド���" name="Snap Object XY to Grid"/>
 			<menu_item_call label="�択をグリッド�使用�る" name="Use Selection for Grid"/>
 			<menu_item_separator/>
 			<menu_item_call label="グリッドオプション…" name="Grid Options"/>
@@ -221,9 +221,9 @@
 		<menu_item_call label="��・プッシュ＆打撃" name="Bumps, Pushes &amp;amp; Hits"/>
 		<menu_item_call label="[APP_NAME]����" name="About Second Life"/>
 	</menu>
-	<menu label="æ‹¡å¼µ" name="Advanced">
+	<menu label="アド�ンス" name="Advanced">
 		<menu_item_call label="テクス�ャをリベーク�る" name="Rebake Texture"/>
-		<menu_item_call label="ＵＩサイズをデフォルト��る" name="Set UI Size to Default"/>
+		<menu_item_call label="UIサイズをデフォルト��る" name="Set UI Size to Default"/>
 		<menu_item_call label="ウィンドウサイズ設定…" name="Set Window Size..."/>
 		<menu_item_separator/>
 		<menu_item_check label="オブジェクト��択�離�制�" name="Limit Select Distance"/>
@@ -233,7 +233,7 @@
 		<menu_item_check label="スナップショットをディスク��存" name="QuietSnapshotsToDisk"/>
 		<menu_item_separator/>
 		<menu label="パフォーマンスツール" name="Performance Tools">
-			<menu_item_call label="�延メーター" name="Lag Meter"/>
+			<menu_item_call label="ラグメーター" name="Lag Meter"/>
 			<menu_item_check label="統計�ー" name="Statistics Bar"/>
 			<menu_item_call label="シーン負��統計情報" name="Scene Load Statistics"/>
 			<menu_item_check label="ア�ター�複雑度を表示" name="Avatar Draw Info"/>
@@ -262,7 +262,7 @@
 			<menu_item_check label="��" name="Rendering Type Bump"/>
 		</menu>
 		<menu label="レンダリング機能" name="Rendering Features">
-			<menu_item_check label="ＵＩ" name="ToggleUI"/>
+			<menu_item_check label="UI" name="ToggleUI"/>
 			<menu_item_check label="�択済" name="Selected"/>
 			<menu_item_check label="�イライト" name="Highlighted"/>
 			<menu_item_check label="動的テクス�ャ" name="Dynamic Textures"/>
@@ -313,7 +313,7 @@
 			<menu_item_separator/>
 			<menu_item_check label="カメラ" name="Camera"/>
 			<menu_item_check label="風" name="Wind"/>
-			<menu_item_check label="ＦＯＶ" name="FOV"/>
+			<menu_item_check label="FOV" name="FOV"/>
 			<menu_item_check label="�ッジ" name="Badge"/>
 		</menu>
 		<menu label="情報を表示" name="Display Info">
@@ -352,7 +352,7 @@
 		</menu>
 		<menu label="メタデータ��画" name="Render Metadata">
 			<menu_item_check label="�ウンディングボックス" name="Bounding Boxes"/>
-			<menu_item_check label="普通" name="Normals"/>
+			<menu_item_check label="法線" name="Normals"/>
 			<menu_item_check label="八分木" name="Octree"/>
 			<menu_item_check label="シャドウ円�" name="Shadow Frusta"/>
 			<menu_item_check label="実�" name="Physics Shapes"/>
@@ -363,7 +363,7 @@
 			<menu_item_check label="テクス�ャ優先度" name="Texture Priority"/>
 			<menu_item_check label="テクス�ャ�範囲" name="Texture Area"/>
 			<menu_item_check label="��" name="Face Area"/>
-			<menu_item_check label="ＬＯＤ情報" name="LOD Info"/>
+			<menu_item_check label="LOD情報" name="LOD Info"/>
 			<menu_item_check label="三角形�数" name="Triangle Count"/>
 			<menu_item_check label="制作・キュー" name="Build Queue"/>
 			<menu_item_check label="å…‰" name="Lights"/>
@@ -372,7 +372,7 @@
 			<menu_item_check label="ジョイント" name="Joints"/>
 			<menu_item_check label="レイキャスト" name="Raycast"/>
 			<menu_item_check label="風�ベクトル" name="Wind Vectors"/>
-			<menu_item_check label="彫刻" name="Sculpt"/>
+			<menu_item_check label="スカルプト" name="Sculpt"/>
 			<menu label="テクス�ャ�密度" name="Texture Density">
 				<menu_item_check label="無�" name="None"/>
 				<menu_item_check label="原行" name="Current"/>
@@ -389,10 +389,10 @@
 			<menu_item_check label="オブジェクト間�オクルージョン" name="Object-Object Occlusion"/>
 			<menu_item_separator/>
 			<menu_item_check label="高度�光�モデル" name="Advanced Lighting Model"/>
-			<menu_item_check label="　太陽・月・プロジェクタ�ら�影" name="Shadows from Sun/Moon/Projectors"/>
-			<menu_item_check label="　SSAO�影�スムージング" name="SSAO and Shadow Smoothing"/>
+			<menu_item_check label="   太陽・月・プロジェクタ�ら�影" name="Shadows from Sun/Moon/Projectors"/>
+			<menu_item_check label="   SSAO�影�スムージング" name="SSAO and Shadow Smoothing"/>
 			<menu_item_separator/>
-			<menu_item_check label="次回起動時�ＧＬをデ�ッグ" name="Debug GL"/>
+			<menu_item_check label="次回起動時�GL�デ�ッグを開始" name="Debug GL"/>
 			<menu_item_check label="パイプラインをデ�ッグ" name="Debug Pipeline"/>
 			<menu_item_check label="自動アルファマスク（�延）" name="Automatic Alpha Masks (deferred)"/>
 			<menu_item_check label="自動アルファマスク（�延��）" name="Automatic Alpha Masks (non-deferred)"/>
@@ -439,7 +439,7 @@
 			<menu_item_call label="リージョンオブジェクト�キャッシュをダンプ" name="Dump Region Object Cache"/>
 			<menu_item_call label="関心リスト：フルアップデート" name="Interest List: Full Update"/>
 		</menu>
-		<menu label="ＵＩ" name="UI">
+		<menu label="UI" name="UI">
 			<menu_item_call label="メディアブラウザ" name="Media Browser"/>
 			<menu_item_call label="インベントリ�出力" name="Dump Inventory"/>
 			<menu_item_call label="タイマーをダンプ" name="Dump Timers"/>
@@ -455,15 +455,15 @@
 			<menu_item_check label="デ�ッグキー" name="Debug Keys"/>
 			<menu_item_check label="WindowProc�デ�ッグ" name="Debug WindowProc"/>
 		</menu>
-		<menu label="ＸＵＩ" name="XUI">
+		<menu label="XUI" name="XUI">
 			<menu_item_call label="色�設定をリロード" name="Reload Color Settings"/>
 			<menu_item_call label="フォントテストを表示" name="Show Font Test"/>
-			<menu_item_check label="ＸＵＩ�を表示" name="Show XUI Names"/>
-			<menu_item_call label="テストＩＭを�信�る" name="Send Test IMs"/>
+			<menu_item_check label="XUI�を表示" name="Show XUI Names"/>
+			<menu_item_call label="テストIMを�信�る" name="Send Test IMs"/>
 			<menu_item_call label="��キャッシュをフラッシュ" name="Flush Names Caches"/>
 		</menu>
-		<menu label="ア�ター" name="Character">
-			<menu label="ベークドテクス�ャを�得�る" name="Grab Baked Texture">
+		<menu label="キャラクター" name="Character">
+			<menu label="ベイク済�テクス�ャを�得�る" name="Grab Baked Texture">
 				<menu_item_call label="çž³" name="Grab Iris"/>
 				<menu_item_call label="é ­" name="Grab Head"/>
 				<menu_item_call label="上�身" name="Grab Upper Body"/>
@@ -488,7 +488,7 @@
 			<menu_item_check label="見��るも�を表示�る" name="Show Look At"/>
 			<menu_item_check label="クリック��場所を表示�る" name="Show Point At"/>
 			<menu_item_check label="��部�アップデート�デ�ッグ" name="Debug Joint Updates"/>
-			<menu_item_check label="ＬＯＤを無効��る" name="Disable LOD"/>
+			<menu_item_check label="LODを無効��る" name="Disable LOD"/>
 			<menu_item_check label="キャラクターVis�デ�ッグ" name="Debug Character Vis"/>
 			<menu_item_check label="スケルトン���判定を表示�る" name="Show Collision Skeleton"/>
 			<menu_item_check label="ボーンを表示" name="Show Bones"/>
@@ -499,7 +499,7 @@
 			<menu_item_call label="ローカルテクス�ャをダンプ" name="Dump Local Textures"/>
 		</menu>
 		<menu_item_separator/>
-		<menu_item_check label="ＨＴＴＰテスク�ャ" name="HTTP Textures"/>
+		<menu_item_check label="HTTPテスク�ャ" name="HTTP Textures"/>
 		<menu_item_call label="圧縮画�" name="Compress Images"/>
 		<menu_item_call label="圧縮ファイルテスト" name="Compress File Test"/>
 		<menu_item_call label="Visual Leak Detectorを有効��る" name="Enable Visual Leak Detector"/>
@@ -517,14 +517,14 @@
 		<menu_item_call label="管�者ステータス解除" name="Leave Admin Options"/>
 		<menu_item_check label="管�者メニューを表示�る" name="View Admin Options"/>
 	</menu>
-	<menu label="管�" name="Admin">
+	<menu label="管�者" name="Admin">
 		<menu label="オブジェクト" name="AdminObject">
 			<menu_item_call label="コピーを�る" name="Admin Take Copy"/>
 			<menu_item_call label="自分を所有者��る" name="Force Owner To Me"/>
 			<menu_item_call label="所有者権��実行" name="Force Owner Permissive"/>
 			<menu_item_call label="削除" name="Delete"/>
 			<menu_item_call label="ロック" name="Lock"/>
-			<menu_item_call label="アセット�ＩＤを�得" name="Get Assets IDs"/>
+			<menu_item_call label="アセット�IDを�得" name="Get Assets IDs"/>
 		</menu>
 		<menu label="区画" name="Parcel">
 			<menu_item_call label="自分を所有者��る" name="Owner To Me"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
index 213a554bbd..2c13d50226 100644
--- a/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml
@@ -6,8 +6,8 @@
 	<menu_item_call label="触る" name="touch"/>
 	<menu_item_call label="脱�" name="take_off_or_detach"/>
 	<menu_item_call label="�り外�" name="detach"/>
-	<context_menu label="装�：" name="wearable_attach_to"/>
-	<context_menu label="ＨＵＤ�装�" name="wearable_attach_to_hud"/>
+	<context_menu label="装�" name="wearable_attach_to"/>
+	<context_menu label="HUD�装�" name="wearable_attach_to_hud"/>
 	<menu_item_call label="�り外�" name="take_off"/>
 	<menu_item_call label="編集" name="edit"/>
 	<menu_item_call label="アイテム�プロフィール" name="object_profile"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 123e95df04..9ec7a0de98 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -451,7 +451,7 @@ L$��足���る�����グループ��加�る�����
 	</notification>
 	<notification name="CreateGroupCost">��グループ作����る費用：L$ [COST]
 一人��グループ��ら�����永久�削除�れ������。
-４８時間以内�メン�ーを勧誘��入会��もら������。
+48時間以内�メン�ーを勧誘��入会��もら������。
     <tag>
 			group
 		</tag>
@@ -1260,7 +1260,7 @@ L$��足���る�����グループ��加�る�����
 			fail
 		</tag>
 	</notification>
-	<notification name="SoundFileInvalidTooLong">オーディオファイル�長����。（最大１�秒）：
+	<notification name="SoundFileInvalidTooLong">オーディオファイル�長����。（最大30秒）：
 [FILE]
     <tag>
 			fail
@@ -1411,7 +1411,7 @@ L$��足���る�����グループ��加�る�����
 			fail
 		</tag>
 	</notification>
-	<notification name="invalid_tport">テレ�ート�試行�１分間�６回���制��れ����。１分待���らも�一度テレ�ート��������。�題�解決���場���ログイン�直������。
+	<notification name="invalid_tport">テレ�ート�試行�1分間�6回���制��れ����。1分待���らも�一度テレ�ート��������。�題�解決���場���ログイン�直������。
     <tag>
 			fail
 		</tag>
@@ -1735,7 +1735,7 @@ L$��足���る�����グループ��加�る�����
 		</tag>
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">�����[SECOND_LIFE]�らログアウト�れ�������。[MESSAGE]
-    <usetemplate name="okcancelbuttons" notext="終了" yestext="ＩＭ��ャット"/>
+    <usetemplate name="okcancelbuttons" notext="終了" yestext="IM &amp; �ャットを見る"/>
 	</notification>
 	<notification name="InventoryUnusable">インベントリ�読�込�中��題�発生����。���ログアウト���度ログイン�直��������。
 ��メッセージ��度表示�れる場���サ�ート�連絡���題を解決������。
@@ -2126,7 +2126,7 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
 				HUDComplexityWarning
 			</context>
 		</unique>
-		<usetemplate ignoretext="ＨＵＤ�複雑��る場��警告" name="notifyignore"/>
+		<usetemplate ignoretext="HUD�複雑��る場��警告" name="notifyignore"/>
 	</notification>
 	<notification name="FirstRun">[APP_NAME]�インストール�完了����。
 [SECOND_LIFE]を使�������場���ログイン�る��アカウント�作�を行������。
@@ -2162,7 +2162,7 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
 		</form>
 	</notification>
 	<notification name="WelcomeChooseSex">�も�������ア�ター�表示�れ��。矢�キーを使用��歩���。
-ヘルプ�必����や�[SECOND_LIFE]����知り������Ｆ１キーを押������。
+ヘルプ�必����や�[SECOND_LIFE]����知り������F1キーを押������。
 男性�る��女性�ア�ターを�択������。��設定�後�変更����。
     <tag>
 			confirm
@@ -2189,8 +2189,8 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
 発行元：[ISSUER_NAME_STRING]
 有効日：[VALID_FROM]
 次�更新日：[VALID_TO]
-ＭＤ５フィンガープリント：[SHA1_DIGEST]
-ＳＨＡ１フィンガープリント：[MD5_DIGEST]
+MD5フィンガープリント：[SHA1_DIGEST]
+SHA1フィンガープリント：[MD5_DIGEST]
 キー使用法：[KEYUSAGE] 
 拡張キー使用法：[EXTENDEDKEYUSAGE]
 サブジェクトキー�識別�：[SUBJECTKEYIDENTIFIER]
@@ -2201,15 +2201,15 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
 	</notification>
 	<notification name="TrustCertificateError">��サー�ー��証機関��明��。
 �証情報：
-　サブジェクト�：[SUBJECT_NAME_STRING]
-　発行元：[ISSUER_NAME_STRING]
-　有効日：[VALID_FROM]
-　次�更新日：[VALID_TO]
-　ＭＤ５フィンガープリント：[SHA1_DIGEST] 
-　ＳＨＡ１フィンガープリント：[MD5_DIGEST]
-　キー使用法：[KEYUSAGE] 
-　拡張キー使用法：[EXTENDEDKEYUSAGE] 
-　サブジェクトキー�識別�：[SUBJECTKEYIDENTIFIER] 
+サブジェクト�：[SUBJECT_NAME_STRING]
+発行元：[ISSUER_NAME_STRING]
+有効日：[VALID_FROM]
+次�更新日：[VALID_TO]
+MD5フィンガープリント：[SHA1_DIGEST] 
+SHA1フィンガープリント：[MD5_DIGEST]
+キー使用法：[KEYUSAGE] 
+拡張キー使用法：[EXTENDEDKEYUSAGE] 
+サブジェクトキー�識別�：[SUBJECTKEYIDENTIFIER] 
 
 ���証局を信頼����？
     <tag>
@@ -2232,7 +2232,7 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
 		[NAME]��オブジェクトを編集�る権�を�り消�れ���。
 	</notification>
 	<notification name="FlushMapVisibilityCaches">��リージョン�マップ�キャッシュを消去���。デ�ッグ目的���便利��作��。
-（作�中�５分経��る��全員�マップ��度ログイン後�更新�れ��）
+（作�中�5分経��る��全員�マップ��度ログイン後�更新�れ��）
     <tag>
 			fail
 		</tag>
@@ -2281,7 +2281,7 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
 テクス�ャ��24ビット�512✕512以下�画�を�択��「�用�ボタンを�度クリック������。
 	</notification>
 	<notification name="RawUploadStarted">
-		アップロードを開始����。接続速度�よ����最大２分程度��り��。
+		アップロードを開始����。接続速度�よ����最大2分程度��り��。
 	</notification>
 	<notification name="ConfirmBakeTerrain">�在�地形を構築�よ�������。���作を行���在�地形��土地�隆起�沈��制�範囲�基準��り�「復元�ツール�デフォルト��り��。�作を続行����？
     <tag>
@@ -2606,7 +2606,7 @@ OKをクリック���ダウンロード�インストールを開始��
 		</tag>
 		<form name="form">
 			<input name="message">
-				����フリーズ�れ����。動���も�ャット�る��も����ん。管�者�ＩＭ�����連絡���。
+				����フリーズ�れ����。動���も�ャット�る��も����ん。管�者�IM�����連絡���。
 			</input>
 			<button name="ＯＫ" text="ＯＫ"/>
 			<button name="Cancel" text="キャンセル"/>
@@ -3150,19 +3150,19 @@ https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83
 			fail
 		</tag>
 	</notification>
-	<notification name="UnableToLoadNotecardAsset">�在ノートカード�アセットＩＤを読�込む�������ん。
+	<notification name="UnableToLoadNotecardAsset">�在ノートカード�アセットIDを読�込む�������ん。
     <tag>
 			fail
 		</tag>
 		<usetemplate name="okbutton" yestext="ＯＫ"/>
 	</notification>
-	<notification name="NotAllowedToViewNotecard">�求��アセットＩＤ�関�るノートカードを閲覧�る���権����分��。
+	<notification name="NotAllowedToViewNotecard">�求��アセットID�関�るノートカードを閲覧�る���権����分��。
     <tag>
 			fail
 		</tag>
 		<usetemplate name="okbutton" yestext="ＯＫ"/>
 	</notification>
-	<notification name="MissingNotecardAssetID">ノートカード用�アセットＩＤ�データベース�登録�れ����ん。
+	<notification name="MissingNotecardAssetID">ノートカード用�アセットID�データベース�登録�れ����ん。
     <tag>
 			fail
 		</tag>
@@ -3189,7 +3189,7 @@ https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83
 		</tag>
 		<usetemplate canceltext="キャンセル" name="yesnocancelbuttons" notext="���" yestext="��"/>
 	</notification>
-	<notification label="�起動を確�" name="ConfirmRestart">��リージョンを２分後��起動�よ�������。����続��もよ������？
+	<notification label="�起動を確�" name="ConfirmRestart">��リージョンを2分後��起動�よ�������。����続��もよ������？
     <tag>
 			confirm
 		</tag>
@@ -3489,7 +3489,7 @@ https://community.secondlife.com/knowledgebase/%E6%97%A5%E6%9C%AC%E8%AA%9E%E3%83
 
 ⑴嫌�ら��報告�手順。居�者��[SECOND_LIFE]権�システムを悪用���る���れる場�（�����CopyBot����様�コピーツールを使用���知的財産権を侵害���る���れる場�）���正使用報告を�出�る�������。�正行為�ーム��[SECOND_LIFE][http://secondlife.com/corporate/tos.php 利用�約]や�[http://jp.secondlife.com/corporate/cs.php コミュニティ・スタンダード]����る行為を調査������る行為�対�る�切�処罰を下���。����担当�ーム�[SECOND_LIFE]�世界�らコンテンツを削除��欲�����リクエスト��応���ん。
 
-⑵DMCA ���コンテンツ削除プロセス。[SECOND_LIFE]�らコンテンツ�削除をリクエスト�る���[https://www.lindenlab.com/legal/intellectual-property-infringement-notification-policy ＤＣＭＡ�リシー]��定�れ��る有効�権利侵害通知を�出�る必���り��。
+⑵DMCA ���コンテンツ削除プロセス。[SECOND_LIFE]�らコンテンツ�削除をリクエスト�る���[https://www.lindenlab.com/legal/intellectual-property-infringement-notification-policy DMCA�リシー]��定�れ��る有効�権利侵害通知を�出�る必���り��。
 
 ����嫌�ら��報告を続���場�����ウィンドウを閉��報告��信を完了������。特定�カテゴリ「コピー Bot ��権��悪用�を�択�る必���る場���り��。
 
@@ -3578,7 +3578,7 @@ Linden Lab
 		</tag>
 		<usetemplate name="okcancelbuttons" notext="キャンセル" yestext="��"/>
 	</notification>
-	<notification name="ConfirmClearMediaUrlList">�存�れ�ＵＲＬ�リストを消去���。�����リストを消去��もよ������？
+	<notification name="ConfirmClearMediaUrlList">�存�れ�URL�リストを消去���。�����リストを消去��もよ������？
     <tag>
 			confirm
 		</tag>
@@ -3669,10 +3669,10 @@ Webページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã‚
 	<notification name="AutoWearNewClothing">作��る�装を自動的�装�����？
     <usetemplate ignoretext="「容姿�を編集中��作��る�装を装��る��" name="okcancelignore" notext="���" yestext="��"/>
 	</notification>
-	<notification name="NotAgeVerified">訪��よ�����る場所��１８歳以上��人�制��れ����。
+	<notification name="NotAgeVerified">訪��よ�����る場所��18歳以上��人�制��れ����。
     <usetemplate ignoretext="年齢制�付��エリアを訪��る年齢�������ん。" name="okignore" yestext="ＯＫ"/>
 	</notification>
-	<notification name="NotAgeVerified_Notify">��場所��入場��１８歳以上�制��れ����。
+	<notification name="NotAgeVerified_Notify">��場所��入場��18歳以上�制��れ����。
     <tag>
 			fail
 		</tag>
@@ -3708,7 +3708,7 @@ Webページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã‚
 	<notification name="ReplacedMissingWearable">
 		欠����る�装や身体部�をデフォルト�置�����。
 	</notification>
-	<notification name="GroupNotice">件�：[SUBJECT]　メッセージ：[MESSAGE]
+	<notification name="GroupNotice">件�：[SUBJECT] メッセージ：[MESSAGE]
     <tag>
 			group
 		</tag>
@@ -3726,7 +3726,7 @@ Webページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã‚
 	</notification>
 	<notification name="UploadingAuctionSnapshot">
 		インワールド�Webサイト�スナップショットをアップロード中��…
-（所�時間：約５分）
+（所�時間：約5分）
 	</notification>
 	<notification name="UploadPayment">アップロード�L$ [AMOUNT]支払����。
     <tag>
@@ -3774,7 +3774,7 @@ Webページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã‚
 		</tag>
 	</notification>
 	<notification name="IMAcrossParentEstates">
-		親�動産間���ＩＭを�信����ん。
+		親�動産間���IMを�信����ん。
 	</notification>
 	<notification name="TransferInventoryAcrossParentEstates">
 		親�動産間�インベントリを移動�る�������ん。
@@ -3855,7 +3855,7 @@ Webページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã‚
 		[NAME]��インベントリ��供を断り���。
 	</notification>
 	<notification name="ObjectMessage">
-		[NAME]：[MESSAGE]
+		[NAME]: [MESSAGE]
 	</notification>
 	<notification name="CallingCardAccepted">
 		コーリングカード����れ���。
@@ -3870,7 +3870,7 @@ Webページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã‚
 （���作��ランドマークをダブルクリック�る���クリック��「テレ�ート�を�択��実行�る��も����。）
 	</notification>
 	<notification name="TeleportToPerson">
-		誰���プライベート�会話を開����相手�ア�ターをクリック���メニュー�ら「ＩＭ�を�択���。
+		誰���プライベート�会話を開����相手�ア�ターをクリック���メニュー�ら「IM�を�択���。
 	</notification>
 	<notification name="CantSelectLandFromMultipleRegions">サー�ー�境界を越��土地を�択�る������ん。
 も�����土地を�択������。
@@ -4000,14 +4000,14 @@ Webページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã‚
     <unique/>
 		<usetemplate name="okbutton" yestext="リージョン��構築"/>
 	</notification>
-	<notification name="DynamicPathfindingDisabled">��リージョン（地域）�����動的経路探索�有効�������ん。経路探索ＬＳＬ呼�出�を使用�るスクリプト�入��オブジェクト����リージョン�期待��り�動作����能性��り��。
+	<notification name="DynamicPathfindingDisabled">��リージョン（地域）�����動的経路探索�有効�������ん。経路探索LSL呼�出�を使用�るスクリプト�入��オブジェクト����リージョン�期待��り�動作����能性��り��。
     <unique/>
 	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">エラー�発生����。�ットワーク���サー�ー��題��る��制作�る権�����能性��り��。���題��一度ログアウト���ら�ログイン�直��解決�れる場���り��。
     <unique/>
 		<usetemplate name="okbutton" yestext="ＯＫ"/>
 	</notification>
-	<notification name="SeeAvatars">��区画��るア�ターや��区画内�行�れる文字�ャット��他�区画�ら見���ん。��������区画外��る�人�見���外��人������姿�見���ん。�ャン�ル���通常�文字�ャットもブロック�れ��。
+	<notification name="SeeAvatars">��区画��るア�ターや��区画内�行�れる文字�ャット��他�区画�ら見���ん。��������区画外��る�人�見���外��人������姿�見���ん。�ャン�ル0��通常�文字�ャットもブロック�れ��。
     <unique/>
 	</notification>
 	<notification name="ScriptsStopped">
@@ -4048,12 +4048,12 @@ Webページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã‚
 			fail
 		</tag>
 	</notification>
-	<notification name="MustGetAgeRegion">��リージョン（地域）�入る���１８歳以上��る必���り��。
+	<notification name="MustGetAgeRegion">��リージョン（地域）�入る���18歳以上��る必���り��。
     <tag>
 			fail
 		</tag>
 	</notification>
-	<notification name="MustGetAgeParcel">��区画�入る���１８歳以上��る必���り��。
+	<notification name="MustGetAgeParcel">��区画�入る���18歳以上��る必���り��。
     <tag>
 			fail
 		</tag>
@@ -4296,7 +4296,7 @@ Webページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã‚
 		</tag>
 	</notification>
 	<notification name="OfferCallingCard">[NAME]��コーリングカードを渡��������。
-����インベントリ�ブックマーク�追加�れ����人�素早�ＩＭを�る�������。
+����インベントリ�ブックマーク�追加�れ����人�素早�IMを�る�������。
     <tag>
 			friendship
 		</tag>
@@ -4317,7 +4317,7 @@ Webページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã‚
 
 [MESSAGE]
 
-�信元�オブジェクト：&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;　所有者：[NAME_SLURL]
+�信元�オブジェクト：&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt; 所有者：[NAME_SLURL]
     <tag>
 			confirm
 		</tag>
@@ -4457,7 +4457,7 @@ Webページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã‚
 	</notification>
 	<notification name="BuyLindenDollarSuccess">�支払�り��������。
 
-����L$残高��処��完了�る�アップデート�れ��。処��２�分以上����場����り引��キャンセル�れる����り��。��場���購入金������ US$残高�追加�れ��。 [https://secondlife.com/my/account/?lang=ja-JP マイアカウント]��引履歴ページ��支払状�を確�����。
+����L$残高��処��完了�る�アップデート�れ��。処��20分以上����場����り引��キャンセル�れる����り��。��場���購入金������ US$残高�追加�れ��。 [https://secondlife.com/my/account/?lang=ja-JP マイアカウント]��引履歴ページ��支払状�を確�����。
     <tag>
 			funds
 		</tag>
@@ -4745,11 +4745,11 @@ Webページã�«ãƒªãƒ³ã‚¯ã�™ã‚‹ã�¨ã€�他人ã�Œã�“ã�®å ´æ‰€ã�«ç°¡å�˜ã�«ã‚¢ã‚¯ã‚»ã‚
 			<button name="respondbutton" text="返答"/>
 		</form>
 	</notification>
-	<notification name="ConfirmCloseAll">����ＩＭを閉����？
+	<notification name="ConfirmCloseAll">����IMを閉����？
     <tag>
 			confirm
 		</tag>
-		<usetemplate ignoretext="����ＩＭを閉�る��確�" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+		<usetemplate ignoretext="����IMを閉�る��確�" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
 	</notification>
 	<notification name="AttachmentSaved">
 		装�物��存�れ���。
@@ -5075,7 +5075,7 @@ UDP：3478, 3479, 5060, 5062, 6250, 12000-32000
 		メモリプール残��少��������。クラッシュを��る��[APP_NAME]�機能�一部�無効��り���。他�アプリケーションを終了��状��継続����発�る場���Second Lifeを�起動������。
 	</notification>
 	<notification name="ForceQuitDueToLowMemory">
-		メモリ�足���３�秒以内�[APP_NAME]�終了���。
+		メモリ�足���30秒以内�[APP_NAME]�終了���。
 	</notification>
 	<notification name="SOCKS_NOT_PERMITTED">ルールセット�よ��許��れ�������SOCKS 5プロキシ"[HOST]:[PORT]"�接続を拒絶����。
     <tag>
@@ -5275,7 +5275,7 @@ UDP：3478, 3479, 5060, 5062, 6250, 12000-32000
 		<tag>
 			confirm
 		</tag>
-		<usetemplate ignoretext="ＵＩを�表示��確�" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
+		<usetemplate ignoretext="UIを�表示��確�" name="okcancelignore" notext="キャンセル" yestext="ＯＫ"/>
 	</notification>
 	<notification name="PathfindingLinksets_WarnOnPhantom">�択�れ�一部�リンクセット�ファントムフラグ�切り替�られ��。
   
@@ -6220,7 +6220,7 @@ UDP：3478, 3479, 5060, 5062, 6250, 12000-32000
 			fail
 		</tag>
 	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">�択�れ�最��１�個�オブジェクト���無効��れ���。必��応���リフレッシュ���択内容を追加������。
+	<notification name="TenObjectsDisabledPlzRefresh">�択�れ�最��10個�オブジェクト���無効��れ���。必��応���リフレッシュ���択内容を追加������。
     <tag>
 			fail
 		</tag>
@@ -6638,9 +6638,9 @@ UDP：3478, 3479, 5060, 5062, 6250, 12000-32000
 			fail
 		</tag>
 	</notification>
-	<notification name="CompressionTestResults">サイズ[SIZE]㎅�ファイル[FILE]をgzip�レベル６�圧縮��テスト�果：
-圧縮：[PACK_TIME]秒　[PSIZE]㎅
-解�：[UNPACK_TIME]秒　[USIZE]㎅
+	<notification name="CompressionTestResults">サイズ[SIZE]㎅�ファイル[FILE]をgzip�レベル6�圧縮��テスト�果：
+圧縮：[PACK_TIME]秒 [PSIZE]㎅
+解�：[UNPACK_TIME]秒 [USIZE]㎅
     <tag>
 			fail
 		</tag>
@@ -6674,7 +6674,7 @@ UDP：3478, 3479, 5060, 5062, 6250, 12000-32000
 		</tag>
 		<usetemplate name="okbutton" yestext="ＯＫ"/>
 	</notification>
-	<notification name="RiggedMeshAttachedToHUD">ＨＵＤ�イント「[POINT]��アタッ��れ�オブジェクト「[NAME]���リグメッシュ���れ����。
+	<notification name="RiggedMeshAttachedToHUD">HUD�イント「[POINT]��アタッ��れ�オブジェクト「[NAME]���リグメッシュ���れ����。
 
 リグメッシュオブジェクト��ア�ター��り付�るよ��設計�れ����。�������オブジェクト�表示�れ����他�人��表示�れ��ん。
 
@@ -6682,9 +6682,9 @@ UDP：3478, 3479, 5060, 5062, 6250, 12000-32000
     <tag>
 			confirm
 		</tag>
-		<usetemplate ignoretext="リグメッシュ�ＨＵＤ�イント�アタッ��れ��る場��警告���。" name="okignore" yestext="ＯＫ"/>
+		<usetemplate ignoretext="リグメッシュ�HUD�イント�アタッ��れ��る場��警告���。" name="okignore" yestext="ＯＫ"/>
 	</notification>
-	<notification name="EnableAutoFPSWarning" type="alertmodal">自動ＦＰＳを有効��よ�������。�存�れ����グラフィック設定����失�れ��。
+	<notification name="EnableAutoFPSWarning" type="alertmodal">自動FPSを有効��よ�������。�存�れ����グラフィック設定����失�れ��。
 
 ���れらを�存����？
     <tag>
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
index b920a0a8f7..848e3d2f33 100644
--- a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
@@ -24,7 +24,7 @@
 	<icon name="hovered_icon"/>
 	<icon name="selected_icon"/>
 	<text name="avatar_name" value="（読�込ん����）"/>
-	<text name="last_interaction" value="�秒"/>
+	<text name="last_interaction" value="0秒"/>
 	<icon name="permission_edit_theirs_icon" tool_tip="��フレンド�オブジェクトを編集�る�������。"/>
 	<icon name="permission_edit_mine_icon" tool_tip="��フレンド������オブジェクトを編集・削除・�得�る�������。"/>
 	<icon tool_tip="��フレンド�マップ上������置を表示����。" name="permission_map_icon"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
index 156f475fc6..56b6e88c7b 100644
--- a/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="clothing_list_button_bar_panel">
-	<button label="追加＋" name="add_btn"/>
+	<button label="追加 +" name="add_btn"/>
 	<button name="clothing_shop_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_edit_universal.xml b/indra/newview/skins/default/xui/ja/panel_edit_universal.xml
index fd5fe80848..6d6ee5622f 100644
--- a/indra/newview/skins/default/xui/ja/panel_edit_universal.xml
+++ b/indra/newview/skins/default/xui/ja/panel_edit_universal.xml
@@ -10,9 +10,9 @@
 			<texture_picker label="目�タトゥ" name="Eyes Tattoo" tool_tip="クリック��画�を�択�る"/>
 			<texture_picker label="左腕�タトゥ" name="Left Arm Tattoo" tool_tip="クリック��画�を�択�る"/>
 			<texture_picker label="左脚�タトゥ" name="Left Leg Tattoo" tool_tip="クリック��画�を�択�る"/>
-			<texture_picker label="予備１�タトゥ" name="Aux1 Tattoo" tool_tip="クリック��画�を�択�る"/>
-			<texture_picker label="予備２�タトゥ" name="Aux2 Tattoo" tool_tip="クリック��画�を�択�る"/>
-			<texture_picker label="予備３�タトゥ" name="Aux3 Tattoo" tool_tip="クリック��画�を�択�る"/>
+			<texture_picker label="予備1�タトゥ" name="Aux1 Tattoo" tool_tip="クリック��画�を�択�る"/>
+			<texture_picker label="予備2�タトゥ" name="Aux2 Tattoo" tool_tip="クリック��画�を�択�る"/>
+			<texture_picker label="予備3�タトゥ" name="Aux3 Tattoo" tool_tip="クリック��画�を�択�る"/>
 			<color_swatch label="色�明暗" name="Color/Tint" tool_tip="クリック��カラーピッカーを開���"/>
 		</panel>
 	</scroll_container>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml b/indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml
index 962d69c67c..27d9b088cb 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml
@@ -4,7 +4,7 @@
 		（読�込ん����…）
 	</panel.string>
 	<panel.string name="ban_selection_too_large">
-		グループ��ン��信�れ����ん：�択���人�多����。グループ��立入�止�数�１リクエスト当�り１��人�制��れ����。
+		グループ��ン��信�れ����ん：�択���人�多����。グループ��立入�止�数�1リクエスト当�り100人�制��れ����。
 	</panel.string>
 	<panel.string name="ban_not_permitted">
 		グループ��ン��信�れ����ん：「立入�止リスト�管���能力��り��ん。
diff --git a/indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
index 42e3b0050e..5e5fbfff9f 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
@@ -53,7 +53,7 @@
         </layout_panel>
 			</layout_stack>
 			<text name="info_deletion">
-				注：４８時間メン�ー�２人未満�グループ��自動的�解散�れ��。
+				注：48時間メン�ー�2人未満�グループ��自動的�解散�れ��。
 			</text>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_invite.xml b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
index 85f0cba760..1177d5930d 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
@@ -11,7 +11,7 @@
 	</panel.string>
 	<panel.string name="invite_selection_too_large">
 		グループ��招待��信�れ����ん：�択�れ��人�多����。
-グループ��招待�１回�リクエスト��り１��人�制��れ����。
+グループ��招待�1回�リクエスト��り100人�制��れ����。
 	</panel.string>
 	<text name="help_text">
 		グループ��一度�複数��人を招待�る�������。「リスト�ら�人を�択�をクリック������。
diff --git a/indra/newview/skins/default/xui/ja/panel_group_notices.xml b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
index ebde7f9944..8045c26724 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_notices.xml
@@ -9,8 +9,8 @@
 		�去�通知��り��ん
 	</panel.string>
 	<text name="lbl2">
-		通知�１４日間�存�れ��。
-１日�制�数�２��通��。
+		通知�14日間�存�れ��。
+1日�制�数�200通��。
 	</text>
 	<scroll_list name="notice_list">
 		<scroll_list.columns label="" name="icon"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_roles.xml b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
index bd16e3e986..1a063a3592 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_roles.xml
@@ -30,7 +30,7 @@ Ctrlキーを押ã�—ã�ªã�Œã‚‰ã€�メンãƒ�ーå��をクリックã�™ã‚‹ã�“ã�¨ã�§è¤‡æ
 			<panel.string name="help_text">
 				役割���タイトル�許��れ�能力�割り当�られ����。
 メン�ー�１�以上�役割を���������。
-グループ�使�る役割�１�個����「全員（Everyone）��「所有者（Owner）���れ���れ����。
+グループ�使�る役割�10個����「全員（Everyone）��「所有者（Owner）���れ���れ����。
 			</panel.string>
 			<panel.string name="cant_delete_role">
 				「全員（Everyone）��「所有者（Owner）��役割�削除�る�������ん。
diff --git a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
index c95320e53a..4055e23d9f 100644
--- a/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/ja/panel_landmark_info.xml
@@ -16,7 +16,7 @@
 		���置�情報��アクセス制�����利用������ん。許������区画所有者�����������。
 	</string>
 	<string name="acquired_date">
-		[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日（[wkday,datetime,local]）　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]
+		[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日（[wkday,datetime,local]） [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
 	</string>
 	<string name="icon_PG" value="Parcel_PG_Dark"/>
 	<string name="icon_M" value="Parcel_M_Dark"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
index 5b5116a05d..c75fd8b1ca 100644
--- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
@@ -19,7 +19,7 @@
                 <item label="��" name="Name" value="search_by_name"/>
                 <item label="制作者" name="Creator" value="search_by_creator"/>
                 <item label="説明" name="Description" value="search_by_description"/>
-                <item label="ＵＵＩＤ" name="UUID" value="search_by_UUID"/>
+                <item label="UUID" name="UUID" value="search_by_UUID"/>
             </combo_box>
             <menu_button tool_tip="検索表示オプションを表示" name="options_visibility_btn"/>
             <filter_editor label="検索用語を入力�る" name="inventory search editor"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
index 5d984cb58c..39d9863a0a 100644
--- a/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_media_settings_general.xml
@@ -28,7 +28,7 @@
 		サイズ：
 	</text>
 	<text name="X_label">
-		Ｘ
+		X
 	</text>
 	<spinner label="" name="height_pixels"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
index 08edb447cb..7c7ce83a01 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="nearby_chat">
-	<line_editor label="��をクリック���ャットを開始���。" name="chat_box" tool_tip="Enterキー�発言��Ctrl＋Enterキー�シャウト���。"/>
+	<line_editor label="��をクリック���ャットを開始���。" name="chat_box" tool_tip="Enterキー�発言��Ctrl+Enterキー�����。"/>
 	<button name="show_nearby_chat" tool_tip="近隣�ャットログを表示��表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
index 1093624cda..9c3b51adb9 100644
--- a/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/ja/panel_nearby_media.xml
@@ -19,8 +19,8 @@
 		<button label="����止" name="all_nearby_media_disable_btn" tool_tip="近隣�メディアを���オフ����"/>
 		<button label="���開始" name="all_nearby_media_enable_btn" tool_tip="近隣�メディアを���オン����"/>
 		<button name="open_prefs_btn" tool_tip="メディア�設定を開���"/>
-		<button label="詳細　≫" label_selected="≪　簡易" name="more_btn" tool_tip="拡張コントロール"/>
-		<button label="詳細　≫" label_selected="≪　簡易" name="less_btn" tool_tip="拡張コントロール"/>
+		<button label="詳細 &gt;&gt;" label_selected="&lt;&lt; 簡易" name="more_btn" tool_tip="拡張コントロール"/>
+		<button label="詳細 &gt;&gt;" label_selected="&lt;&lt; 簡易" name="less_btn" tool_tip="拡張コントロール"/>
 	</panel>
 	<panel name="nearby_media_panel">
 		<text name="nearby_media_title">
diff --git a/indra/newview/skins/default/xui/ja/panel_notification_list_item.xml b/indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
index 00733bf79d..f1fa54d14e 100644
--- a/indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
@@ -40,7 +40,7 @@
 									<text name="sender_or_fee_box">
 										�信者：�民 �ゅ��ん
 									</text>
-									<text name="notification_time" value="2014年12月24日　23：30"/>
+									<text name="notification_time" value="2014年12月24日 23:30"/>
 								</panel>
 							</panel>
 						</layout_panel>
@@ -76,7 +76,7 @@
 									<text name="sender_or_fee_box_exp">
 										�信者：�民 �ゅ��ん
 									</text>
-									<text name="notification_time_exp" value="2014年12月24日　23：30"/>
+									<text name="notification_time_exp" value="2014年12月24日 23:30"/>
 								</panel>
 								<panel name="notification_text_panel_exp">
 									<chat_editor name="notification_text_exp">
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index 516ee3c7d2..fbdaa319a2 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -19,7 +19,7 @@
 	<string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリック�テレ�ート。Shift�ドラッグ�水平・垂直移動）"/>
 	<string name="GroupCountWithInfo" value="�����在�[COUNT]グループ�属�����。��[REMAINING]グループ��加�る�������。[secondlife:/// 上�を増や�]"/>
 	<tab_container name="tabs">
-		<panel label="近隣" name="nearby_panel">
+		<panel label="近�" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">
 				<filter_editor label="人物をフィルタ" name="nearby_filter_input"/>
 				<button name="gear_btn" tool_tip="�択��人物�対�るアクション"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_performance_autoadjustments.xml b/indra/newview/skins/default/xui/ja/panel_performance_autoadjustments.xml
index 3a0eeae6d5..fdbfca64ce 100644
--- a/indra/newview/skins/default/xui/ja/panel_performance_autoadjustments.xml
+++ b/indra/newview/skins/default/xui/ja/panel_performance_autoadjustments.xml
@@ -24,12 +24,12 @@
 		<combo_box.item label="ア�ター�ワールド" name="av_and_scene" value="1"/>
 		<combo_box.item label="ワールド��" name="scene_only" value="2"/>
 	</combo_box>
-	<button label="今��自動調整" name="start_autotune" tool_tip="ビューアー��目標ＦＰＳを満��よ��設定�調整�れる���止���。"/>
+	<button label="今��自動調整" name="start_autotune" tool_tip="ビューアー��目標FPSを満��よ��設定�調整�れる���止���。"/>
 	<button label="キャンセル" name="stop_autotune" tool_tip="自動調整を中断���。"/>
 	<text name="wip_desc">
 		調整中��…
 	</text>
-	<check_box label="継続的�調整�る" name="AutoTuneContinuous" tool_tip="ビューアー����フローター�閉����も�止�る���目標ＦＰＳを満��よ��設定を継続的�調整���。">
+	<check_box label="継続的�調整�る" name="AutoTuneContinuous" tool_tip="ビューアー����フローター�閉����も�止�る���目標FPSを満��よ��設定を継続的�調整���。">
   </check_box>
 	<radio_group name="autotune_lock_type">
 		<radio_item label="��ログインセッション��" name="one_session_lock" value="0"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_performance_huds.xml b/indra/newview/skins/default/xui/ja/panel_performance_huds.xml
index 51d9e73540..2d53d74d0d 100644
--- a/indra/newview/skins/default/xui/ja/panel_performance_huds.xml
+++ b/indra/newview/skins/default/xui/ja/panel_performance_huds.xml
@@ -5,13 +5,13 @@
 		戻る
 	</text>
 	<text name="huds_title">
-		アクティブ�ＨＵＤ
+		アクティブ�HUD
 	</text>
 	<text name="huds_desc1">
-		使用�����ＨＵＤを�り外��メモリ�節約�れ�Second Life�処��高速化�れ��。
+		使用�����HUDを�り外��メモリ�節約�れ�Second Life�処��高速化�れ��。
 	</text>
 	<text name="huds_desc2">
-		注�：ＨＵＤ�最�化ボタンを使用��も�ＨＵＤを�り外�������り��ん。
+		注�：HUD�最�化ボタンを使用��も�HUDを�り外�������り��ん。
 	</text>
 	<name_list name="hud_list">
 		<name_list.columns label="" name="complex_visual"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml b/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml
index 40e7800adc..2e165b11b6 100644
--- a/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml
+++ b/indra/newview/skins/default/xui/ja/panel_performance_preferences.xml
@@ -7,7 +7,7 @@
 	<text name="settings_title">
 		グラフィック設定
 	</text>
-	<button label="拡張設定を開�" name="advanced_btn"/>
+	<button label="詳細設定を開�" name="advanced_btn"/>
 	<button label="推奨設定�リセット" name="defaults_btn"/>
 	<view_border name="border0"/>
 	<text name="quality_lbl">
@@ -40,7 +40,7 @@
 	</text>
 	<slider name="draw_distance"/>
 	<text name="draw_distance_m">
-		�
+		m
 	</text>
 	<text name="farther_lbl">
 		�景
@@ -58,7 +58,7 @@
 	<check_box label="大気（周辺）シェーダー" name="atmospheric_shaders"/>
 	<check_box label="高度�光�モデル" name="advanced_lighting_model"/>
 	<text name="RenderShadowDetailText">
-		影：
+		å½±
 	</text>
 	<combo_box name="ShadowDetail">
 		<combo_box.item label="��" name="0" value="0"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_place_profile.xml b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
index 21843e4420..5bd1611a2e 100644
--- a/indra/newview/skins/default/xui/ja/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/ja/panel_place_profile.xml
@@ -39,7 +39,7 @@
 		��場所�情報��アクセス制�����利用������ん。許������区画所有者�����������。
 	</string>
 	<string name="acquired_date">
-		[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]
+		[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
 	</string>
 	<button name="back_btn" tool_tip="戻る"/>
 	<text name="title" value="場所�プロフィール"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
index 6373eadabc..f74059e7f1 100644
--- a/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
+++ b/indra/newview/skins/default/xui/ja/panel_postcard_settings.xml
@@ -2,9 +2,9 @@
 <panel name="panel_postcard_settings">
 	<combo_box label="解�度" name="postcard_size_combo">
 		<combo_box.item label="�在�ウィンドウ" name="CurrentWindow"/>
-		<combo_box.item label="６４�✕４８�" name="640x480"/>
-		<combo_box.item label="８��✕６��" name="800x600"/>
-		<combo_box.item label="１�２４✕７６８" name="1024x768"/>
+		<combo_box.item label="640x480" name="640x480"/>
+		<combo_box.item label="800x600" name="800x600"/>
+		<combo_box.item label="1024x768" name="1024x768"/>
 		<combo_box.item label="カスタム" name="Custom"/>
 	</combo_box>
 	<spinner label="横幅✕高�" name="postcard_snapshot_width"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
index 40998f8035..72da378efb 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="æ‹¡å¼µ" name="advanced">
+<panel label="アド�ンス" name="advanced">
 	<panel.string name="aspect_ratio_text">
-		[NUM]：[DEN]
+		[NUM]:[DEN]
 	</panel.string>
 	<text name="Cache:">
 		キャッシュ：
@@ -17,19 +17,19 @@
 	<button label="�照" label_selected="�照" name="set_cache"/>
 	<button label="デフォルト�場所" label_selected="デフォルト�場所" name="default_cache_location"/>
 	<text name="UI Size:">
-		ＵＩ�サイズ：
+		UI�サイズ：
 	</text>
 	<text name="HUD Size:">
-		ＨＵＤ�スケール：
+		HUD�スケール：
 	</text>
-	<check_box label="スクリプト�エラーを表示：" name="show_script_errors"/>
+	<check_box label="スクリプト�エラーを表示:" name="show_script_errors"/>
 	<radio_group name="show_location">
 		<radio_item label="近隣�ャット" name="0"/>
 		<radio_item label="別々�ウィンドウ" name="1"/>
 	</radio_group>
 	<check_box label="複数�ビューアを許�" name="allow_multiple_viewer_check"/>
 	<check_box label="ログイン時�グリッド�択を表示" name="show_grid_selection_check"/>
-	<check_box label="拡張メニューを表示" name="show_advanced_menu_check"/>
+	<check_box label="アド�ンスメニューを表示" name="show_advanced_menu_check"/>
 	<check_box label="開発メニューを表示" name="show_develop_menu_check"/>
 	<button label="記録済��ユーザ�" name="remembered_usernames"/>
 	<button label="デフォルト�作�権�" name="default_creation_permissions"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index dd11296729..8246c1e07c 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -4,12 +4,12 @@
 	<panel name="general_chat_settings">
 		<check_box initial_value="true" label="�ャット中�タイピング動作�アニメーションを�生" name="play_typing_animation"/>
 		<check_box label="オフライン時������ＩＭ�メール��信�る" name="send_im_to_email"/>
-		<check_box label="フレンド�グループ以外�ら�コール�ＩＭ��信���" name="voice_call_friends_only_check"/>
+		<check_box label="フレンド�グループ以外�ら�コール�IM��信���" name="voice_call_friends_only_check"/>
 		<text name="email_settings">
-			[https://accounts.secondlife.com/change_email?lang=ja オフライン時�ＩＭ�メール�信先�設定]
+			[https://accounts.secondlife.com/change_email?lang=ja オフライン時�IM�メール�信先�設定]
 		</text>
 		<text name="font_size">
-			文字�大��：
+			フォントサイズ：
 		</text>
 		<combo_box name="chat_font_size">
 			<item label="å°�" name="Small" value="0"/>
@@ -20,7 +20,7 @@
 	</panel>
 	<panel name="im_notification_settings">
 		<text name="friend_ims">
-			フレンドＩＭ：
+			フレンド�ら�IM：
 		</text>
 		<combo_box name="FriendIMOptions">
 			<item label="開���る会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
@@ -30,7 +30,7 @@
 		</combo_box>
 		<check_box label="サウンドを�生" name="play_sound_friend_im"/>
 		<text name="non_friend_ims">
-			フレンド����ＩＭ：
+			フレンド以外�ら�IM：
 		</text>
 		<combo_box name="NonFriendIMOptions">
 			<item label="開���る会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
@@ -40,7 +40,7 @@
 		</combo_box>
 		<check_box label="サウンドを�生" name="play_sound_non_friend_im"/>
 		<text name="conference_ims">
-			会話ＩＭ：
+			会議IM：
 		</text>
 		<combo_box name="ConferenceIMOptions">
 			<item label="開���る会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
@@ -70,7 +70,7 @@
 		</combo_box>
 		<check_box label="サウンドを�生" name="play_sound_nearby_chat_im"/>
 		<text name="object_ims">
-			オブジェクト�よるＩＭ：
+			オブジェクト�よるIM：
 		</text>
 		<combo_box name="ObjectIMOptions">
 			<item label="開���る会話ウィンドウ" name="OpenConversationsWindow" value="openconversations"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
index b740f85806..d57f8d12f5 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_colors.xml
@@ -29,13 +29,13 @@
 		所有者
 	</text>
 	<text name="text_box9">
-		ＵＲＬ
+		URL
 	</text>
 	<text name="bubble_chat">
 		���表示�背景色（��出��ャット�も�用）：
 	</text>
 	<color_swatch name="background" tool_tip="���表示色を�択"/>
-	<slider label="��明度：" name="bubble_chat_opacity" tool_tip="���表示���明度を�択"/>
+	<slider label="��明度:" name="bubble_chat_opacity" tool_tip="���表示���明度を�択"/>
 	<text name="floater_opacity">
 		フローター���度：
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 9309dda5af..eff831a7ac 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -45,7 +45,7 @@
 	<check_box label="ユーザー�" name="show_slids" tool_tip="bobsmith123 ��ユーザー�を表示"/>
 	<check_box label="グループタイトル" name="show_all_title_checkbox1" tool_tip="オフィサー���メン�ー���グループタイトルを表示"/>
 	<check_box label="フレンドを�イライト表示" name="show_friends" tool_tip="フレンド���を�イライト表示"/>
-	<check_box label="表示�を表示" name="display_names_check" tool_tip="�れを�択�る���ャット�ＩＭ���表示��表示�れ��。"/>
+	<check_box label="表示�を表示" name="display_names_check" tool_tip="�れを�択�る���ャット�IM���表示��表示�れ��。"/>
 	<text name="inworld_typing_rg_label">
 		特定キーを押�����動作：
 	</text>
@@ -57,10 +57,10 @@
 		「離席���る���時間：
 	</text>
 	<combo_box label="「離席���る���時間：" name="afk">
-		<combo_box.item label="２分" name="item0"/>
-		<combo_box.item label="５分" name="item1"/>
-		<combo_box.item label="１�分" name="item2"/>
-		<combo_box.item label="３�分" name="item3"/>
+		<combo_box.item label="2分" name="item0"/>
+		<combo_box.item label="5分" name="item1"/>
+		<combo_box.item label="10分" name="item2"/>
+		<combo_box.item label="30分" name="item3"/>
 		<combo_box.item label="離席設定��" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index 79a4689526..a70b30c57f 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -37,7 +37,7 @@
 	<slider name="QualityPerformanceSelection"/>
 	<slider control_name="RenderFarClip" label="�画�離：" name="DrawDistance"/>
 	<text name="DrawDistanceMeterText2">
-		�
+		m
 	</text>
 	<check_box initial_value="true" label="大気（周辺）シェーダー" name="WindLightUseAtmosShaders"/>
 	<check_box initial_value="true" label="高度�光�モデル" name="UseLightShaders"/>
@@ -56,5 +56,5 @@
 	<button label="プリセットを削除…" name="PrefDeleteButton"/>
 	<button label="プリセットを削除…" name="PrefDeleteButton"/>
 	<button label="推奨設定�リセット" name="Defaults"/>
-	<button label="拡張設定…" name="AdvancedSettings"/>
+	<button label="詳細設定…" name="AdvancedSettings"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
index 3956e07bf8..85be779053 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
@@ -4,10 +4,10 @@
 		中央�ボタン
 	</panel.string>
 	<panel.string name="button4_mouse">
-		４ボタン
+		マウスボタン4
 	</panel.string>
 	<panel.string name="button5_mouse">
-		５ボタン
+		マウスボタン5
 	</panel.string>
 	<slider label="全体�ボリューム" name="System Volume"/>
 	<button name="mute_audio"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
index b4504dd39a..128669260a 100644
--- a/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
+++ b/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
@@ -5,6 +5,6 @@
 	</text>
 	<scroll_list name="preset_list"/>
 	<view_border name="horiz_separator"/>
-	<button name="open_prefs_btn" label="グラフィック�期設定" tool_tip="グラフィック設定を呼�出���。"/>
-	<button name="open_autofps_btn" label="自動ＦＰＳ設定" tool_tip="自動調整設定を呼�出���。"/>
+	<button name="open_prefs_btn" label="グラフィック設定" tool_tip="グラフィック設定を呼�出���。"/>
+	<button name="open_autofps_btn" label="自動FPS設定" tool_tip="自動調整設定を呼�出���。"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
index 6c33bda5cd..038a7aa49f 100644
--- a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
@@ -64,7 +64,7 @@
 			<button name="close_btn" tool_tip="ズーム�ック"/>
 		</layout_panel>
 		<layout_panel name="new_window">
-			<button name="new_window_btn" tool_tip="ＵＲＬをブラウザ�開�"/>
+			<button name="new_window_btn" tool_tip="URLをブラウザ�開�"/>
 		</layout_panel>
 	</layout_stack>
 	<icon name="media_secure_lock_flag" tool_tip="安全�ブラウジング"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
index 71e223b90b..1c9111606e 100644
--- a/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_profile" label="プロフィール">
-	<string name="date_format" value="ＳＬ��誕生日：[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日"/>
+	<string name="date_format" value="SL��誕生日：[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日"/>
 	<string name="age_format" value="[AGE]経�"/>
 	<string name="partner_text" value="パートナー：[LINK]"/>
 	<string name="CaptionTextAcctInfo">
diff --git a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
index 9b2239e0bb..16349b45d4 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_covenant.xml
@@ -45,7 +45,7 @@
 		種類：
 	</text>
 	<text name="region_landtype_text">
-		メインランド�入�地
+		メインランド / ホームステッド
 	</text>
 	<text name="region_maturity_lbl">
 		区分：
diff --git a/indra/newview/skins/default/xui/ja/panel_region_environment.xml b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
index 48aa2a0adb..969c8f699c 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_environment.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_environment.xml
@@ -7,7 +7,7 @@
 		リージョン（地域）�設定を使用
 	</string>
 	<string name="str_altitude_desription">
-		空 [INDEX]（[ALTITUDE]�）
+		空 [INDEX]（[ALTITUDE]m）
 	</string>
 	<string name="str_no_parcel">
 		区画��択�れ����ん。環境�設定�無効�������。
@@ -48,7 +48,7 @@
 						</layout_panel>
 						<layout_panel name="pnl_environment_length">
 							<text name="lbl_apparent_time">
-								[AP]　[HH]：[MM]（[PRC]％）
+								[AP] [HH]:[MM] ([PRC]%)
 							</text>
 						</layout_panel>
 						<layout_panel name="pnl_environment_buttons"/>
@@ -57,7 +57,7 @@
 				<layout_panel name="pnl_environment_altitudes">
 					<panel name="pnl_alt1">
 						<text name="txt_alt1">
-							空[INDEX]　[ALTITUDE]�
+							空[INDEX] [ALTITUDE]m
 						</text>
 						<line_editor name="edt_invname_alt1">
 							�明
@@ -66,7 +66,7 @@
 					</panel>
 					<panel name="pnl_alt2">
 						<text name="txt_alt2">
-							空[INDEX]　[ALTITUDE]�
+							空[INDEX] [ALTITUDE]m
 						</text>
 						<line_editor name="edt_invname_alt2">
 							�明
@@ -75,7 +75,7 @@
 					</panel>
 					<panel name="pnl_alt3">
 						<text name="txt_alt3">
-							空[INDEX]　[ALTITUDE]�
+							空[INDEX] [ALTITUDE]m
 						</text>
 						<line_editor name="edt_invname_alt3">
 							�明
diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index df790376ec..429b55cb32 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
@@ -19,7 +19,7 @@
 		<radio_item label="アクセスタブ�記載�れ��人�グループ��許��る" name="estate_restricted_access"/>
 		<radio_item label="誰�も訪��" name="estate_public_access"/>
 	</radio_group>
-	<check_box label="１８歳以上��る必���り��" name="limit_age_verified" tool_tip="���動産（�動産）�アクセス�る���18 �以上���れ��り��ん。詳細������[SUPPORT_SITE]を�覧����。"/>
+	<check_box label="18歳以上��る必���り��" name="limit_age_verified" tool_tip="���動産（�動産）�アクセス�る���18 �以上���れ��り��ん。詳細������[SUPPORT_SITE]を�覧����。"/>
 	<check_box label="支払情報�登録�れ��る必���り��" name="limit_payment" tool_tip="支払情報�登録�れ���������動産�アクセス�る�������ん。詳細������[SUPPORT_SITE]を�覧����。"/>
 	<check_box label="区画所有者" name="parcel_access_override"/>
 	<check_box label="ボイス�ャットを許�" name="voice_chat_check"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
index 11e8d0d169..398f8d6718 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_terrain.xml
@@ -13,16 +13,16 @@
 		地形テクス�ャ
 	</text>
 	<text name="height_text_lbl">
-		１（低）
+		1（低）
 	</text>
 	<text name="height_text_lbl2">
-		ï¼’
+		2
 	</text>
 	<text name="height_text_lbl3">
-		３
+		3
 	</text>
 	<text name="height_text_lbl4">
-		４（高）
+		4（高）
 	</text>
 	<text name="height_text_lbl5">
 		地形�隆起範囲
@@ -31,7 +31,7 @@
 		数値�上�テクス�ャ�ブレンド範囲を示���。
 	</text>
 	<text name="height_text_lbl11">
-		計測���メートル��「低��値��１番�テクス�ャ�高��「最大値���。「高��値��４番�テクス�ャ�高��「最低値���。
+		計測���メートル��「低��値��1番�テクス�ャ�高��「最大値���。「高��値��4番�テクス�ャ�高��「最低値���。
 	</text>
 	<text name="height_text_lbl6">
 		北西
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
index c717b71194..68eb8b4f9d 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_limits_my_avatar.xml
@@ -8,7 +8,7 @@
 	</text>
 	<scroll_list name="scripts_list">
 		<scroll_list.columns label="サイズ （㎅）" name="size"/>
-		<scroll_list.columns label="ＵＲＬ" name="urls"/>
+		<scroll_list.columns label="URL" name="urls"/>
 		<scroll_list.columns label="オブジェクト�" name="name"/>
 		<scroll_list.columns label="場所" name="location"/>
 	</scroll_list>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
index 71dedb55a6..30c3fdc9b5 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_limits_region_memory.xml
@@ -10,7 +10,7 @@
 	</text>
 	<scroll_list name="scripts_list">
 		<scroll_list.columns label="サイズ （㎅）" name="size"/>
-		<scroll_list.columns label="ＵＲＬ" name="urls"/>
+		<scroll_list.columns label="URL" name="urls"/>
 		<scroll_list.columns label="オブジェクト�" name="name"/>
 		<scroll_list.columns label="オブジェクト�所有者" name="owner"/>
 		<scroll_list.columns label="区画" name="parcel"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
index 9cb0b8f116..27a55aa653 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_postcard.xml
@@ -10,7 +10,7 @@
 		�信中…
 	</string>
 	<text name="title">
-		Ｅメール
+		Eメール
 	</text>
 	<tab_container name="postcard_tabs">
 		<panel label="メッセージ" name="panel_postcard_message"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_status_bar.xml b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
index 9feae80624..2497b15548 100644
--- a/indra/newview/skins/default/xui/ja/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/ja/panel_status_bar.xml
@@ -7,10 +7,10 @@
 		帯域幅
 	</panel.string>
 	<panel.string name="time">
-		[ampm, datetime, slt]　[hour12, datetime, slt]：[min, datetime, slt]　[timezone,datetime, slt]
+		[ampm, datetime, slt] [hour12, datetime, slt]:[min, datetime, slt] [timezone,datetime, slt]
 	</panel.string>
 	<panel.string name="timeTooltip">
-		[year, datetime, slt]年[month, datetime, slt]月[day, datetime, slt]日（[weekday, datetime, slt]）
+		[year, datetime, slt]年[month, datetime, slt][day, datetime, slt]日（[weekday, datetime, slt]）
 	</panel.string>
 	<panel.string name="buycurrencylabel">
 		L$ [AMT]
@@ -24,7 +24,7 @@
 		<button label="ショップ" name="goShop" tool_tip="Second Life�マーケットプレイスを開���。" width="70"/>
 	</panel>
 	<text name="TimeText" tool_tip="�在時刻（太平洋）">
-		��　24：00 PST
+		�� 24:00 PST
 	</text>
 	<icon image_name="Cam_FreeCam_Off" name="presets_icon_camera" tool_tip="カメラ"/>
 	<icon image_name="Presets_Icon" name="presets_icon_graphic" tool_tip="グラフィック�プリセット"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
index 49efc529e4..968635e55b 100644
--- a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
@@ -17,7 +17,7 @@
 	</combo_box>
 	<radio_group name="radio_material_type">
 		<radio_item label="テクス�ャ (拡散)" name="Texture (diffuse)" value="0"/>
-		<radio_item label="凹凸 (標準)" name="Bumpiness (normal)" value="1"/>
+		<radio_item label="凹凸 (法線)" name="Bumpiness (normal)" value="1"/>
 		<radio_item label="�� (�射)" name="Shininess (specular)" value="2"/>
 	</radio_group>
 	<check_box initial_value="false" label="繰り返�をロック�る" name="checkbox_sync_settings" tool_tip="����マップ�繰り返�を調整�る"/>
@@ -79,7 +79,7 @@
 	</text>
 	<color_swatch label="" name="shinycolorswatch" tool_tip="クリック��カラーピッカーを開���"/>
 	<text name="media_info">
-		�択��メディア�ＵＲＬ�も��れ�����入り��。
+		�択��メディア�URL�も��れ�����入り��。
 	</text>
 	<button label="�択…" name="add_media" tool_tip="メディアを追加���"/>
 	<button label="削除" name="delete_media" tool_tip="��メディアテクス�ャを削除���"/>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
index fe9998b4ce..520ef848a0 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
@@ -19,7 +19,7 @@
 		所有者���る��：
 	</panel.string>
 	<panel.string name="acquiredDate">
-		[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local]　[hour,datetime,local]：[min,datetime,local]：[second,datetime,local]
+		[year,datetime,local]年[mth,datetime,local]月[day,datetime,local]日[wkday,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local]
 	</panel.string>
 	<panel.string name="origin_inventory">
 		（インベントリ）
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
index 8ff543bf92..1240a2e670 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -48,7 +48,7 @@
 		<text name="Name:">
 			��：
 		</text>
-		<line_editor name="Object Name" tool_tip="使用��る���文字数�最大６３文字����。長�プリム��短縮�れ��。���使用��る文字�ASCII-7 （�拡張）���れる�字�能�文字����（縦線「|��例外）。"/>
+		<line_editor name="Object Name" tool_tip="使用��る���文字数�最大63文字����。長�プリム��短縮�れ��。���使用��る文字�ASCII-7 （�拡張）���れる�字�能�文字����（縦線「|��例外）。"/>
 		<text name="Description:">
 			説明：
 		</text>
@@ -68,7 +68,7 @@
 		<text name="label click action">
 			クリック�：
 		</text>
-		<combo_box name="clickaction" tool_tip="マウス�１回左クリック�る��オブジェクト�対��アクションを起��るよ���り��。�クリックアクション���何���る�を示�特別�カーソル��り��。クリックアクション�よ����動作�件�必��も�も�り��。例���「触る�や「支払����スクリプト�必���り��。">
+		<combo_box name="clickaction" tool_tip="マウス�1回左クリック�る��オブジェクト�対��アクションを起��るよ���り��。�クリックアクション���何���る�を示�特別�カーソル��り��。クリックアクション�よ����動作�件�必��も�も�り��。例���「触る�や「支払����スクリプト�必���り��。">
 			<combo_box.item label="触る（デフォルト）" name="Touch/grab(default)"/>
 			<combo_box.item label="オブジェクト�座る" name="Sitonobject"/>
 			<combo_box.item label="オブジェクトを買�" name="Buyobject"/>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index 033de9a684..99909d80d1 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -31,7 +31,7 @@
 		グラフィックを�期化����ん���。グラフィックドライ�を更新������。
 	</string>
 	<string name="AboutHeader">
-		[CHANNEL]　[VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2].[VIEWER_VERSION_3]（[ADDRESS_SIZE]bit）
+		[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">
@@ -46,9 +46,9 @@ SLURL：&lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 [SERVER_RELEASE_NOTES_URL]
 	</string>
 	<string name="AboutSystem">
-		ＣＰＵ：[CPU]
+		CPU：[CPU]
 メモリ：[MEMORY_MB]㎆
-ＯＳ��ージョン：[OS_VERSION]
+OS��ージョン：[OS_VERSION]
 グラフィックカード製造元：[GRAPHICS_CARD_VENDOR]
 グラフィックカード:[GRAPHICS_CARD]
 	</string>
@@ -61,15 +61,15 @@ SLURL：&lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 	<string name="AboutSettings">
 		ウィンドウサイズ:[WINDOW_WIDTH]x[WINDOW_HEIGHT]
 フォントサイズ調整：[FONT_SIZE_ADJUSTMENT]pt
-ＵＩスケーリング：[UI_SCALE]
-�画�離：[DRAW_DISTANCE]�
-帯域幅：[NET_BANDWITH]kbit�秒
-ＬＯＤ係数：[LOD_FACTOR]
+UIスケーリング：[UI_SCALE]
+�画�離：[DRAW_DISTANCE]m
+帯域幅：[NET_BANDWITH]kbit/s
+LOD係数：[LOD_FACTOR]
 �画�質：[RENDER_QUALITY]
 テクス�ャメモリ：[TEXTURE_MEMORY]㎆
 	</string>
 	<string name="AboutOSXHiDPI">
-		高ＤＰＩ表示モード：[HIDPI]
+		高DPI表示モード：[HIDPI]
 	</string>
 	<string name="AboutLibs">
 		J2Cデコーダ�ージョン：[J2C_VERSION]
@@ -82,10 +82,10 @@ LibVLC�ージョン：[LIBVLC_VERSION]
 		パケット�失：[PACKETS_LOST,number,0]�[PACKETS_IN,number,0]（[PACKETS_PCT,number,1]％）
 	</string>
 	<string name="AboutTime">
-		[year, datetime, slt]年[month, datetime, slt]月[day, datetime, slt]日　[hour, datetime, slt]：[min,datetime, slt]：[second,datetime,slt]
+		[year, datetime, slt]年[month, datetime, slt]月[day, datetime, slt]日 [hour, datetime, slt]:[min,datetime, slt]:[second,datetime,slt]
 	</string>
 	<string name="ErrorFetchingServerReleaseNotesURL">
-		サー�ー�リリースノート�ＵＲＬ�得時�エラー�発生����。
+		サー�ー�リリースノート�URL�得時�エラー�発生����。
 	</string>
 	<string name="BuildConfiguration">
 		ビルド構�
@@ -357,7 +357,7 @@ support@secondlife.com �����������。
 		白黒
 	</string>
 	<string name="Colors1970">
-		１９７�年代�カラー
+		1970年代�カラー
 	</string>
 	<string name="Intense">
 		強調
@@ -540,7 +540,7 @@ support@secondlife.com �����������。
 	<string name="TooltipSLAPP">
 		クリック�� secondlife:// コマンドを出���。
 	</string>
-	<string name="CurrentURL" value="�在�ＵＲＬ：[CurrentURL]"/>
+	<string name="CurrentURL" value="�在�URL：[CurrentURL]"/>
 	<string name="TooltipEmail">
 		クリック��電�メールを作����。
 	</string>
@@ -557,7 +557,7 @@ support@secondlife.com �����������。
 		ミュート解除
 	</string>
 	<string name="SLappAgentIM">
-		ＩＭ
+		IM
 	</string>
 	<string name="SLappAgentPay">
 		支払�
@@ -821,28 +821,28 @@ support@secondlife.com �����������。
 		泣�
 	</string>
 	<string name="anim_dance1">
-		ダンス１
+		ダンス1
 	</string>
 	<string name="anim_dance2">
-		ダンス２
+		ダンス2
 	</string>
 	<string name="anim_dance3">
-		ダンス３
+		ダンス3
 	</string>
 	<string name="anim_dance4">
-		ダンス４
+		ダンス4
 	</string>
 	<string name="anim_dance5">
-		ダンス５
+		ダンス5
 	</string>
 	<string name="anim_dance6">
-		ダンス６
+		ダンス6
 	</string>
 	<string name="anim_dance7">
-		ダンス７
+		ダンス7
 	</string>
 	<string name="anim_dance8">
-		ダンス８
+		ダンス8
 	</string>
 	<string name="anim_express_disdain">
 		侮蔑
@@ -1010,7 +1010,7 @@ support@secondlife.com �����������。
 		オフライン
 	</string>
 	<string name="worldmap_item_tooltip_format">
-		[AREA]㎡　L$ [PRICE]（[SQMPRICE] L$�㎡）
+		[AREA]㎡ L$ [PRICE]（[SQMPRICE] L$�㎡）
 	</string>
 	<string name="worldmap_results_none_found">
 		何も見��り��ん���。
@@ -1034,7 +1034,7 @@ support@secondlife.com �����������。
 		���や�：
 	</string>
 	<string name="shout">
-		�シャウト：
+		���：
 	</string>
 	<string name="ringing">
 		インワールドボイス�ャット�接続中…
@@ -1142,16 +1142,16 @@ support@secondlife.com �����������。
 		（�明）
 	</string>
 	<string name="Estate / Full Region">
-		�動産�フルリージョン
+		�動産 / フルリージョン
 	</string>
 	<string name="Estate / Homestead">
-		�動産�入�地
+		�動産 / ホームステッド
 	</string>
 	<string name="Mainland / Homestead">
-		メインランド�入�地
+		メインランド / ホームステッド
 	</string>
 	<string name="Mainland / Full Region">
-		メインランド�フルリージョン
+		メインランド / フルリージョン
 	</string>
 	<string name="all_files">
 		全��ファイル
@@ -3225,7 +3225,7 @@ For AI Character: Get the closest navigable point to the point provided.
 		料金�サブスクリプション�レベル�より異�り��。レベル�高����料金�下�り��。[https://accounts.secondlife.com/change_membership/?lang=ja-JP 詳細]
 	</string>
 	<string name="Open landmarks">
-		オープン ランドマーク
+		ランドマーク一覧を開�
 	</string>
 	<string name="Unconstrained">
 		アンコンストレインド（制約��）
@@ -3602,7 +3602,7 @@ For AI Character: Get the closest navigable point to the point provided.
 		�����周囲�誰�らも見������能性��り��。
 	</string>
 	<string name="hud_description_total">
-		利用中�ＨＵＤ
+		利用中�HUD
 	</string>
 	<string name="hud_name_with_joint">
 		[OBJ_NAME]（[JNT_NAME]�装�中）
@@ -3695,7 +3695,7 @@ For AI Character: Get the closest navigable point to the point provided.
 		年齢未確�
 	</string>
 	<string name="Center 2">
-		中央２
+		中央2
 	</string>
 	<string name="Top Right">
 		�上
@@ -3874,19 +3874,19 @@ For AI Character: Get the closest navigable point to the point provided.
 		区画一覧：[PARCELS]個
 	</string>
 	<string name="ScriptLimitsMemoryUsed">
-		使用�れ�メモリ：[MAX]㎅中[COUNT]㎅　[AVAILABLE]㎅利用�
+		使用�れ�メモリ：[MAX]㎅中[COUNT]㎅ [AVAILABLE]㎅利用�
 	</string>
 	<string name="ScriptLimitsMemoryUsedSimple">
 		使用�れ�メモリ：[COUNT]㎅
 	</string>
 	<string name="ScriptLimitsParcelScriptURLs">
-		区画�スクリプトＵＲＬ
+		区画�スクリプトURL
 	</string>
 	<string name="ScriptLimitsURLsUsed">
-		使用�れ�ＵＲＬ：[MAX]件中[COUNT]件　[AVAILABLE]件利用�
+		使用�れ�URL：[MAX]件中[COUNT]件 [AVAILABLE]件利用�
 	</string>
 	<string name="ScriptLimitsURLsUsedSimple">
-		使用�れ�ＵＲＬ：[COUNT]件
+		使用�れ�URL：[COUNT]件
 	</string>
 	<string name="ScriptLimitsRequestError">
 		情報�リクエスト中�エラー�発生����
@@ -3997,28 +3997,28 @@ For AI Character: Get the closest navigable point to the point provided.
 		�胸筋
 	</string>
 	<string name="ATTACH_HUD_CENTER_2">
-		ＨＵＤ（中央 2）
+		HUD（中央 2）
 	</string>
 	<string name="ATTACH_HUD_TOP_RIGHT">
-		ＨＵＤ（�上）
+		HUD（�上）
 	</string>
 	<string name="ATTACH_HUD_TOP_CENTER">
-		ＨＵＤ（上・中央）
+		HUD（上・中央）
 	</string>
 	<string name="ATTACH_HUD_TOP_LEFT">
-		ＨＵＤ（左上）
+		HUD（左上）
 	</string>
 	<string name="ATTACH_HUD_CENTER_1">
-		ＨＵＤ（中央 1）
+		HUD（中央 1）
 	</string>
 	<string name="ATTACH_HUD_BOTTOM_LEFT">
-		ＨＵＤ（左下）
+		HUD（左下）
 	</string>
 	<string name="ATTACH_HUD_BOTTOM">
-		ＨＵＤ（下）
+		HUD（下）
 	</string>
 	<string name="ATTACH_HUD_BOTTOM_RIGHT">
-		ＨＵＤ（�下）
+		HUD（�下）
 	</string>
 	<string name="ATTACH_NECK">
 		首
@@ -4078,10 +4078,10 @@ For AI Character: Get the closest navigable point to the point provided.
 		[COUNT]件見��り���
 	</string>
 	<string name="PanelDirTimeStr">
-		[ampm,datetime,utc]　[hour12,datetime,utc]：[min,datetime,utc]
+		[ampm,datetime,utc] [hour12,datetime,utc]:[min,datetime,utc]
 	</string>
 	<string name="PanelDirEventsDateText">
-		[mthnum,datetime,slt]�[day,datetime,slt]
+		[mthnum,datetime,slt]/[day,datetime,slt]
 	</string>
 	<string name="PanelContentsTooltip">
 		オブジェクト�中身
@@ -4545,10 +4545,10 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		ピクセル形��設定����ん。
 	</string>
 	<string name="MBGLContextErr">
-		ＧＬレンダーコンテキスト�作れ��ん
+		GLレンダーコンテキスト�作れ��ん
 	</string>
 	<string name="MBGLContextActErr">
-		ＧＬレンダーコンテキストを有効化����ん。
+		GLレンダーコンテキストを有効化����ん。
 	</string>
 	<string name="MBVideoDrvErr">
 		�使��コンピューター�ビデオカード�ドライ��正常�インストール�れ�����������サ�ート対象外����[APP_NAME]を実行�る�������ん���。
@@ -6157,7 +6157,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		インベントリ�ら���アイテムをドラッグ���。
 	</string>
 	<string name="no_session_message">
-		（ＩＭセッション�存在���ん）
+		（IMセッション�存在���ん）
 	</string>
 	<string name="only_user_message">
 		��セッション��るユーザー��������。
@@ -6582,28 +6582,28 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		一時退席中
 	</string>
 	<string name="dance1">
-		ダンス１
+		ダンス1
 	</string>
 	<string name="dance2">
-		ダンス２
+		ダンス2
 	</string>
 	<string name="dance3">
-		ダンス３
+		ダンス3
 	</string>
 	<string name="dance4">
-		ダンス４
+		ダンス4
 	</string>
 	<string name="dance5">
-		ダンス５
+		ダンス5
 	</string>
 	<string name="dance6">
-		ダンス６
+		ダンス6
 	</string>
 	<string name="dance7">
-		ダンス７
+		ダンス7
 	</string>
 	<string name="dance8">
-		ダンス８
+		ダンス8
 	</string>
 	<string name="AvatarBirthDateFormat">
 		[year,datetime,slt]年[mthnum,datetime,slt]月[day,datetime,slt]日
@@ -6623,7 +6623,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 	<string name="outfit_photo_verify_dimensions_error">
 		画��寸法を確�����ん。画�サイズ�ピッカー�表示�れる���待�����。
 	</string>
-	<string name="sentences_separator" value="　"/>
+	<string name="sentences_separator" value=" "/>
 	<string name="words_separator" value="�"/>
 	<string name="server_is_down">
 		大変申�訳�����ん��予期����題�発生����。サービス�関�る既知��題������ https://status.secondlifegrid.net/?lang=ja-JP を�覧����。
@@ -6636,7 +6636,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		日:月:�:水:木:金:土
 	</string>
 	<string name="dateTimeMonthNames">
-		１月:２月:３月:４月:５月:６月:７月:８月:９月:１�月:１１月:１２月
+		1月:2月:3月:4月:5月:6月:7月:8月:9月:10月:11月:12月
 	</string>
 	<string name="dateTimeMonthShortNames">
 		㋀:�:㋂:㋃:㋄:㋅:㋆:㋇:㋈:㋉:㋊:㋋
@@ -7108,7 +7108,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		パーティクルを�表示
 	</string>
 	<string name="Command_360_Capture_Label">
-		３６�度Ｓショット
+		360度スナップショット
 	</string>
 	<string name="Command_AboutLand_Label">
 		土地情報
@@ -7198,7 +7198,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		ボイス設定
 	</string>
 	<string name="Command_360_Capture_Tooltip">
-		３６�度�正�円筒図法�スナップショット画�を撮影���。
+		360度�正�円筒図法�スナップショット画�を撮影���。
 	</string>
 	<string name="Command_AboutLand_Tooltip">
 		訪�先�関�る情報を表示���。
@@ -7483,7 +7483,7 @@ www.secondlife.com ã�‹ã‚‰æœ€æ–°ãƒ�ージョンをダウンロードã�—ã�¦ã��ã� ã
 		物�形状��正�確�データ��り��。物�モデルを修正������。
 	</string>
 	<string name="Mav_Details_MAV_BLOCK_MISSING">
-		データ��り��ん。高ＬＯＤ�存在��有効��る��を確�������。設定�れ����場���物�モデルを設定���。
+		データ��り��ん。高LOD�存在��有効��る��を確�������。設定�れ����場���物�モデルを設定���。
 	</string>
 	<string name="Mav_Details_MAV_UNKNOWN_VERSION">
 		物�形状��ージョン�正���り��ん。物�モデル�正���ージョンを設定������。
@@ -7494,7 +7494,7 @@ www.secondlife.com ã�®ã‚¦ã‚§ãƒ–サイトã�«æŽ¥ç¶šã�§ã��ã‚‹ã�‹ã�”確èª�ã��ã� ã�•ã
 接続���も���エラー�継続的�起�る場���サ�ートセクション�ら�題を報告������。
 	</string>
 	<string name="ssl_peer_certificate">
-		ログインサー�ー�ＳＳＬ経由�確�����ん���。
+		ログインサー�ー�SSL経由�確�����ん���。
 ��エラー�継続的�起�る場���Secondlife.com �サ�ートセクション�ら�題を報告������。
 	</string>
 	<string name="ssl_connect_error">
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml
index c1be98bef9..cdfdb1628b 100644
--- a/indra/newview/skins/default/xui/ja/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml
@@ -47,7 +47,7 @@
 			インベントリシステム��在利用����ん。
 		</message>
 		<message name="MustGetAgeRegion">
-			��リージョン（地域）�入る���１８歳以上��る必���り��。
+			��リージョン（地域）�入る���18歳以上��る必���り��。
 		</message>
 		<message name="RegionTPSpecialUsageBlocked">
 			リージョン�入る�������ん。
diff --git a/indra/newview/tests/llworldmap_test.cpp b/indra/newview/tests/llworldmap_test.cpp
index d5bf189d82..60172b3960 100644
--- a/indra/newview/tests/llworldmap_test.cpp
+++ b/indra/newview/tests/llworldmap_test.cpp
@@ -32,6 +32,7 @@
 #include "lltrans.h"
 #include "lluistring.h"
 #include "../llviewertexture.h"
+#include "../llviewercontrol.h"
 #include "../llworldmapmessage.h"
 // Class to test
 #include "../llworldmap.h"
@@ -71,6 +72,11 @@ void LLUIString::updateResult() const { }
 void LLUIString::setArg(const std::string& , const std::string& ) { }
 void LLUIString::assign(const std::string& ) { }
 
+LLControlGroup::LLControlGroup(const std::string& name) : LLInstanceTracker<LLControlGroup, std::string>(name) {}
+LLControlGroup::~LLControlGroup() {}
+bool LLControlGroup::getBOOL(std::string_view) { return true; }
+LLControlGroup gSavedSettings("test_settings");
+
 // End Stubbing
 // -------------------------------------------------------------------------------------------
 
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index d16f427530..0ce89df914 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -247,6 +247,16 @@ class ViewerManifest(LLManifest):
             }
         return "%(channel_vendor_base)s%(channel_variant_underscores)s_%(version_underscores)s_%(arch)s" % substitution_strings
 
+    def installer_base_name_mac(self):
+        global CHANNEL_VENDOR_BASE
+        # a standard map of strings for replacing in the templates
+        substitution_strings = {
+            'channel_vendor_base' : '_'.join(CHANNEL_VENDOR_BASE.split()),
+            'channel_variant_underscores':self.channel_variant_app_suffix(),
+            'version_underscores' : '_'.join(self.args['version'])
+            }
+        return "%(channel_vendor_base)s%(channel_variant_underscores)s_%(version_underscores)s_universal" % substitution_strings
+
     def app_name(self):
         global CHANNEL_VENDOR_BASE
         channel_type=self.channel_type()
@@ -1070,7 +1080,7 @@ class Darwin_x86_64_Manifest(ViewerManifest):
 
 
     def package_finish(self):
-        imagename = self.installer_base_name()
+        imagename = self.installer_base_name_mac()
         self.set_github_output('imagename', imagename)
         finalname = imagename + ".dmg"
         self.package_file = finalname