summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/cmake/Boost.cmake2
-rw-r--r--indra/cmake/Discord.cmake2
-rw-r--r--indra/cmake/FMODSTUDIO.cmake33
-rw-r--r--indra/cmake/Meshoptimizer.cmake14
-rw-r--r--indra/newview/FixBundle.cmake.in8
-rw-r--r--indra/newview/FixPackage.cmake.in8
-rw-r--r--indra/newview/ViewerInstall.cmake2
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml1
8 files changed, 34 insertions, 36 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 14ea27e686..e754918c5b 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -33,7 +33,7 @@ if (WINDOWS)
else ()
target_link_libraries( ll::boost INTERFACE boost_regex${sfx})
endif ()
-if (NOT (${LINUX_DISTRO} MATCHES arch OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR WINDOWS OR CMAKE_SYSTEM_NAME MATCHES FreeBSD))
+if (NOT (${LINUX_DISTRO} MATCHES arch OR (${LINUX_DISTRO} MATCHES gentoo) OR (${LINUX_DISTRO} MATCHES opensuse-tumbleweed) OR WINDOWS OR CMAKE_SYSTEM_NAME MATCHES FreeBSD))
target_link_libraries( ll::boost INTERFACE boost_system${sfx})
endif ()
target_compile_definitions( ll::boost INTERFACE BOOST_BIND_GLOBAL_PLACEHOLDERS )
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..2342f07e53 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
)
@@ -107,6 +107,7 @@ if (USE_FMODSTUDIO)
target_link_libraries( ll::fmodstudio INTERFACE fmod_vc)
elseif (DARWIN)
#despite files being called libfmod.dylib, we are searching for fmod
+ target_link_directories( ll::fmodstudio INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE})
target_link_libraries( ll::fmodstudio INTERFACE fmod)
elseif (LINUX)
target_link_libraries( ll::fmodstudio INTERFACE fmod)
diff --git a/indra/cmake/Meshoptimizer.cmake b/indra/cmake/Meshoptimizer.cmake
index b1d2796915..225f44b1fb 100644
--- a/indra/cmake/Meshoptimizer.cmake
+++ b/indra/cmake/Meshoptimizer.cmake
@@ -16,20 +16,20 @@ if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu) OR CMAKE_
elseif (LINUX AND CMAKE_SYSTEM_PROCESSOR MATCHES x86_64 AND NOT (${LINUX_DISTRO} MATCHES gentoo))
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)
+ if (NOT EXISTS ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1.tar.gz)
file(DOWNLOAD
- https://github.com/zeux/meshoptimizer/archive/refs/tags/v0.21.tar.gz
- ${CMAKE_BINARY_DIR}/meshoptimizer-0.21.tar.gz
+ https://github.com/zeux/meshoptimizer/archive/refs/tags/v1.0.1.tar.gz
+ ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1.tar.gz
)
endif ()
file(ARCHIVE_EXTRACT
- INPUT ${CMAKE_BINARY_DIR}/meshoptimizer-0.21.tar.gz
+ INPUT ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1.tar.gz
DESTINATION ${CMAKE_BINARY_DIR}
)
try_compile(MESHOPTIMIZER_RESULT
PROJECT meshoptimizer
- SOURCE_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
- BINARY_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
+ SOURCE_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1
+ BINARY_DIR ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1
TARGET meshoptimizer
CMAKE_FLAGS
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
@@ -42,7 +42,7 @@ elseif (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRA
if (${MESHOPTIMIZER_RESULT})
execute_process(
COMMAND ${CMAKE_MAKE_PROGRAM} install
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/meshoptimizer-0.21
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/meshoptimizer-1.0.1
OUTPUT_VARIABLE meshoptimizer_installed
)
file(WRITE ${PREBUILD_TRACKING_DIR}/meshoptimizer_installed "${meshoptimizer_installed}")
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in
index abeb7a8a5e..fbeea05359 100644
--- a/indra/newview/FixBundle.cmake.in
+++ b/indra/newview/FixBundle.cmake.in
@@ -289,7 +289,6 @@ execute_process(
Resources/libndofdev.dylib
Resources/SLPlugin.app/Contents/Frameworks/media_plugin_cef.dylib
Resources/SLPlugin.app/Contents/Frameworks/media_plugin_libvlc.dylib
- Resources/SLPlugin.app/Contents/Frameworks/plugins/liba52_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libaccess_concat_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libaccess_imem_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libaccess_mms_plugin.dylib
@@ -338,8 +337,8 @@ execute_process(
Resources/SLPlugin.app/Contents/Frameworks/plugins/libblend_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libblendbench_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libbluescreen_plugin.dylib
- Resources/SLPlugin.app/Contents/Frameworks/plugins/libbluray-awt-j2se-1.3.2.jar
- Resources/SLPlugin.app/Contents/Frameworks/plugins/libbluray-j2se-1.3.2.jar
+ Resources/SLPlugin.app/Contents/Frameworks/plugins/libbluray-awt-j2se-1.4.0.jar
+ Resources/SLPlugin.app/Contents/Frameworks/plugins/libbluray-j2se-1.4.0.jar
Resources/SLPlugin.app/Contents/Frameworks/plugins/libbonjour_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libcache_block_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libcache_read_plugin.dylib
@@ -360,7 +359,6 @@ execute_process(
Resources/SLPlugin.app/Contents/Frameworks/plugins/libcvdsub_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libcvpx_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdav1d_plugin.dylib
- Resources/SLPlugin.app/Contents/Frameworks/plugins/libdca_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdcp_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libddummy_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdecomp_plugin.dylib
@@ -371,6 +369,7 @@ execute_process(
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdemuxdump_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdiracsys_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdirectory_demux_plugin.dylib
+ Resources/SLPlugin.app/Contents/Frameworks/plugins/libdmxmus_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdolby_surround_decoder_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdummy_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdvbsub_plugin.dylib
@@ -441,7 +440,6 @@ execute_process(
Resources/SLPlugin.app/Contents/Frameworks/plugins/libkeychain_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/liblibass_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/liblibbluray_plugin.dylib
- Resources/SLPlugin.app/Contents/Frameworks/plugins/liblibmpeg2_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/liblive555_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/liblogger_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/liblogo_plugin.dylib
diff --git a/indra/newview/FixPackage.cmake.in b/indra/newview/FixPackage.cmake.in
index c130bf4784..17272f5881 100644
--- a/indra/newview/FixPackage.cmake.in
+++ b/indra/newview/FixPackage.cmake.in
@@ -289,7 +289,6 @@ execute_process(
Resources/libndofdev.dylib
Resources/SLPlugin.app/Contents/Frameworks/media_plugin_cef.dylib
Resources/SLPlugin.app/Contents/Frameworks/media_plugin_libvlc.dylib
- Resources/SLPlugin.app/Contents/Frameworks/plugins/liba52_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libaccess_concat_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libaccess_imem_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libaccess_mms_plugin.dylib
@@ -338,8 +337,8 @@ execute_process(
Resources/SLPlugin.app/Contents/Frameworks/plugins/libblend_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libblendbench_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libbluescreen_plugin.dylib
- Resources/SLPlugin.app/Contents/Frameworks/plugins/libbluray-awt-j2se-1.3.2.jar
- Resources/SLPlugin.app/Contents/Frameworks/plugins/libbluray-j2se-1.3.2.jar
+ Resources/SLPlugin.app/Contents/Frameworks/plugins/libbluray-awt-j2se-1.4.0.jar
+ Resources/SLPlugin.app/Contents/Frameworks/plugins/libbluray-j2se-1.4.0.jar
Resources/SLPlugin.app/Contents/Frameworks/plugins/libbonjour_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libcache_block_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libcache_read_plugin.dylib
@@ -360,7 +359,6 @@ execute_process(
Resources/SLPlugin.app/Contents/Frameworks/plugins/libcvdsub_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libcvpx_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdav1d_plugin.dylib
- Resources/SLPlugin.app/Contents/Frameworks/plugins/libdca_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdcp_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libddummy_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdecomp_plugin.dylib
@@ -371,6 +369,7 @@ execute_process(
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdemuxdump_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdiracsys_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdirectory_demux_plugin.dylib
+ Resources/SLPlugin.app/Contents/Frameworks/plugins/libdmxmus_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdolby_surround_decoder_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdummy_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/libdvbsub_plugin.dylib
@@ -441,7 +440,6 @@ execute_process(
Resources/SLPlugin.app/Contents/Frameworks/plugins/libkeychain_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/liblibass_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/liblibbluray_plugin.dylib
- Resources/SLPlugin.app/Contents/Frameworks/plugins/liblibmpeg2_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/liblive555_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/liblogger_plugin.dylib
Resources/SLPlugin.app/Contents/Frameworks/plugins/liblogo_plugin.dylib
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)
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 36f9ae070f..f3bde4c8f8 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2362,6 +2362,7 @@ function="World.EnvPreset"
</menu_item_check>
<menu_item_check
label="PBR"
+ shortcut="control|alt|shift|]"
name="Rendering Type PBR">
<menu_item_check.on_check
function="Advanced.CheckRenderType"
generated by cgit v1.3 (git 2.53.0) at 2026-03-14 04:02:59 +0000