Merge branch 'main' into 2025.03

14 files changed, 32 insertions, 31 deletions

diff --git a/indra/cmake/FMODSTUDIO.cmake b/indra/cmake/FMODSTUDIO.cmake
index 7baf067029..ea62dd72ce 100644
--- a/indra/cmake/FMODSTUDIO.cmake
+++ b/indra/cmake/FMODSTUDIO.cmake
@@ -34,7 +34,7 @@ if (USE_FMODSTUDIO)
       file(MAKE_DIRECTORY ${LIBS_PREBUILT_DIR}/lib/release)
       if (DARWIN)
         execute_process(
-          COMMAND hdiutil attach -noverify fmodstudioapi20227mac-installer.dmg
+          COMMAND hdiutil attach -noverify fmodstudioapi20228mac-installer.dmg
           WORKING_DIRECTORY $ENV{HOME}/Downloads
           )
         file(
@@ -64,26 +64,26 @@ if (USE_FMODSTUDIO)
         file(WRITE ${PREBUILD_TRACKING_DIR}/fmodstudio_installed "${fmodstudio_installed}")
       else (DARWIN)
         file(ARCHIVE_EXTRACT
-          INPUT $ENV{HOME}/Downloads/fmodstudioapi20227linux.tar.gz
+          INPUT $ENV{HOME}/Downloads/fmodstudioapi20228linux.tar.gz
           DESTINATION ${CMAKE_BINARY_DIR}
           )
         file(
           COPY
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/inc/fmod.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/inc/fmod.hpp
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/inc/fmod_codec.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/inc/fmod_common.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/inc/fmod_dsp.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/inc/fmod_dsp_effects.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/inc/fmod_errors.h
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/inc/fmod_output.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/inc/fmod.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/inc/fmod.hpp
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/inc/fmod_codec.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/inc/fmod_common.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/inc/fmod_dsp.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/inc/fmod_dsp_effects.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/inc/fmod_errors.h
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/inc/fmod_output.h
           DESTINATION ${LIBS_PREBUILT_DIR}/include/fmodstudio
           )
         file(
           COPY
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13
-            ${CMAKE_BINARY_DIR}/fmodstudioapi20227linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13.27
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13
+            ${CMAKE_BINARY_DIR}/fmodstudioapi20228linux/api/core/lib/${CMAKE_SYSTEM_PROCESSOR}/libfmod.so.13.28
           DESTINATION ${LIBS_PREBUILT_DIR}/lib/release
           FOLLOW_SYMLINK_CHAIN
           )
diff --git a/indra/cmake/GLM.cmake b/indra/cmake/GLM.cmake
index 451b7292cb..d411c049ec 100644
--- a/indra/cmake/GLM.cmake
+++ b/indra/cmake/GLM.cmake
@@ -5,10 +5,10 @@ add_library( ll::glm INTERFACE IMPORTED )
 
 if (NOT USESYSTEMLIBS)
 use_system_binary( glm )
-elseif (NOT LINUX)
+elseif (NOT (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu) OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed)))
   find_package( glm REQUIRED )
 endif (NOT USESYSTEMLIBS)
 
-if (LINUX OR USESYSTEMLIBS)
+if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu) OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR NOT USESYSTEMLIBS)
 use_prebuilt_binary(glm)
-endif (LINUX OR USESYSTEMLIBS)
+endif ()
diff --git a/indra/cmake/LibraryInstall.cmake b/indra/cmake/LibraryInstall.cmake
index 1289ce02af..a843f40c99 100644
--- a/indra/cmake/LibraryInstall.cmake
+++ b/indra/cmake/LibraryInstall.cmake
@@ -4,7 +4,7 @@ list(REMOVE_ITEM ${PROJECT_NAME}_HEADER_FILES CMakeLists.txt)
 if (BUILD_SHARED_LIBS)
         if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))
                 set(_LIB lib/${ARCH}-linux-gnu)
-        elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed))
+        elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR (${LINUX_DISTRO} MATCHES gentoo))
                 set(_LIB lib${ADDRESS_SIZE})
         else ()
                 set(_LIB lib)
diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake
index e1bfe10e93..d893ea35b2 100644
--- a/indra/cmake/Meshoptimizer.cmake
+++ b/indra/cmake/Meshoptimizer.cmake
@@ -14,7 +14,7 @@ elseif (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu) OR CM
   return ()
 endif (NOT USESYSTEMLIBS)
 
-if (LINUX OR NOT USESYSTEMLIBS)
+if (LINUX AND NOT (${LINUX_DISTRO} MATCHES gentoo) OR NOT USESYSTEMLIBS)
 use_prebuilt_binary(meshoptimizer)
 elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed OR NOT ${meshoptimizer_installed} EQUAL 0)
   if (NOT EXISTS ${CMAKE_BINARY_DIR}/meshoptimizer-0.21.tar.gz)
@@ -45,7 +45,7 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
       )
     file(WRITE ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed "${meshoptimizer_installed}")
   endif (${MESHOPTIMIZER_RESULT})
-endif (LINUX OR NOT USESYSTEMLIBS)
+endif (LINUX AND NOT (${LINUX_DISTRO} MATCHES gentoo) OR NOT USESYSTEMLIBS)
 
 if (NOT USESYSTEMLIBS AND WINDOWS)
   target_link_libraries( ll::meshoptimizer INTERFACE meshoptimizer.lib)
diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake
index 051435e7cb..751e83051f 100644
--- a/indra/cmake/Prebuilt.cmake
+++ b/indra/cmake/Prebuilt.cmake
@@ -123,10 +123,10 @@ find_package(Patch)
 
 # Download the third party software archive and patch it.
 macro(prepare_thirdparty url filename dirname patch hash)
-  file(DOWNLOAD ${url} ${filename} EXPECTED_HASH SHA512=${hash})
+  file(DOWNLOAD ${url} ${filename})
   file(ARCHIVE_EXTRACT INPUT ${filename}
-	  DESTINATION ${CMAKE_SOURCE_DIR}/../..)
+	  DESTINATION ${CMAKE_BINARY_DIR})
   execute_process(COMMAND ${Patch_EXECUTABLE} "-p1" "-i"
 	  ${CMAKE_SOURCE_DIR}/../patches/${patch}
-	  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../${dirname})
+	  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/${dirname})
 endmacro()
diff --git a/indra/cmake/UnixInstall.cmake b/indra/cmake/UnixInstall.cmake
index 48d84dc062..1fd17a0142 100644
--- a/indra/cmake/UnixInstall.cmake
+++ b/indra/cmake/UnixInstall.cmake
@@ -16,7 +16,7 @@ if (INSTALL)
 
   if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))
     set(_LIB lib/${ARCH}-linux-gnu)
-  elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed))
+  elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR (${LINUX_DISTRO} MATCHES gentoo))
     set(_LIB lib${ADDRESS_SIZE})
   else ()
     set(_LIB lib)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 8e56e6a800..521a1b3ced 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -300,7 +300,7 @@ if (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
     file(WRITE ${PREBUILD_TRACKING_DIR}/sse2neon_installed "0")
   endif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/sse2neon_installed OR NOT ${sse2neon_installed} EQUAL 0)
   target_include_directories(llcommon PUBLIC ${LIBS_PREBUILT_DIR}/include/sse2neon)
-elseif (LINUX)
+elseif (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu) OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed))
   target_include_directories(llcommon PUBLIC ${LIBS_PREBUILT_DIR}/include)
 endif (CMAKE_OSX_ARCHITECTURES MATCHES arm64)
 
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
index 8d2e592a41..00d821c470 100644
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -23,7 +23,7 @@ if(LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD )
   )
   set(OPT_COLLADA14 TRUE)
   add_subdirectory(
-	  "${CMAKE_SOURCE_DIR}/../../3p-colladadom-2.3-r8" "colladadom")
+	  "${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r8" "colladadom")
   target_include_directories(
 	  ll::colladadom INTERFACE
 	  ${colladadom_SOURCE_DIR}/include
diff --git a/indra/llwebrtc/CMakeLists.txt b/indra/llwebrtc/CMakeLists.txt
index 1e9898e5cc..c4971d44b1 100644
--- a/indra/llwebrtc/CMakeLists.txt
+++ b/indra/llwebrtc/CMakeLists.txt
@@ -82,7 +82,7 @@ if (INSTALL)
         set(_LIB ../Frameworks)
     elseif (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))
         set(_LIB lib/${ARCH}-linux-gnu)
-    elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed))
+    elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR (${LINUX_DISTRO} MATCHES gentoo))
         set(_LIB lib${ADDRESS_SIZE})
     else (DARWIN)
         set(_LIB lib)
diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt
index 3fa029f260..1502d16cfc 100644
--- a/indra/media_plugins/cef/CMakeLists.txt
+++ b/indra/media_plugins/cef/CMakeLists.txt
@@ -154,7 +154,7 @@ if (INSTALL)
     elseif (LINUX)
         if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))
             set(_LIB lib/${ARCH}-linux-gnu)
-        elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed))
+        elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR (${LINUX_DISTRO} MATCHES gentoo))
             set(_LIB lib${ADDRESS_SIZE})
         else ()
             set(_LIB lib)
diff --git a/indra/media_plugins/libvlc/CMakeLists.txt b/indra/media_plugins/libvlc/CMakeLists.txt
index 91e6df92de..547733496f 100644
--- a/indra/media_plugins/libvlc/CMakeLists.txt
+++ b/indra/media_plugins/libvlc/CMakeLists.txt
@@ -92,7 +92,7 @@ if (INSTALL)
             )
     elseif (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))
         set(_LIB lib/${ARCH}-linux-gnu)
-    elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed))
+    elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR (${LINUX_DISTRO} MATCHES gentoo))
         set(_LIB lib${ADDRESS_SIZE})
     else (DARWIN)
         set(_LIB lib)
diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index 373c771253..4716cdde36 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -103,7 +103,7 @@ endif (${LINUX_DISTRO} MATCHES arch)
 if (LINUX)
         if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))
                 set(_LIB lib/${ARCH}-linux-gnu)
-        elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed))
+        elseif (${LINUX_DISTRO} MATCHES fedora OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR (${LINUX_DISTRO} MATCHES gentoo))
                 set(_LIB lib${ADDRESS_SIZE})
         else ()
                 set(_LIB lib)
@@ -112,7 +112,7 @@ if (LINUX)
             install(FILES
                 ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so
                 ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13
-                ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13.27
+                ${AUTOBUILD_INSTALL_DIR}/lib/release/libfmod.so.13.28
             DESTINATION ${_LIB})
         endif (USE_FMODSTUDIO)
 endif (LINUX)
diff --git a/indra/newview/linux_tools/megapahit.desktop b/indra/newview/linux_tools/megapahit.desktop
index 05e5d0175a..091df71e11 100755
--- a/indra/newview/linux_tools/megapahit.desktop
+++ b/indra/newview/linux_tools/megapahit.desktop
@@ -5,6 +5,6 @@ Exec=megapahit
 Icon=megapahit
 Terminal=false
 Type=Application
-Categories=Application;Network;
+Categories=Network;
 StartupNotify=true
 X-Desktop-File-Install-Version=3.0"
diff --git a/indra/newview/llcallingcard.h b/indra/newview/llcallingcard.h
index f45adfbfec..156ea90e0a 100644
--- a/indra/newview/llcallingcard.h
+++ b/indra/newview/llcallingcard.h
@@ -30,6 +30,7 @@
 #include <map>
 #include <set>
 #include <string>
+#include <queue>
 #include <vector>
 #include "lluserrelations.h"
 #include "lluuid.h"