Merge branch 'main' into 2025.08

3 files changed, 18 insertions, 18 deletions

diff --git a/README.md b/README.md
index b88e27e56b..7ddeb6722e 100644
--- a/README.md
+++ b/README.md
@@ -202,7 +202,7 @@ pull requests and more. See the [CONTRIBUTING][] and the [open source portal][]
 [download]: https://megapahit.net
 [tpv]: http://wiki.secondlife.com/wiki/Third_Party_Viewer_Directory/Megapahit
 [open source portal]: http://wiki.secondlife.com/wiki/Open_Source_Portal
-[contributing]: https://megapahit.org/viewer.git/tree/CONTRIBUTING.md
+[contributing]: https://github.com/megapahit/viewer/blob/main/CONTRIBUTING.md
 [in-world group]: https://world.secondlife.com/group/1142646c-5fb2-162c-ecf8-c5e422ab5c6d
 [Discord]: https://discord.gg/jpt33HPVEK
 [fmod]: https://www.fmod.com/studio
diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake
index c2bf6f460e..d628efdb6d 100644
--- a/indra/cmake/FMODSTUDIO.cmake
+++ b/indra/cmake/FMODSTUDIO.cmake
@@ -34,7 +34,7 @@ if (USE_FMODSTUDIO)
       file(MAKE_DIRECTORY ${ARCH_PREBUILT_DIRS_RELEASE})
       if (DARWIN)
         execute_process(
-          COMMAND hdiutil attach -noverify fmodstudioapi20230mac-installer.dmg
+          COMMAND hdiutil attach -noverify fmodstudioapi20231mac-installer.dmg
           WORKING_DIRECTORY $ENV{HOME}/Downloads
           )
         file(
@@ -64,36 +64,36 @@ if (USE_FMODSTUDIO)
         file(WRITE ${PREBUILD_TRACKING_DIR}/fmodstudio_installed "${fmodstudio_installed}")
       else ()
         file(ARCHIVE_EXTRACT
-          INPUT $ENV{HOME}/Downloads/fmodstudioapi20230linux.tar.gz
+          INPUT $ENV{HOME}/Downloads/fmodstudioapi20231linux.tar.gz
           DESTINATION ${CMAKE_BINARY_DIR}
           )
         file(
           COPY
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20230linux/api/core/inc/fmod.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20230linux/api/core/inc/fmod.hpp
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20230linux/api/core/inc/fmod_codec.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20230linux/api/core/inc/fmod_common.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20230linux/api/core/inc/fmod_dsp.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20230linux/api/core/inc/fmod_dsp_effects.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20230linux/api/core/inc/fmod_errors.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20230linux/api/core/inc/fmod_output.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20231linux/api/core/inc/fmod.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20231linux/api/core/inc/fmod.hpp
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20231linux/api/core/inc/fmod_codec.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20231linux/api/core/inc/fmod_common.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20231linux/api/core/inc/fmod_dsp.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20231linux/api/core/inc/fmod_dsp_effects.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20231linux/api/core/inc/fmod_errors.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20231linux/api/core/inc/fmod_output.h
           DESTINATION ${LIBS_PREBUILT_DIR}/include/fmodstudio
           )
         if (CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
           file(
             COPY
-              ${CMAKE_BINARY_DIR}/fmodstudioapi20230linux/api/core/lib/arm64/libfmod.so
-              ${CMAKE_BINARY_DIR}/fmodstudioapi20230linux/api/core/lib/arm64/libfmod.so.13
-              ${CMAKE_BINARY_DIR}/fmodstudioapi20230linux/api/core/lib/arm64/libfmod.so.13.30
+              ${CMAKE_BINARY_DIR}/fmodstudioapi20231linux/api/core/lib/arm64/libfmod.so
+              ${CMAKE_BINARY_DIR}/fmodstudioapi20231linux/api/core/lib/arm64/libfmod.so.13
+              ${CMAKE_BINARY_DIR}/fmodstudioapi20231linux/api/core/lib/arm64/libfmod.so.13.31
             DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
             FOLLOW_SYMLINK_CHAIN
             )
         else ()
           file(
             COPY
-              ${CMAKE_BINARY_DIR}/fmodstudioapi20230linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so
-              ${CMAKE_BINARY_DIR}/fmodstudioapi20230linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13
-              ${CMAKE_BINARY_DIR}/fmodstudioapi20230linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13.30
+              ${CMAKE_BINARY_DIR}/fmodstudioapi20231linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so
+              ${CMAKE_BINARY_DIR}/fmodstudioapi20231linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13
+              ${CMAKE_BINARY_DIR}/fmodstudioapi20231linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13.31
             DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
             FOLLOW_SYMLINK_CHAIN
             )
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index 81f762e0a9..2c31d52e8b 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -208,7 +208,7 @@ if (LINUX)
             install(FILES
                 ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.so
                 ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.so.13
-                ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.so.13.30
+                ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.so.13.31
             DESTINATION ${_LIB})
         endif (USE_FMODSTUDIO)
 endif (LINUX)