Merge branch 'main' into 2026.01

3 files changed, 18 insertions, 18 deletions

diff --git a/indra/cmake/Discord.cmake b/indra/cmake/Discord.cmake
index 33ad5e7c09..f474457b03 100644
--- a/indra/cmake/Discord.cmake
+++ b/indra/cmake/Discord.cmake
@@ -9,7 +9,7 @@ target_compile_definitions(ll::discord_sdk INTERFACE LL_DISCORD=1)
 
 if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/discord_sdk_installed OR NOT ${discord_sdk_installed} EQUAL 0)
     file(ARCHIVE_EXTRACT
-        INPUT $ENV{HOME}/Downloads/DiscordSocialSdk-1.4.9649.zip
+        INPUT $ENV{HOME}/Downloads/DiscordSocialSdk-1.8.13395.zip
         DESTINATION ${CMAKE_BINARY_DIR}
         )
     file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/include/discord_sdk)
diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake
index 4921757920..cbae765b36 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 fmodstudioapi20232mac-installer.dmg
+          COMMAND hdiutil attach -noverify fmodstudioapi20233mac-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/fmodstudioapi20232linux.tar.gz
+          INPUT $ENV{HOME}/Downloads/fmodstudioapi20233linux.tar.gz
           DESTINATION ${CMAKE_BINARY_DIR}
           )
         file(
           COPY
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20232linux/api/core/inc/fmod.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20232linux/api/core/inc/fmod.hpp
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20232linux/api/core/inc/fmod_codec.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20232linux/api/core/inc/fmod_common.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20232linux/api/core/inc/fmod_dsp.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20232linux/api/core/inc/fmod_dsp_effects.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20232linux/api/core/inc/fmod_errors.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20232linux/api/core/inc/fmod_output.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20233linux/api/core/inc/fmod.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20233linux/api/core/inc/fmod.hpp
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20233linux/api/core/inc/fmod_codec.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20233linux/api/core/inc/fmod_common.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20233linux/api/core/inc/fmod_dsp.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20233linux/api/core/inc/fmod_dsp_effects.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20233linux/api/core/inc/fmod_errors.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20233linux/api/core/inc/fmod_output.h
           DESTINATION ${LIBS_PREBUILT_DIR}/include/fmodstudio
           )
         if (CMAKE_SYSTEM_PROCESSOR MATCHES aarch64)
           file(
             COPY
-              ${CMAKE_BINARY_DIR}/fmodstudioapi20232linux/api/core/lib/arm64/libfmod.so
-              ${CMAKE_BINARY_DIR}/fmodstudioapi20232linux/api/core/lib/arm64/libfmod.so.13
-              ${CMAKE_BINARY_DIR}/fmodstudioapi20232linux/api/core/lib/arm64/libfmod.so.13.32
+              ${CMAKE_BINARY_DIR}/fmodstudioapi20233linux/api/core/lib/arm64/libfmod.so
+              ${CMAKE_BINARY_DIR}/fmodstudioapi20233linux/api/core/lib/arm64/libfmod.so.13
+              ${CMAKE_BINARY_DIR}/fmodstudioapi20233linux/api/core/lib/arm64/libfmod.so.13.33
             DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
             FOLLOW_SYMLINK_CHAIN
             )
         else ()
           file(
             COPY
-              ${CMAKE_BINARY_DIR}/fmodstudioapi20232linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so
-              ${CMAKE_BINARY_DIR}/fmodstudioapi20232linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13
-              ${CMAKE_BINARY_DIR}/fmodstudioapi20232linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13.32
+              ${CMAKE_BINARY_DIR}/fmodstudioapi20233linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so
+              ${CMAKE_BINARY_DIR}/fmodstudioapi20233linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13
+              ${CMAKE_BINARY_DIR}/fmodstudioapi20233linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13.33
             DESTINATION ${ARCH_PREBUILT_DIRS_RELEASE}
             FOLLOW_SYMLINK_CHAIN
             )
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index 6fa2eb1352..5aadc51869 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.32
+                ${ARCH_PREBUILT_DIRS_RELEASE}/libfmod.so.13.33
             DESTINATION ${_LIB})
         endif (USE_FMODSTUDIO)
 endif (LINUX)