Merge branch 'main' into 2024.08-DeltaFPS

8 files changed, 169 insertions, 25 deletions

diff --git a/README.md b/README.md
index 49eaf468a0..e482553f52 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ $ open newview/Megapahit.app
 ### Debian
 
 ```
-$ sudo apt install cmake pkg-config libxml2-utils libalut-dev libaprutil1-dev libboost-fiber1.81-dev libboost-json1.81-dev libboost-program-options1.81-dev libboost-regex1.81-dev libboost-url1.81-dev libcollada-dom-dev libexpat1-dev libfltk1.3-dev libfontconfig-dev libfreetype-dev libglu1-mesa-dev libhunspell-dev libjpeg-dev libmeshoptimizer-dev libnghttp2-dev libpipewire-0.3-dev libpng-dev libsdl2-dev liburiparser-dev libvlc-dev libvlccore-dev libvorbis-dev libxft-dev libxmlrpc-epi-dev libxxhash-dev
+$ sudo apt install cmake pkg-config libxml2-utils libalut-dev libaprutil1-dev libboost-fiber1.81-dev libboost-json1.81-dev libboost-program-options1.81-dev libboost-regex1.81-dev libboost-url1.81-dev libcollada-dom-dev libexpat1-dev libfltk1.3-dev libfontconfig-dev libfreetype-dev libglu1-mesa-dev libhunspell-dev libjpeg-dev libmeshoptimizer-dev libminizip-dev libnghttp2-dev libpcre3-dev libpipewire-0.3-dev libpng-dev libsdl2-dev liburiparser-dev libvlc-dev libvlccore-dev libvorbis-dev libxft-dev libxml2-dev libxmlrpc-epi-dev libxxhash-dev
 $ export LL_BUILD="-O3 -std=c++17 -fPIC -DLL_LINUX=1"
 $ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DADDRESS_SIZE:INTERNAL=64 -DUSESYSTEMLIBS:BOOL=ON -DUSE_OPENAL:BOOL=ON -DUSE_FMODSTUDIO:BOOL=OFF -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 ../indra
 $ make -j`nproc`
@@ -61,7 +61,7 @@ $ megapahit
 ### Ubuntu
 
 ```
-$ sudo apt install cmake pkg-config libxml2-utils libaprutil1-dev libboost-fiber-dev libboost-json-dev libboost-program-options-dev libboost-regex-dev libboost-url-dev libcollada-dom-dev libexpat1-dev libfltk1.3-dev libfontconfig-dev libfreetype-dev libglu1-mesa-dev libhunspell-dev libjpeg-dev libmeshoptimizer-dev libnanosvg-dev libnghttp2-dev libpipewire-0.3-dev libpng-dev libsdl2-dev liburiparser-dev libvlc-dev libvlccore-dev libvorbis-dev libxft-dev libxmlrpc-epi-dev libxxhash-dev
+$ sudo apt install cmake pkg-config libxml2-utils libaprutil1-dev libboost-fiber-dev libboost-json-dev libboost-program-options-dev libboost-regex-dev libboost-url-dev libcollada-dom-dev libexpat1-dev libfltk1.3-dev libfontconfig-dev libfreetype-dev libglu1-mesa-dev libhunspell-dev libjpeg-dev libmeshoptimizer-dev libminizip-dev libnanosvg-dev libnghttp2-dev libpcre3-dev libpipewire-0.3-dev libpng-dev libsdl2-dev liburiparser-dev libvlc-dev libvlccore-dev libvorbis-dev libxft-dev libxml2-dev libxmlrpc-epi-dev libxxhash-dev
 $ export LL_BUILD="-O3 -std=c++17 -fPIC -DLL_LINUX=1"
 $ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DADDRESS_SIZE:INTERNAL=64 -DUSESYSTEMLIBS:BOOL=ON -DUSE_OPENAL:BOOL=OFF -DUSE_FMODSTUDIO: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 ../indra
 $ make -j`nproc`
@@ -73,7 +73,7 @@ $ megapahit
 ### Fedora
 
 ```
-$ sudo dnf install cmake gcc-c++ patchelf apr-util-devel boost-devel boost-url collada-dom-devel expat-devel fltk-devel mesa-libGLU-devel hunspell-devel libnghttp2-devel nanosvg-devel openjpeg-devel pipewire-devel pulseaudio-libs-devel SDL2-devel uriparser-devel vlc-devel libvorbis-devel xmlrpc-epi-devel xxhash-devel
+$ sudo dnf install cmake gcc-c++ patchelf apr-util-devel boost-devel boost-url collada-dom-devel expat-devel fltk-devel mesa-libGLU-devel hunspell-devel minizip-ng-compat-devel libnghttp2-devel nanosvg-devel openjpeg-devel pipewire-devel pulseaudio-libs-devel SDL2-devel uriparser-devel vlc-devel libvorbis-devel xmlrpc-epi-devel xxhash-devel
 $ export LL_BUILD="-O3 -std=c++17 -fPIC -DLL_LINUX=1"
 $ cmake -DCMAKE_BUILD_TYPE:STRING=Release -DADDRESS_SIZE:INTERNAL=64 -DUSESYSTEMLIBS:BOOL=ON -DUSE_OPENAL:BOOL=OFF -DUSE_FMODSTUDIO: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 ../indra
 $ make -j`nproc`
diff --git a/indra/cmake/LLPrimitive.cmake b/indra/cmake/LLPrimitive.cmake
index 96895ae008..03a5d165b3 100644
--- a/indra/cmake/LLPrimitive.cmake
+++ b/indra/cmake/LLPrimitive.cmake
@@ -19,15 +19,11 @@ if( USE_CONAN )
 endif()
 
 if( USESYSTEMLIBS )
-  if( LINUX )
-    include(FindPkgConfig)
-    pkg_check_modules(Colladadom REQUIRED collada-dom)
-    target_compile_definitions( ll::colladadom INTERFACE COLLADA_DOM_SUPPORT141 )
-    target_include_directories( ll::colladadom SYSTEM INTERFACE ${Colladadom_INCLUDE_DIRS} ${Colladadom_INCLUDE_DIRS}/1.4 )
-    target_link_directories( ll::colladadom INTERFACE ${Colladadom_LIBRARY_DIRS} )
-    target_link_libraries( ll::colladadom INTERFACE ${Colladadom_LIBRARIES} )
+  if( LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+    # Build of the collada-dom for Linux and FreeBSD is done in
+    # indra/llprimitive/CMakeLists.txt
     return ()
-  endif( LINUX )
+  endif( LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD)
   include(FindPkgConfig)
   pkg_check_modules(Minizip REQUIRED minizip)
   pkg_check_modules(Libxml2 REQUIRED libxml-2.0)
@@ -81,12 +77,6 @@ if( USESYSTEMLIBS )
           )
       endif (${COLLADADOM_RESULT})
     else( DARWIN )
-      if( CMAKE_SYSTEM_NAME MATCHES FreeBSD )
-        execute_process(
-          COMMAND sed -i "" -e "s/linux/FreeBSD/g" dae/daeUtils.cpp
-          WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src
-          )
-      endif( CMAKE_SYSTEM_NAME MATCHES FreeBSD )
       execute_process(
         COMMAND sed -i "" -e "s/SHARED/STATIC/g" 1.4/CMakeLists.txt
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/3p-colladadom-2.3-r4/src
diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake
index 8d911b339c..4034599fde 100644
--- a/indra/cmake/Prebuilt.cmake
+++ b/indra/cmake/Prebuilt.cmake
@@ -119,3 +119,14 @@ macro ( use_system_binary package )
   endif()
 endmacro()
 
+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(ARCHIVE_EXTRACT INPUT ${filename}
+	  DESTINATION ${CMAKE_SOURCE_DIR}/../..)
+  execute_process(COMMAND ${Patch_EXECUTABLE} "-p1" "-i"
+	  ${CMAKE_SOURCE_DIR}/../patches/${patch}
+	  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../${dirname})
+endmacro()
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
index 02be121506..8d403dc6c8 100644
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -3,6 +3,7 @@
 project(llprimitive)
 
 include(00-Common)
+include(Prebuilt)
 include(LLCommon)
 include(LLCoreHttp)
 include(LLPhysicsExtensions)
@@ -11,6 +12,25 @@ include(GLH)
 include(GLM)
 include(TinyGLTF)
 
+if(LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD )
+  prepare_thirdparty(
+	  "https://github.com/secondlife/3p-colladadom/archive/refs/tags/v2.3-r7.tar.gz"
+	  "colladadom-v2.3-r7.tar.gz"
+	  "3p-colladadom-2.3-r7"
+	  "collada-dom-v2.3-r7.patch"
+	  "0d7a13531eb0de8c617b48af90c3b5b22c2a0b566069d1a0c36f9602dbfeb9ebab1516556e6dda34645d63354c3c6539375d7e5b8c0b36baba11312d18a3c705"
+  )
+  set(OPT_COLLADA14 TRUE)
+  add_subdirectory(
+	  "${CMAKE_SOURCE_DIR}/../../3p-colladadom-2.3-r7" "colladadom")
+  target_include_directories(
+	  ll::colladadom INTERFACE
+	  ${colladadom_SOURCE_DIR}/include
+	  ${colladadom_SOURCE_DIR}/include/1.4
+  )
+  target_link_libraries( ll::colladadom INTERFACE collada14dom )
+endif(LINUX OR CMAKE_SYSTEM_NAME MATCHES FreeBSD )
+
 set(llprimitive_SOURCE_FILES
     lldaeloader.cpp
     llgltfloader.cpp
diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp
index 544db36b50..34af3ffece 100644
--- a/indra/llprimitive/lldaeloader.cpp
+++ b/indra/llprimitive/lldaeloader.cpp
@@ -935,20 +935,12 @@ bool LLDAELoader::OpenFile(const std::string& filename)
     domCOLLADA* dom;
     if (mPreprocessDAE)
     {
-#if __FreeBSD__ || (LL_USESYSTEMLIBS && LL_LINUX)
-        dom = static_cast<domCOLLADA *>(dae.openFromMemory(uri_filename, preprocessDAE(filename).c_str()));
-#else
         dom = dae.openFromMemory(uri_filename, preprocessDAE(filename).c_str());
-#endif
     }
     else
     {
         LL_INFOS() << "Skipping dae preprocessing" << LL_ENDL;
-#if __FreeBSD__ || (LL_USESYSTEMLIBS && LL_LINUX)
-        dom = static_cast<domCOLLADA *>(dae.open(uri_filename));
-#else
         dom = dae.open(uri_filename);
-#endif
     }
 
     if (!dom)
diff --git a/indra/newview/skins/default/textures/windows/Window_Background.png b/indra/newview/skins/default/textures/windows/Window_Background.png
index 83b45f9343..21149351c8 100644
--- a/indra/newview/skins/default/textures/windows/Window_Background.png
+++ b/indra/newview/skins/default/textures/windows/Window_Background.png
diff --git a/indra/newview/skins/default/textures/windows/Window_Foreground.png b/indra/newview/skins/default/textures/windows/Window_Foreground.png
index db4b58916f..4a64fd468a 100644
--- a/indra/newview/skins/default/textures/windows/Window_Foreground.png
+++ b/indra/newview/skins/default/textures/windows/Window_Foreground.png
diff --git a/patches/collada-dom-v2.3-r7.patch b/patches/collada-dom-v2.3-r7.patch
new file mode 100644
index 0000000000..f80a42580e
--- /dev/null
+++ b/patches/collada-dom-v2.3-r7.patch
@@ -0,0 +1,131 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b1c1993..cdcba63 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,14 +1,25 @@
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+-set(COLLADA14_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/1.4)
+-set(COLLADA15_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include/1.5)
++project(colladadom)
++cmake_minimum_required(VERSION 3.17)
++
++include(FindPkgConfig)
++
++find_package(Boost REQUIRED CONFIG)
++pkg_check_modules(LIBXML2 libxml-2.0)
++pkg_check_modules(MINIZIP minizip)
++pkg_check_modules(ZLIB zlib)
++
++set(COLLADA_DOM_SOVERSION "0")
++set(COLLADA_DOM_VERSION "2.3")
++
+ file(GLOB dae_files ${CMAKE_CURRENT_SOURCE_DIR}/src/dae/*.cpp)
+ file(GLOB libxmlplugin_files ${CMAKE_CURRENT_SOURCE_DIR}/src/modules/LIBXMLPlugin/*.cpp)
+ file(GLOB stddatabase_files ${CMAKE_CURRENT_SOURCE_DIR}/src/modules/STLDatabase/*.cpp)
+ file(GLOB stderrplugin_files ${CMAKE_CURRENT_SOURCE_DIR}/src/modules/stdErrPlugin/*.cpp)
+ 
+ set(COLLADA_BASE_SOURCES ${dae_files} ${libxmlplugin_files} ${stddatabase_files} ${stderrplugin_files})
+-set(COLLADA_LIBS minizip ${ZLIB_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
+-set(COLLADA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} ${Boost_CFLAGS} -DDOM_INCLUDE_LIBXML")
++set(COLLADA_LIBS ${LIBXML2_LIBRARIES} ${MINIZIP_LIBRARIES} ${ZLIB_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_REGEX_LIBRARY})
++list(JOIN MINIZIP_CFLAGS " " VAR_MINIZIP_CFLAGS)
++set(COLLADA_COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} ${VAR_MINIZIP_CFLAGS} ${Boost_CFLAGS} -DDOM_INCLUDE_LIBXML")
+ 
+ if( OPT_COLLADA15 )
+   add_subdirectory(src/1.5)
+@@ -17,8 +28,8 @@ if( OPT_COLLADA14 )
+   add_subdirectory(src/1.4)
+ endif()
+ 
+-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/1.4 DESTINATION ${COLLADA_DOM_INCLUDE_INSTALL_DIR} PATTERN ".svn" EXCLUDE PATTERN ".~" EXCLUDE)
+-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/1.5 DESTINATION ${COLLADA_DOM_INCLUDE_INSTALL_DIR} PATTERN ".svn" EXCLUDE PATTERN ".~" EXCLUDE)
+-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/dae DESTINATION ${COLLADA_DOM_INCLUDE_INSTALL_DIR} PATTERN ".svn" EXCLUDE PATTERN ".~" EXCLUDE)
+-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/modules DESTINATION ${COLLADA_DOM_INCLUDE_INSTALL_DIR} PATTERN ".svn" EXCLUDE PATTERN ".~" EXCLUDE)
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/dae.h ${CMAKE_CURRENT_SOURCE_DIR}/include/dae.h DESTINATION ${COLLADA_DOM_INCLUDE_INSTALL_DIR})
++# install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/1.4 DESTINATION ${COLLADA_DOM_INCLUDE_INSTALL_DIR} PATTERN ".svn" EXCLUDE PATTERN ".~" EXCLUDE)
++# install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/1.5 DESTINATION ${COLLADA_DOM_INCLUDE_INSTALL_DIR} PATTERN ".svn" EXCLUDE PATTERN ".~" EXCLUDE)
++# install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/dae DESTINATION ${COLLADA_DOM_INCLUDE_INSTALL_DIR} PATTERN ".svn" EXCLUDE PATTERN ".~" EXCLUDE)
++# install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/modules DESTINATION ${COLLADA_DOM_INCLUDE_INSTALL_DIR} PATTERN ".svn" EXCLUDE PATTERN ".~" EXCLUDE)
++# install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/dae.h ${CMAKE_CURRENT_SOURCE_DIR}/include/dae.h DESTINATION ${COLLADA_DOM_INCLUDE_INSTALL_DIR})
+diff --git a/src/1.4/CMakeLists.txt b/src/1.4/CMakeLists.txt
+index 17fbaea..93b8256 100644
+--- a/src/1.4/CMakeLists.txt
++++ b/src/1.4/CMakeLists.txt
+@@ -1,10 +1,26 @@
+ file(GLOB dom_files ${CMAKE_CURRENT_SOURCE_DIR}/dom/*.cpp)
+-include_directories(${COLLADA14_INCLUDE_DIR})
+-add_library(collada14dom SHARED ${COLLADA_BASE_SOURCES} ${dom_files})
++add_library(collada14dom STATIC ${COLLADA_BASE_SOURCES} ${dom_files})
++target_compile_options(collada14dom PRIVATE
++	"-Wno-error=unused-result" "-Wno-cast-user-defined" "-Wno-nonnull"
++)
++target_include_directories(collada14dom PRIVATE
++	${colladadom_SOURCE_DIR}/include
++	${colladadom_SOURCE_DIR}/include/1.4
++	${Boost_INCLUDE_DIRS}
++	${LIBXML2_INCLUDE_DIRS}
++	${MINIZIP_INCLUDE_DIRS}
++	${ZLIB_INCLUDE_DIRS}
++)
++target_link_directories(collada14dom INTERFACE
++	${Boost_LIBRARY_DIRS}
++	${LIBXML2_LIBRARY_DIRS}
++	${MINIZIP_LIBRARY_DIRS}
++	${ZLIB_LIBRARY_DIRS}
++)
+ target_link_libraries(collada14dom ${COLLADA_LIBS})
+ set_target_properties(collada14dom PROPERTIES
+   COMPILE_FLAGS "${COLLADA_COMPILE_FLAGS}"
+   CLEAN_DIRECT_OUTPUT 1
+   SOVERSION ${COLLADA_DOM_SOVERSION}
+   VERSION ${COLLADA_DOM_VERSION})
+-install(TARGETS collada14dom DESTINATION lib${LIB_SUFFIX})
++# install(TARGETS collada14dom DESTINATION ${COLLADA_DOM_LIBS_INSTALL_DIR})
+diff --git a/src/1.5/CMakeLists.txt b/src/1.5/CMakeLists.txt
+index e061a01..fb73a70 100644
+--- a/src/1.5/CMakeLists.txt
++++ b/src/1.5/CMakeLists.txt
+@@ -1,10 +1,10 @@
+ file(GLOB dom_files ${CMAKE_CURRENT_SOURCE_DIR}/dom/*.cpp)
+ include_directories(${COLLADA15_INCLUDE_DIR})
+-add_library(collada15dom SHARED ${COLLADA_BASE_SOURCES} ${dom_files})
++add_library(collada15dom STATIC ${COLLADA_BASE_SOURCES} ${dom_files})
+ target_link_libraries(collada15dom ${COLLADA_LIBS})
+ set_target_properties(collada15dom PROPERTIES
+   COMPILE_FLAGS "${COLLADA_COMPILE_FLAGS}"
+   CLEAN_DIRECT_OUTPUT 1
+   SOVERSION ${COLLADA_DOM_SOVERSION}
+   VERSION ${COLLADA_DOM_VERSION})
+-install(TARGETS collada15dom DESTINATION lib${LIB_SUFFIX})
++install(TARGETS collada15dom DESTINATION ${COLLADA_DOM_LIBS_INSTALL_DIR})
+diff --git a/src/dae/daeUtils.cpp b/src/dae/daeUtils.cpp
+index 682692c..0e61ef1 100644
+--- a/src/dae/daeUtils.cpp
++++ b/src/dae/daeUtils.cpp
+@@ -118,7 +118,7 @@ list<string> cdom::makeStringList(const char* s, ...) {
+ 	va_end(args);
+ 	return result;
+ }
+-#endif 0
++#endif // 0
+ 
+ string cdom::getCurrentDir() {
+ #ifdef __CELLOS_LV2__
+@@ -154,7 +154,7 @@ char cdom::getFileSeparator() {
+ const string& cdom::getSystemTmpDir() {
+ #ifdef WIN32
+     static string tmpDir = string(getenv("TMP")) + getFileSeparator();
+-#elif defined(__linux__) || defined(__linux)
++#elif defined(__linux__) || defined(__linux) || defined(__FreeBSD__)
+     static string tmpDir = "/tmp/";
+ #elif defined __APPLE_CC__
+ static string tmpDir = string(getenv("TMPDIR"));
+@@ -173,7 +173,7 @@ string cdom::getRandomFileName() {
+     std::string tmp(tmpnam(&tmpbuffer[0]));
+ #ifdef WIN32
+     randomSegment = tmp.substr(tmp.find_last_of('\\')+1);
+-#elif defined(__linux__) || defined(__linux)
++#elif defined(__linux__) || defined(__linux) || defined(__FreeBSD__)
+     randomSegment = tmp.substr(tmp.find_last_of('/')+1);
+ #elif defined __APPLE_CC__
+ 	randomSegment = tmp.substr(tmp.find_last_of('/')+1);