Merge branch 'main' into 26.4

4 files changed, 10 insertions, 10 deletions

diff --git a/README.md b/README.md
index 1de77735d1..caa646616a 100644
--- a/README.md
+++ b/README.md
@@ -166,7 +166,7 @@ $ vcpkg install freealut apr-util boost curl freetype hunspell libjpeg-turbo mes
 $ vcpkg install --allow-unsupported boost-fiber
 $ export LL_BUILD_RELEASE="/MD /O2 /Ob2 /std:c++20 /permissive- /Zc:wchar_t /Zi /GR /Zc:preprocessor /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0602 /D_WIN32_WINNT=0x0602 /DLL_OS_DRAGDROP_ENABLED=1"
 $ export LL_BUILD_RELWITHDEBINFO="/MD /Od /Ob0 /std:c++20 /permissive- /Zc:wchar_t /Zi /GR /Zc:preprocessor /DEBUG /DLL_RELEASE=1 /DLL_RELEASE_WITH_DEBUG_INFO=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0602 /D_WIN32_WINNT=0x0602 /DLL_OS_DRAGDROP_ENABLED=1"
-$ export PATH="$VCPKG_ROOT/downloads/tools/cmake-4.4.2-windows/cmake-4.4.2-windows-arm64/bin:$VCPKG_ROOT/installed/arm64-windows/tools/libxml2:/c/Program Files (x86)/Microsoft Visual Studio/18/BuildTools/MSBuild/Current/Bin:$PATH"
+$ export PATH="$VCPKG_ROOT/downloads/tools/cmake-4.4.3-windows/cmake-4.4.3-windows-arm64/bin:$VCPKG_ROOT/installed/arm64-windows/tools/libxml2:/c/Program Files (x86)/Microsoft Visual Studio/18/BuildTools/MSBuild/Current/Bin:$PATH"
 $ export PYTHON="$VCPKG_ROOT/downloads/tools/python/python-3.14.2-arm64-1"
 $ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DADDRESS_SIZE:STRING=64 -DUSE_OPENAL:BOOL=ON -DUSE_FMODSTUDIO:BOOL=OFF -DENABLE_MEDIA_PLUGINS:BOOL=OFF -DLL_TESTS:BOOL=OFF -DNDOF:BOOL=OFF -DROOT_PROJECT_NAME:STRING=Megapahit -DVIEWER_CHANNEL:STRING=Megapahit -DVIEWER_BINARY_NAME:STRING=Megapahit -DBUILD_SHARED_LIBS:BOOL=OFF -DINSTALL:BOOL=ON -DPACKAGE:BOOL=ON -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVS_DISABLE_FATAL_WARNINGS:BOOL=ON ../indra
 $ MSBuild.exe Megapahit.slnx -p:Configuration=Release
@@ -179,7 +179,7 @@ $ start Megapahit-`cat newview/viewer_version.txt`-win64.exe
 $ vcpkg install freealut apr-util boost freetype glm hunspell libjpeg-turbo meshoptimizer minizip nanosvg nghttp2 openjpeg libvorbis libxml2[tools] xxhash
 $ export LL_BUILD_RELEASE="/MD /O2 /Ob2 /std:c++20 /permissive- /Zc:wchar_t /Zi /GR /DLL_RELEASE=1 /DLL_RELEASE_FOR_DOWNLOAD=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0602 /D_WIN32_WINNT=0x0602 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1"
 $ export LL_BUILD_RELWITHDEBINFO="/MD /Od /Ob0 /std:c++20 /permissive- /Zc:wchar_t /Zi /GR /DEBUG /DLL_RELEASE=1 /DLL_RELEASE_WITH_DEBUG_INFO=1 /DNDEBUG /D_SECURE_STL=0 /D_HAS_ITERATOR_DEBUGGING=0 /DWIN32 /D_WINDOWS /DLL_WINDOWS=1 /DUNICODE /D_UNICODE /DWINVER=0x0602 /D_WIN32_WINNT=0x0602 /DLL_OS_DRAGDROP_ENABLED=1 /DLIB_NDOF=1"
-$ export PATH="$VCPKG_ROOT/downloads/tools/cmake-4.4.2-windows/cmake-4.4.2-windows-x86_64/bin:$VCPKG_ROOT/installed/x64-windows/tools/libxml2:/c/Program Files (x86)/Microsoft Visual Studio/18/BuildTools/MSBuild/Current/Bin:$PATH"
+$ export PATH="$VCPKG_ROOT/downloads/tools/cmake-4.4.3-windows/cmake-4.4.3-windows-x86_64/bin:$VCPKG_ROOT/installed/x64-windows/tools/libxml2:/c/Program Files (x86)/Microsoft Visual Studio/18/BuildTools/MSBuild/Current/Bin:$PATH"
 $ export PYTHON="$VCPKG_ROOT/downloads/tools/python/python-3.14.2-x64-1"
 $ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DADDRESS_SIZE:STRING=64 -DUSE_OPENAL:BOOL=ON -DUSE_FMODSTUDIO:BOOL=OFF -DENABLE_MEDIA_PLUGINS:BOOL=ON -DLL_TESTS:BOOL=OFF -DNDOF:BOOL=ON -DROOT_PROJECT_NAME:STRING=Megapahit -DVIEWER_CHANNEL:STRING=Megapahit -DVIEWER_BINARY_NAME:STRING=Megapahit -DBUILD_SHARED_LIBS:BOOL=OFF -DINSTALL:BOOL=ON -DPACKAGE:BOOL=ON -DCMAKE_TOOLCHAIN_FILE:FILEPATH=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVS_DISABLE_FATAL_WARNINGS:BOOL=ON ../indra
 $ MSBuild.exe Megapahit.slnx -p:Configuration=Release
diff --git a/indra/cmake/LibVLCPlugin.cmake b/indra/cmake/LibVLCPlugin.cmake
index 6fe6f89c99..c268d8d24e 100644
--- a/indra/cmake/LibVLCPlugin.cmake
+++ b/indra/cmake/LibVLCPlugin.cmake
@@ -16,16 +16,16 @@ if (LIBVLCPLUGIN)
             set(ARCHITECTURE ${CMAKE_OSX_ARCHITECTURES})
         endif ()
         if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/vlc_installed OR NOT ${vlc_installed} EQUAL 0)
-            if (NOT EXISTS ${CMAKE_BINARY_DIR}/vlc-3.0.23-${ARCHITECTURE}.dmg)
+            if (NOT EXISTS ${CMAKE_BINARY_DIR}/vlc-3.0.24-${ARCHITECTURE}.dmg)
                 file(DOWNLOAD
-                    https://get.videolan.org/vlc/3.0.23/macosx/vlc-3.0.23-${ARCHITECTURE}.dmg
-                    ${CMAKE_BINARY_DIR}/vlc-3.0.23-${ARCHITECTURE}.dmg
+                    https://get.videolan.org/vlc/3.0.24/macosx/vlc-3.0.24-${ARCHITECTURE}.dmg
+                    ${CMAKE_BINARY_DIR}/vlc-3.0.24-${ARCHITECTURE}.dmg
                     )
             endif ()
             file(WRITE ${PREBUILD_TRACKING_DIR}/vlc_installed "0")
         endif ()
         execute_process(
-            COMMAND hdiutil attach -noverify vlc-3.0.23-${ARCHITECTURE}.dmg
+            COMMAND hdiutil attach -noverify vlc-3.0.24-${ARCHITECTURE}.dmg
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
             )
         target_include_directories( ll::libvlc SYSTEM INTERFACE /Volumes/VLC\ media\ player/VLC.app/Contents/MacOS/include)
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in
index bf9ff67830..8e725f1c82 100644
--- a/indra/newview/FixBundle.cmake.in
+++ b/indra/newview/FixBundle.cmake.in
@@ -291,9 +291,9 @@ execute_process(
     COMMAND lipo libbz2.1.0.8.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
         -output libbz2.1.0.8.dylib
-    COMMAND lipo libexpat.1.12.4.dylib
+    COMMAND lipo libexpat.1.13.0.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
-        -output libexpat.1.12.4.dylib
+        -output libexpat.1.13.0.dylib
     COMMAND lipo libfreetype.6.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
         -output libfreetype.6.dylib
diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in
index d7a854e841..36c042d991 100644
--- a/indra/newview/FixPackage.cmake.in
+++ b/indra/newview/FixPackage.cmake.in
@@ -174,9 +174,9 @@ execute_process(
     COMMAND lipo libbz2.1.0.8.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
         -output libbz2.1.0.8.dylib
-    COMMAND lipo libexpat.1.12.4.dylib
+    COMMAND lipo libexpat.1.13.0.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
-        -output libexpat.1.12.4.dylib
+        -output libexpat.1.13.0.dylib
     COMMAND lipo libfreetype.6.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
         -output libfreetype.6.dylib