From 068d2a9b027aea531d816b606ba8a81417bea46d Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 1 Apr 2023 16:16:53 +0200 Subject: [PATCH 01/32] Fix disk cache after merge --- indra/llfilesystem/lldiskcache.cpp | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/indra/llfilesystem/lldiskcache.cpp b/indra/llfilesystem/lldiskcache.cpp index 24e372f335..da3530604d 100644 --- a/indra/llfilesystem/lldiskcache.cpp +++ b/indra/llfilesystem/lldiskcache.cpp @@ -115,8 +115,12 @@ void LLDiskCache::purge() #endif if (boost::filesystem::is_directory(cache_path, ec) && !ec.failed()) { - boost::filesystem::directory_iterator iter(cache_path, ec); - while (iter != boost::filesystem::directory_iterator() && !ec.failed()) + // Optimize asset simple disk cache + //boost::filesystem::directory_iterator iter(cache_path, ec); + //while (iter != boost::filesystem::directory_iterator() && !ec.failed()) + boost::filesystem::recursive_directory_iterator iter(cache_path, ec); + while (iter != boost::filesystem::recursive_directory_iterator() && !ec.failed()) + // { if (boost::filesystem::is_regular_file(*iter, ec) && !ec.failed()) { @@ -469,8 +473,12 @@ void LLDiskCache::clearCache() #endif if (boost::filesystem::is_directory(cache_path, ec) && !ec.failed()) { - boost::filesystem::directory_iterator iter(cache_path, ec); - while (iter != boost::filesystem::directory_iterator() && !ec.failed()) + // Optimize asset simple disk cache + //boost::filesystem::directory_iterator iter(cache_path, ec); + //while (iter != boost::filesystem::directory_iterator() && !ec.failed()) + boost::filesystem::recursive_directory_iterator iter(cache_path, ec); + while (iter != boost::filesystem::recursive_directory_iterator() && !ec.failed()) + // { if (boost::filesystem::is_regular_file(*iter, ec) && !ec.failed()) { @@ -547,8 +555,12 @@ uintmax_t LLDiskCache::dirFileSize(const std::string dir) #endif if (boost::filesystem::is_directory(dir_path, ec) && !ec.failed()) { - boost::filesystem::directory_iterator iter(dir_path, ec); - while (iter != boost::filesystem::directory_iterator() && !ec.failed()) + // Optimize asset simple disk cache + //boost::filesystem::directory_iterator iter(dir_path, ec); + //while (iter != boost::filesystem::directory_iterator() && !ec.failed()) + boost::filesystem::recursive_directory_iterator iter(dir_path, ec); + while (iter != boost::filesystem::recursive_directory_iterator() && !ec.failed()) + // { if (boost::filesystem::is_regular_file(*iter, ec) && !ec.failed()) { From 377ee0065752975c3d3c8ea0d693c1a1198e5bb3 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 1 Apr 2023 19:36:01 +0200 Subject: [PATCH 02/32] Remove some apparently orphaned CMake files --- indra/cmake/FindFMODSTUDIO.cmake | 65 -------------------------------- indra/cmake/FindGLOD.cmake | 36 ------------------ indra/cmake/FindHACD.cmake | 41 -------------------- indra/cmake/FindKDU.cmake | 40 -------------------- indra/cmake/FindLLQtWebkit.cmake | 62 ------------------------------ indra/cmake/FindLibnotify.cmake | 46 ---------------------- indra/cmake/FindNGHTTP2.cmake | 35 ----------------- 7 files changed, 325 deletions(-) delete mode 100644 indra/cmake/FindFMODSTUDIO.cmake delete mode 100644 indra/cmake/FindGLOD.cmake delete mode 100644 indra/cmake/FindHACD.cmake delete mode 100644 indra/cmake/FindKDU.cmake delete mode 100644 indra/cmake/FindLLQtWebkit.cmake delete mode 100644 indra/cmake/FindLibnotify.cmake delete mode 100644 indra/cmake/FindNGHTTP2.cmake diff --git a/indra/cmake/FindFMODSTUDIO.cmake b/indra/cmake/FindFMODSTUDIO.cmake deleted file mode 100644 index 4562b0ae45..0000000000 --- a/indra/cmake/FindFMODSTUDIO.cmake +++ /dev/null @@ -1,65 +0,0 @@ -# -*- cmake -*- - -# - Find FMODSTUDIO -# Find the FMODSTUDIO includes and library -# This module defines -# FMODSTUDIO_INCLUDE_DIR, where to find fmod.h and fmod_errors.h -# FMODSTUDIO_LIBRARIES, the libraries needed to use FMODSTUDIO. -# FMODSTUDIO, If false, do not try to use FMODSTUDIO. -# also defined, but not for general use are -# FMODSTUDIO_LIBRARY, where to find the FMODSTUDIO library. - -FIND_PATH(FMODSTUDIO_INCLUDE_DIR fmod.h PATH_SUFFIXES fmod) - -SET(FMODSTUDIO_NAMES ${FMODSTUDIO_NAMES} fmod fmod_vc) -FIND_LIBRARY(FMODSTUDIO_LIBRARY - NAMES ${FMODSTUDIO_NAMES} - PATH_SUFFIXES fmod - ) - -IF (FMODSTUDIO_SDK_DIR OR WINDOWS) - if(WINDOWS) - set(FMODSTUDIO_SDK_DIR "$ENV{PROGRAMFILES}/FMOD SoundSystem/FMOD Programmers API Windows" CACHE PATH "Path to FMODSTUDIO") - STRING(REGEX REPLACE "\\\\" "/" FMODSTUDIO_SDK_DIR ${FMODSTUDIO_SDK_DIR}) - endif(WINDOWS) - find_library(FMODSTUDIO_LIBRARY - fmod_vc fmodL_vc - PATHS - ${FMODSTUDIO_SDK_DIR}/api/lib - ${FMODSTUDIO_SDK_DIR}/api - ${FMODSTUDIO_SDK_DIR} - ) - find_path(FMODSTUDIO_INCLUDE_DIR fmod.h - ${FMODSTUDIO_SDK_DIR}/api/inc - ${FMODSTUDIO_SDK_DIR}/api - ${FMODSTUDIO_SDK_DIR} - ) - find_path(FMODSTUDIO_INCLUDE_DIR fmod.h - ${FMODSTUDIO_SDK_DIR}/api/inc - ${FMODSTUDIO_SDK_DIR}/api - ${FMODSTUDIO_SDK_DIR} - ) - IF (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR) - SET(FMODSTUDIO_LIBRARIES ${FMODSTUDIO_LIBRARY}) - SET(FMODSTUDIO_FOUND "YES") - endif (FMODSTUDIO_LIBRARY AND FMODSTUDIO_INCLUDE_DIR) -ENDIF (FMODSTUDIO_SDK_DIR OR WINDOWS) - -IF (FMODSTUDIO_FOUND) - IF (NOT FMODSTUDIO_FIND_QUIETLY) - MESSAGE(STATUS "Found FMODSTUDIO: ${FMODSTUDIO_LIBRARIES}") - ENDIF (NOT FMODSTUDIO_FIND_QUIETLY) -ELSE (FMODSTUDIO_FOUND) - IF (FMODSTUDIO_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find FMODSTUDIO library") - ENDIF (FMODSTUDIO_FIND_REQUIRED) -ENDIF (FMODSTUDIO_FOUND) - -# Deprecated declarations. -SET (NATIVE_FMODSTUDIO_INCLUDE_PATH ${FMODSTUDIO_INCLUDE_DIR} ) -GET_FILENAME_COMPONENT (NATIVE_FMODSTUDIO_LIB_PATH ${FMODSTUDIO_LIBRARY} PATH) - -MARK_AS_ADVANCED( - FMODSTUDIO_LIBRARY - FMODSTUDIO_INCLUDE_DIR - ) diff --git a/indra/cmake/FindGLOD.cmake b/indra/cmake/FindGLOD.cmake deleted file mode 100644 index 010a0c5aa4..0000000000 --- a/indra/cmake/FindGLOD.cmake +++ /dev/null @@ -1,36 +0,0 @@ -# -*- cmake -*- - -# - Find GLOD -# This module defines -# GLOD_INCLUDE_DIR, where to find glod.h, etc. -# GLOD_LIBRARIES, the library needed to use GLOD. -# GLOD_FOUND, If false, do not try to use GLOD. - -# LL coded the #include with a glod path in llfloatermodelpreview.cpp -find_path(GLOD_INCLUDE_DIR glod/glod.h) - -set(GLOD_NAMES ${GLOD_NAMES} glod) -find_library(GLOD_LIBRARIES - NAMES ${GLOD_NAMES} - ) - -if (GLOD_LIBRARIES AND GLOD_INCLUDE_DIR) - set(GLOD_FOUND "YES") -else (GLOD_LIBRARIES AND GLOD_INCLUDE_DIR) - set(GLOD_FOUND "NO") -endif (GLOD_LIBRARIES AND GLOD_INCLUDE_DIR) - -if (GLOD_FOUND) - if (NOT GLOD_FIND_QUIETLY) - message(STATUS "Found GLOD: Library in '${GLOD_LIBRARY}' and header in '${GLOD_INCLUDE_DIR}' ") - endif (NOT GLOD_FIND_QUIETLY) -else (GLOD_FOUND) - if (GLOD_FIND_REQUIRED) - message(FATAL_ERROR " * * * * *\nCould not find GLOD library!\n* * * * *") - endif (GLOD_FIND_REQUIRED) -endif (GLOD_FOUND) - -mark_as_advanced( - GLOD_LIBRARIES - GLOD_INCLUDE_DIR - ) diff --git a/indra/cmake/FindHACD.cmake b/indra/cmake/FindHACD.cmake deleted file mode 100644 index 8b466cb49f..0000000000 --- a/indra/cmake/FindHACD.cmake +++ /dev/null @@ -1,41 +0,0 @@ -# -*- cmake -*- - -# - Find HUNSPELL -# This module defines -# HACD_INCLUDE_DIR, where to find hacdHACD.h, etc. -# HACD_LIBRARY, the library needed to use HACD. -# HACD_FOUND, If false, do not try to use HACD. - -find_path(HACD_INCLUDE_DIR llconvexdecomposition.h - PATH_SUFFIXES hacd - ) - -set(HACD_NAMES ${HACD_NAMES} hacd) -find_library(HACD_LIBRARY - NAMES ${HACD_NAMES} - ) - -find_library( LLCONVEXDECOMP_LIBRARY NAMES nd_hacdConvexDecomposition ) - -if (HACD_LIBRARY AND HACD_INCLUDE_DIR AND LLCONVEXDECOMP_LIBRARY) - set(HACD_FOUND "YES") -else (HACD_LIBRARY AND HACD_INCLUDE_DIR AND LLCONVEXDECOMP_LIBRARY) - set(HACD_FOUND "NO") -endif (HACD_LIBRARY AND HACD_INCLUDE_DIR AND LLCONVEXDECOMP_LIBRARY) - - -if (HACD_FOUND) - if (NOT HACD_FIND_QUIETLY) - message(STATUS "Found HACD: Library in '${HACD_LIBRARY}' and header in '${HACD_INCLUDE_DIR}' ") - endif (NOT HACD_FIND_QUIETLY) -else (HACD_FOUND) - if (HACD_FIND_REQUIRED) - message(FATAL_ERROR " * * *\nCould not find HACD library! * * *") - endif (HACD_FIND_REQUIRED) -endif (HACD_FOUND) - -mark_as_advanced( - HACD_LIBRARY - HACD_DECOMP_LIB - HACD_INCLUDE_DIR - ) diff --git a/indra/cmake/FindKDU.cmake b/indra/cmake/FindKDU.cmake deleted file mode 100644 index 3944ad8308..0000000000 --- a/indra/cmake/FindKDU.cmake +++ /dev/null @@ -1,40 +0,0 @@ -# -*- cmake -*- - -# - Find KDU -# This module defines -# KDU_INCLUDE_DIR, where to find kdu.h, etc. -# KDU_LIBRARIES, the library needed to use KDU. -# KDU_FOUND, If false, do not try to use KDU. - -# LL coded the #include with a glod path in llfloatermodelpreview.cpp -find_path(KDU_INCLUDE_DIR kdu_image.h - PATH_SUFFIXES kdu - ) - -set(KDU_NAMES ${KDU_NAMES} kdu) -find_library(KDU_LIBRARIES - NAMES ${KDU_NAMES} - ) - -if (KDU_LIBRARIES AND KDU_INCLUDE_DIR) - set(KDU_FOUND "YES") - set(KDU_INCLUDE_DIRS ${KDU_INCLUDE_DIR}) - set(KDU_LIBRARY ${KDU_LIBRARIES}) -else (KDU_LIBRARIES AND KDU_INCLUDE_DIR) - set(KDU_FOUND "NO") -endif (KDU_LIBRARIES AND KDU_INCLUDE_DIR) - -if (KDU_FOUND) - if (NOT KDU_FIND_QUIETLY) - message(STATUS "Found KDU: Library in '${KDU_LIBRARY}' and header in '${KDU_INCLUDE_DIR}' ") - endif (NOT KDU_FIND_QUIETLY) -else (KDU_FOUND) - if (KDU_FIND_REQUIRED) - message(FATAL_ERROR " * * * * *\nCould not find KDU library!\n* * * * *") - endif (KDU_FIND_REQUIRED) -endif (KDU_FOUND) - -mark_as_advanced( - KDU_LIBRARIES - KDU_INCLUDE_DIR - ) diff --git a/indra/cmake/FindLLQtWebkit.cmake b/indra/cmake/FindLLQtWebkit.cmake deleted file mode 100644 index 2f666d3bf0..0000000000 --- a/indra/cmake/FindLLQtWebkit.cmake +++ /dev/null @@ -1,62 +0,0 @@ -# -*- cmake -*- - -# - Find llqtwebkit -# Find the llqtwebkit includes and library -# This module defines -# LLQTWEBKIT_INCLUDE_DIR, where to find llqtwebkit.h, etc. -# LLQTWEBKIT_LIBRARY, the llqtwebkit library with full path. -# LLQTWEBKIT_FOUND, If false, do not try to use llqtwebkit. -# also defined, but not for general use are -# LLQTWEBKIT_LIBRARIES, the libraries needed to use llqtwebkit. -# LLQTWEBKIT_LIBRARY_DIRS, where to find the llqtwebkit library. -# LLQTWEBKIT_DEFINITIONS - You should add_definitions(${LLQTWEBKIT_DEFINITIONS}) -# before compiling code that includes llqtwebkit library files. - -# Try to use pkg-config first. -# This allows to have two different libllqtwebkit packages installed: -# one for viewer 2.x and one for viewer 1.x. -include(FindPkgConfig) -if (PKG_CONFIG_FOUND) - if (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION) - set(_PACKAGE_ARGS libllqtwebkit>=${LLQtWebkit_FIND_VERSION} REQUIRED) - else (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION) - set(_PACKAGE_ARGS libllqtwebkit) - endif (LLQtWebkit_FIND_REQUIRED AND LLQtWebkit_FIND_VERSION) - if (NOT "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_LESS "2.8.2") - # As virtually nobody will have a pkg-config file for this, do this check always quiet. - # Unfortunately cmake 2.8.2 or higher is required for pkg_check_modules to have a 'QUIET'. - set(_PACKAGE_ARGS ${_PACKAGE_ARGS} QUIET) - endif () - pkg_check_modules(LLQTWEBKIT ${_PACKAGE_ARGS}) -endif (PKG_CONFIG_FOUND) -set(LLQTWEBKIT_DEFINITIONS ${LLQTWEBKIT_CFLAGS_OTHER}) - -find_path(LLQTWEBKIT_INCLUDE_DIR llqtwebkit.h NO_SYSTEM_ENVIRONMENT_PATH HINTS ${LLQTWEBKIT_INCLUDE_DIRS}) - -find_library(LLQTWEBKIT_LIBRARY NAMES llqtwebkit NO_SYSTEM_ENVIRONMENT_PATH HINTS ${LLQTWEBKIT_LIBRARY_DIRS}) - -if (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND) # If pkg-config couldn't find it, pretend we don't have pkg-config. - set(LLQTWEBKIT_LIBRARIES llqtwebkit) - get_filename_component(LLQTWEBKIT_LIBRARY_DIRS ${LLQTWEBKIT_LIBRARY} PATH) -endif (NOT PKG_CONFIG_FOUND OR NOT LLQTWEBKIT_FOUND) - -# Handle the QUIETLY and REQUIRED arguments and set LLQTWEBKIT_FOUND -# to TRUE if all listed variables are TRUE. -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args( - LLQTWEBKIT - DEFAULT_MSG - LLQTWEBKIT_LIBRARY - LLQTWEBKIT_INCLUDE_DIR - LLQTWEBKIT_LIBRARIES - LLQTWEBKIT_LIBRARY_DIRS - ) - -mark_as_advanced( - LLQTWEBKIT_LIBRARY - LLQTWEBKIT_INCLUDE_DIR - LLQTWEBKIT_LIBRARIES - LLQTWEBKIT_LIBRARY_DIRS - LLQTWEBKIT_DEFINITIONS - ) - diff --git a/indra/cmake/FindLibnotify.cmake b/indra/cmake/FindLibnotify.cmake deleted file mode 100644 index 395dac804e..0000000000 --- a/indra/cmake/FindLibnotify.cmake +++ /dev/null @@ -1,46 +0,0 @@ -# -*- cmake -*- - -# - Find libnotify -# Find the libnotify includes and library -# This module defines -# LIBNOTIFY_INCLUDE_DIR, where to find notify.h, etc. -# LIBNOTIFY_LIBRARIES, the libraries needed to use libnotify. -# LIBNOTIFY_FOUND, If false, do not try to use libnotify. -# also defined, but not for general use are -# LIBNOTIFY_LIBRARY, where to find the libnotify library. - -FIND_PATH(LIBNOTIFY_INCLUDE_DIR notify.h - PATH_SUFFIXES libnotify - ) - -SET(LIBNOTIFY_NAMES ${LIBNOTIFY_NAMES} notify) -FIND_LIBRARY(LIBNOTIFY_LIBRARY - NAMES ${LIBNOTIFY_NAMES} - ) - -IF (LIBNOTIFY_LIBRARY AND LIBNOTIFY_INCLUDE_DIR) - SET(LIBNOTIFY_LIBRARIES ${LIBNOTIFY_LIBRARY}) - SET(LIBNOTIFY_FOUND "YES") -ELSE (LIBNOTIFY_LIBRARY AND LIBNOTIFY_INCLUDE_DIR) - SET(LIBNOTIFY_FOUND "NO") -ENDIF (LIBNOTIFY_LIBRARY AND LIBNOTIFY_INCLUDE_DIR) - - -IF (LIBNOTIFY_FOUND) - IF (NOT LIBNOTIFY_FIND_QUIETLY) - MESSAGE(STATUS "Found libnotify: '${LIBNOTIFY_LIBRARIES}' and header in '${LIBNOTIFY_INCLUDE_DIR}'") - ENDIF (NOT LIBNOTIFY_FIND_QUIETLY) -ELSE (LIBNOTIFY_FOUND) - IF (LIBNOTIFY_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find libnotify library") - ENDIF (LIBNOTIFY_FIND_REQUIRED) -ENDIF (LIBNOTIFY_FOUND) - -# Deprecated declarations. -SET (NATIVE_LIBNOTIFY_INCLUDE_PATH ${LIBNOTIFY_INCLUDE_DIR} ) -GET_FILENAME_COMPONENT (NATIVE_LIBNOTIFY_LIB_PATH ${LIBNOTIFY_LIBRARY} PATH) - -MARK_AS_ADVANCED( - LIBNOTIFY_LIBRARY - LIBNOTIFY_INCLUDE_DIR - ) diff --git a/indra/cmake/FindNGHTTP2.cmake b/indra/cmake/FindNGHTTP2.cmake deleted file mode 100644 index c11d88814f..0000000000 --- a/indra/cmake/FindNGHTTP2.cmake +++ /dev/null @@ -1,35 +0,0 @@ -# -*- cmake -*- - -# - Find NGHTTP2 -# This module defines -# NGHTTP2_INCLUDE_DIR, where to find glod.h, etc. -# NGHTTP2_LIBRARIES, the library needed to use NGHTTP2. -# NGHTTP2_FOUND, If false, do not try to use NGHTTP2. - -find_path(NGHTTP2_INCLUDE_DIR nghttp2/nghttp2.h) - -set(NGHTTP2_NAMES ${NGHTTP2_NAMES} nghttp2) -find_library(NGHTTP2_LIBRARIES - NAMES ${NGHTTP2_NAMES} - ) - -if (NGHTTP2_LIBRARIES AND NGHTTP2_INCLUDE_DIR) - set(NGHTTP2_FOUND "YES") -else (NGHTTP2_LIBRARIES AND NGHTTP2_INCLUDE_DIR) - set(NGHTTP2_FOUND "NO") -endif (NGHTTP2_LIBRARIES AND NGHTTP2_INCLUDE_DIR) - -if (NGHTTP2_FOUND) - if (NOT NGHTTP2_FIND_QUIETLY) - message(STATUS "Found NGHTTP2: Library in '${NGHTTP2_LIBRARY}' and header in '${NGHTTP2_INCLUDE_DIR}' ") - endif (NOT NGHTTP2_FIND_QUIETLY) -else (NGHTTP2_FOUND) - if (NGHTTP2_FIND_REQUIRED) - message(FATAL_ERROR " * * * * *\nCould not find NGHTTP2 library!\n* * * * *") - endif (NGHTTP2_FIND_REQUIRED) -endif (NGHTTP2_FOUND) - -mark_as_advanced( - NGHTTP2_LIBRARIES - NGHTTP2_INCLUDE_DIR - ) From b1e8f003e61ec1ed567d4f8d3212e16963af3c3e Mon Sep 17 00:00:00 2001 From: Pork Chop Date: Sun, 2 Apr 2023 23:07:44 +1000 Subject: [PATCH 03/32] Linux: Update various 3p libraries --- autobuild.xml | 24 +++++++++---------- .../llmediaimplgstreamer_syms_raw.inc | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index bc1f8c8596..e3058c92e5 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -106,9 +106,9 @@ archive hash - 88b6b9ebc2eda992b721529921c82066 + 80d157facdba399b3a59c400e29cb625 url - http://3p.firestormviewer.org/glib-2.56.0.220911433-linux64_bionic-220911433.tar.bz2 + http://3p.firestormviewer.org/glib-2.64.6.230870115-linux64-230870115.tar.bz2 name linux64 @@ -552,9 +552,9 @@ archive hash - 45acdda717f95ce9169de9f49199c066 + 1c341bdbb5fd0c8a8930f76e6c1647d4 url - http://3p.firestormviewer.org/apr_suite-1.4.5.230351228-linux64-230351228.tar.bz2 + http://3p.firestormviewer.org/apr_suite-1.4.5.230921251-linux64-230921251.tar.bz2 name linux64 @@ -736,9 +736,9 @@ archive hash - 30b1a9b7637f7a1546d38430064ca582 + 93db28a4c0185c054e705f7069830bcc url - https://3p.firestormviewer.org/colladadom-2.3.222261253-linux64-222261253.tar.bz2 + https://3p.firestormviewer.org/colladadom-2.3.230021615-linux64-230021615.tar.bz2 name linux64 @@ -1030,9 +1030,9 @@ archive hash - bbcfe77b920fb7f00c7f2a494ffc6c43 + 39702f98867a319b090ee04f22d82762 url - http://3p.firestormviewer.org/expat-2.1.1.180841547-linux64-180841547.tar.bz2 + http://3p.firestormviewer.org/expat-2.5.0.230021327-linux64-230021327.tar.bz2 name linux64 @@ -2000,9 +2000,9 @@ archive hash - c68bbfe6c9bd59d182c4d20d966492b4 + a01304d63a12ad3d11bde52c47a3134b url - http://3p.firestormviewer.org/libxml2-2.9.4.222130358-linux64-222130358.tar.bz2 + http://3p.firestormviewer.org/libxml2-2.10.3.230021454-linux64-230021454.tar.bz2 name linux64 @@ -3328,9 +3328,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors archive hash - f810193590cae9b35a1c77b6c72bfb01 + 684de242071b78042c1837c15496d2b5 url - http://3p.firestormviewer.org/xmlrpc_epi-0.54.1.180841935-linux64-180841935.tar.bz2 + http://3p.firestormviewer.org/xmlrpc_epi-0.54.2.230021554-linux64-230021554.tar.bz2 name linux64 diff --git a/indra/media_plugins/gstreamer10/llmediaimplgstreamer_syms_raw.inc b/indra/media_plugins/gstreamer10/llmediaimplgstreamer_syms_raw.inc index da1aa8ec1d..155eeb6809 100644 --- a/indra/media_plugins/gstreamer10/llmediaimplgstreamer_syms_raw.inc +++ b/indra/media_plugins/gstreamer10/llmediaimplgstreamer_syms_raw.inc @@ -20,10 +20,10 @@ LL_GST_SYM(true, gst_caps_from_string, GstCaps *, const gchar *string) LL_GST_SYM(true, gst_caps_get_structure, GstStructure *, const GstCaps *caps, guint index) LL_GST_SYM(true, gst_element_register, gboolean, GstPlugin *plugin, const gchar *name, guint rank, GType type) LL_GST_SYM(true, gst_structure_get_int, gboolean, const GstStructure *structure, const gchar *fieldname, gint *value) -LL_GST_SYM(true, gst_structure_get_value, G_CONST_RETURN GValue *, const GstStructure *structure, const gchar *fieldname) +LL_GST_SYM(true, gst_structure_get_value, const GValue *, const GstStructure *structure, const gchar *fieldname) LL_GST_SYM(true, gst_value_get_fraction_numerator, gint, const GValue *value) LL_GST_SYM(true, gst_value_get_fraction_denominator, gint, const GValue *value) -LL_GST_SYM(true, gst_structure_get_name, G_CONST_RETURN gchar *, const GstStructure *structure) +LL_GST_SYM(true, gst_structure_get_name, const gchar *, const GstStructure *structure) LL_GST_SYM(true, gst_element_seek, bool, GstElement *, gdouble, GstFormat, GstSeekFlags, GstSeekType, gint64, GstSeekType, gint64) LL_GST_SYM(false, gst_registry_fork_set_enabled, void, gboolean enabled) From 3aaebe8ac4c29de3022b1daa374021749fb602c6 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sun, 2 Apr 2023 23:46:42 +0200 Subject: [PATCH 04/32] FIRE-32846, FIRE-32845 Updated French (Laurent Bechir), Russian (Romka Swallowtail) and Polish translations, minor adjustments to English one --- indra/newview/skins/default/xui/en/panel_region_estate.xml | 4 ++-- indra/newview/skins/default/xui/en/strings.xml | 2 +- indra/newview/skins/default/xui/fr/floater_display_name.xml | 1 + indra/newview/skins/default/xui/fr/menu_participant_view.xml | 2 +- indra/newview/skins/default/xui/fr/panel_region_estate.xml | 1 + indra/newview/skins/default/xui/fr/strings.xml | 4 ++-- indra/newview/skins/default/xui/pl/floater_display_name.xml | 2 +- indra/newview/skins/default/xui/pl/menu_participant_view.xml | 2 +- indra/newview/skins/default/xui/pl/panel_region_estate.xml | 2 +- indra/newview/skins/default/xui/pl/strings.xml | 2 +- indra/newview/skins/default/xui/ru/strings.xml | 2 +- 11 files changed, 13 insertions(+), 11 deletions(-) diff --git a/indra/newview/skins/default/xui/en/panel_region_estate.xml b/indra/newview/skins/default/xui/en/panel_region_estate.xml index c1961ee664..cfdaa1f23f 100644 --- a/indra/newview/skins/default/xui/en/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/en/panel_region_estate.xml @@ -122,7 +122,7 @@ layout="topleft" left_delta="0" name="limit_payment" - tool_tip="Residents must have payment information on file to access this estate. See the [SUPPORT_SITE] for more information." + tool_tip="Residents must have payment information on file to access this estate. See the [SUPPORT_SITE] for more information." top_pad="2" width="278" /> - "Login process did not complete due to system issues. Try again in a few minutes. + Login process did not complete due to system issues. Try again in a few minutes. If you feel this is an error, please contact the grid support. Optional viewer update available: [VERSION] Required viewer update: [VERSION] diff --git a/indra/newview/skins/default/xui/fr/floater_display_name.xml b/indra/newview/skins/default/xui/fr/floater_display_name.xml index 203d5996fd..009e3fd98a 100644 --- a/indra/newview/skins/default/xui/fr/floater_display_name.xml +++ b/indra/newview/skins/default/xui/fr/floater_display_name.xml @@ -4,6 +4,7 @@ Vous ne pouvez changer votre nom avant le [TIME]. Nouveau nom : Réécrivez le nom : + + + + + + + Priority: [PRIORITY] Duration: [DURATION]s @@ -86,9 +134,9 @@ Loop: [IS_LOOP] length="1" follows="left|top" font="SansSerif" - height="91" + height="52" layout="topleft" - left_pad="5" + left_pad="10" name="AdvancedStatsRight" top_delta="0" width="150"> @@ -96,4 +144,5 @@ Ease In: [EASE_IN]s Ease Out: [EASE_OUT]s Joints: [NUM_JOINTS] + From 8c484066112e8fe703753f54c8139d3ae9c31ed8 Mon Sep 17 00:00:00 2001 From: Zi Ree Date: Mon, 3 Apr 2023 18:57:57 +0200 Subject: [PATCH 11/32] Add matching checkbox for advanced animation information to preferences --- .../skins/default/xui/en/panel_preferences_firestorm.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml index c3b8bf37b6..1ccbb0ee84 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml @@ -1629,6 +1629,14 @@ tool_tip="If enabled, you can preview animations during the upload process on your own avatar" name="FSUploadAnimationOnOwnAvatar" control_name="FSUploadAnimationOnOwnAvatar"/> + Date: Mon, 3 Apr 2023 18:32:04 +0100 Subject: [PATCH 12/32] Why is Mac missing the include path? --- indra/newview/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index c841616ada..825f33cf7d 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2396,12 +2396,12 @@ if (USE_BUGSPLAT) ) endif (USE_BUGSPLAT) -if (WINDOWS) +if (WINDOWS OR DARWIN) target_link_libraries(${VIEWER_BINARY_NAME} fs::growl # Growl support ${GROWL_LIBRARY} ) -endif (WINDOWS) +endif (WINDOWS OR DARWIN) if( TARGET ll::nvapi ) target_link_libraries(${VIEWER_BINARY_NAME} ll::nvapi ) From 3aa2e83d5843508e2bc0789b0a9f9cfe3409e388 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Mon, 3 Apr 2023 19:50:57 +0200 Subject: [PATCH 13/32] Apply the animation preview floater changes to all langauges; Add tooltip and checkbox in Polish one --- .../xui/da/floater_preview_animation.xml | 12 ++++++---- .../xui/de/floater_preview_animation.xml | 23 +++++++++++-------- .../xui/es/floater_preview_animation.xml | 12 ++++++---- .../xui/fr/floater_preview_animation.xml | 10 ++++---- .../xui/it/floater_preview_animation.xml | 12 ++++++---- .../xui/ja/floater_preview_animation.xml | 12 ++++++---- .../xui/pl/floater_preview_animation.xml | 23 +++++++++++-------- .../xui/pl/panel_preferences_firestorm.xml | 1 + .../xui/pt/floater_preview_animation.xml | 12 ++++++---- .../xui/ru/floater_preview_animation.xml | 22 ++++++++++-------- .../xui/tr/floater_preview_animation.xml | 12 ++++++---- .../xui/zh/floater_preview_animation.xml | 12 ++++++---- 12 files changed, 96 insertions(+), 67 deletions(-) diff --git a/indra/newview/skins/default/xui/da/floater_preview_animation.xml b/indra/newview/skins/default/xui/da/floater_preview_animation.xml index 436843decc..076e4efe82 100644 --- a/indra/newview/skins/default/xui/da/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/da/floater_preview_animation.xml @@ -3,9 +3,11 @@ Animation: [NAME] - - Beskrivelse: - -