Skip to content

Commit c64c16a

Browse files
callumlindencallumlinden
committed
Merge branch 'develop' of https://github.com/secondlife/viewer into callum/voice-moderation-2
2 parents 53d8310 + 0369072 commit c64c16a

File tree

180 files changed

+3995
-1215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+3995
-1215
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Replace tabs with spaces
22
1b68f71348ecf3983b76b40d7940da8377f049b7
33
33418a77b716e122da9778869cdbabe97c83ff37
4+
6b974724826a038b0db794460b322eb4921da735
45
# Trim trailing whitespace
56
a0b3021bdcf76859054fda8e30abb3ed47749e83
67
8444cd9562a6a7b755fcb075864e205122354192

‎.github/dependabot.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
4+
- package-ecosystem: github-actions
5+
directory: /
6+
schedule:
7+
interval: monthly

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ repos:
77
- id: no-trigraphs
88
- id: copyright
99
- id: end-of-file
10-
files: \.(cpp|c|h|py|glsl|cmake|txt)$
10+
files: \.(cpp|c|m|mm|h|py|glsl|cmake|txt)$
1111
exclude: language.txt
1212
- id: indent-with-spaces
13-
files: \.(cpp|c|h|inl|py|glsl|cmake)$
13+
files: \.(cpp|c|m|mm|h|inl|py|glsl|cmake)$
1414
- repo: https://github.com/pre-commit/pre-commit-hooks
15-
rev: v5.0.0
15+
rev: v6.0.0
1616
hooks:
1717
- id: check-xml
1818
- id: mixed-line-ending
1919
- id: trailing-whitespace
20-
files: \.(cpp|c|h|inl|py|glsl|cmake|yaml|sh)$
20+
files: \.(cpp|c|m|mm|h|inl|py|glsl|cmake|yaml|sh)$

‎autobuild.xml‎

Lines changed: 41 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -450,11 +450,11 @@
450450
<key>archive</key>
451451
<map>
452452
<key>hash</key>
453-
<string>d44256458ff0ef4db4c91e8e8cc83e8f98b4f1b8</string>
453+
<string>126e0fa4c16dfd433c9fb7d1d242da98f213d933</string>
454454
<key>hash_algorithm</key>
455455
<string>sha1</string>
456456
<key>url</key>
457-
<string>https://github.com/secondlife/dullahan/releases/download/v1.21.0-CEF_139.0.28/dullahan-1.21.0.202508272158_139.0.28_g55ab8a8_chromium-139.0.7258.139-darwin64-17279703032.tar.zst</string>
457+
<string>https://github.com/secondlife/dullahan/releases/download/v1.24.0-CEF_139.0.40/dullahan-1.24.0.202510081737_139.0.40_g465474a_chromium-139.0.7258.139-darwin64-18353103947.tar.zst</string>
458458
</map>
459459
<key>name</key>
460460
<string>darwin64</string>
@@ -478,11 +478,11 @@
478478
<key>archive</key>
479479
<map>
480480
<key>hash</key>
481-
<string>9d5af766a87052808e4062978504e9af124fb558</string>
481+
<string>20de62c9e57d9e6539c1e2437ec4b46c3ca237bc</string>
482482
<key>hash_algorithm</key>
483483
<string>sha1</string>
484484
<key>url</key>
485-
<string>https://github.com/secondlife/dullahan/releases/download/v1.21.0-CEF_139.0.28/dullahan-1.21.0.202508272159_139.0.28_g55ab8a8_chromium-139.0.7258.139-windows64-17279703032.tar.zst</string>
485+
<string>https://github.com/secondlife/dullahan/releases/download/v1.24.0-CEF_139.0.40/dullahan-1.24.0.202510081738_139.0.40_g465474a_chromium-139.0.7258.139-windows64-18353103947.tar.zst</string>
486486
</map>
487487
<key>name</key>
488488
<string>windows64</string>
@@ -495,7 +495,7 @@
495495
<key>copyright</key>
496496
<string>Copyright (c) 2017, Linden Research, Inc.</string>
497497
<key>version</key>
498-
<string>1.21.0.202508272158_139.0.28_g55ab8a8_chromium-139.0.7258.139</string>
498+
<string>1.24.0.202510081737_139.0.40_g465474a_chromium-139.0.7258.139</string>
499499
<key>name</key>
500500
<string>dullahan</string>
501501
<key>description</key>
@@ -1432,53 +1432,21 @@
14321432
<map>
14331433
<key>platforms</key>
14341434
<map>
1435-
<key>darwin64</key>
1436-
<map>
1437-
<key>archive</key>
1438-
<map>
1439-
<key>creds</key>
1440-
<string>github</string>
1441-
<key>hash</key>
1442-
<string>7facda95e2f00c260513f3d4db42588fa8ba703c</string>
1443-
<key>hash_algorithm</key>
1444-
<string>sha1</string>
1445-
<key>url</key>
1446-
<string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/196289774</string>
1447-
</map>
1448-
<key>name</key>
1449-
<string>darwin64</string>
1450-
</map>
1451-
<key>linux64</key>
1452-
<map>
1453-
<key>archive</key>
1454-
<map>
1455-
<key>creds</key>
1456-
<string>github</string>
1457-
<key>hash</key>
1458-
<string>01d08f13c7bc8d1b95b0330fa6833b7d8274e4d0</string>
1459-
<key>hash_algorithm</key>
1460-
<string>sha1</string>
1461-
<key>url</key>
1462-
<string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/196289775</string>
1463-
</map>
1464-
<key>name</key>
1465-
<string>linux64</string>
1466-
</map>
1467-
<key>windows64</key>
1435+
<key>common</key>
14681436
<map>
14691437
<key>archive</key>
14701438
<map>
14711439
<key>creds</key>
14721440
<string>github</string>
14731441
<key>hash</key>
1474-
<string>6d00345c7d3471bc5f7c1218e014dd0f1a2c069b</string>
1442+
<string>fff82c79edb900c547c40dca9a0e3ebac5a8c7da</string>
14751443
<key>hash_algorithm</key>
14761444
<string>sha1</string>
14771445
<key>url</key>
1478-
<string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/196289778</string>
1446+
<string>https://api.github.com/repos/secondlife/llphysicsextensions_source/releases/assets/299858950</string>
14791447
</map>
14801448
<key>name</key>
1481-
<string>windows64</string>
1449+
<string>common</string>
14821450
</map>
14831451
</map>
14841452
<key>license</key>
@@ -1492,58 +1460,6 @@
14921460
<key>name</key>
14931461
<string>llphysicsextensions_source</string>
14941462
</map>
1495-
<key>llphysicsextensions_stub</key>
1496-
<map>
1497-
<key>platforms</key>
1498-
<map>
1499-
<key>darwin64</key>
1500-
<map>
1501-
<key>archive</key>
1502-
<map>
1503-
<key>hash</key>
1504-
<string>f290b000b31f9e36f2489946cbc99f5e</string>
1505-
<key>url</key>
1506-
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/59995/563653/llphysicsextensions_stub-1.0.542456-darwin64-542456.tar.bz2</string>
1507-
</map>
1508-
<key>name</key>
1509-
<string>darwin64</string>
1510-
</map>
1511-
<key>linux64</key>
1512-
<map>
1513-
<key>archive</key>
1514-
<map>
1515-
<key>hash</key>
1516-
<string>711f4ec769e4b5f59ba25ee43c11bcbc</string>
1517-
<key>url</key>
1518-
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/4724/14846/llphysicsextensions_stub-1.0.504712-linux64-504712.tar.bz2</string>
1519-
</map>
1520-
<key>name</key>
1521-
<string>linux64</string>
1522-
</map>
1523-
<key>windows64</key>
1524-
<map>
1525-
<key>archive</key>
1526-
<map>
1527-
<key>hash</key>
1528-
<string>2e5f1f7046a49d8b0bc295aa878116bc</string>
1529-
<key>url</key>
1530-
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/60043/564063/llphysicsextensions_stub-1.0.542456-windows-542456.tar.bz2</string>
1531-
</map>
1532-
<key>name</key>
1533-
<string>windows64</string>
1534-
</map>
1535-
</map>
1536-
<key>license</key>
1537-
<string>internal</string>
1538-
<key>license_file</key>
1539-
<string>LICENSES/llphysicsextensions.txt</string>
1540-
<key>copyright</key>
1541-
<string>Copyright (c) 2010, Linden Research, Inc.</string>
1542-
<key>version</key>
1543-
<string>1.0.542456</string>
1544-
<key>name</key>
1545-
<string>llphysicsextensions_stub</string>
1546-
</map>
15471463
<key>llphysicsextensions_tpv</key>
15481464
<map>
15491465
<key>platforms</key>
@@ -2966,6 +2882,38 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
29662882
<key>description</key>
29672883
<string>Discord Social SDK</string>
29682884
</map>
2885+
<key>vhacd</key>
2886+
<map>
2887+
<key>platforms</key>
2888+
<map>
2889+
<key>common</key>
2890+
<map>
2891+
<key>archive</key>
2892+
<map>
2893+
<key>hash</key>
2894+
<string>140d8fc952a10edb5f2d72ab405336019ef32cadfa64f0cfce76c9de4bc6268cbc87cc8cd89d3417fb78b531d441701afc8d016bafe4bd275df2707f7daf1387</string>
2895+
<key>hash_algorithm</key>
2896+
<string>blake2b</string>
2897+
<key>url</key>
2898+
<string>https://github.com/AlchemyViewer/3p-vhacd/releases/download/v4.1.0-r2/vhacd-4.1.0-r2-common-18166921729.tar.zst</string>
2899+
</map>
2900+
<key>name</key>
2901+
<string>common</string>
2902+
</map>
2903+
</map>
2904+
<key>license</key>
2905+
<string>BSD</string>
2906+
<key>license_file</key>
2907+
<string>LICENSES/vhacd.txt</string>
2908+
<key>copyright</key>
2909+
<string>Copyright (c) 2011, Khaled Mamou</string>
2910+
<key>version</key>
2911+
<string>4.1.0-r2</string>
2912+
<key>name</key>
2913+
<string>vhacd</string>
2914+
<key>description</key>
2915+
<string>Voxelized Hierarchical Approximate Convex Decomposition</string>
2916+
</map>
29692917
</map>
29702918
<key>package_description</key>
29712919
<map>

‎build.sh‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ installer_Darwin()
7070
{
7171
local package_name="$1"
7272
local package_dir="$(build_dir_Darwin)/newview/"
73-
local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_x86_64\\.dmg\$"
73+
local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_universal\\.dmg\$"
7474
# since the additional packages are built after the base package,
7575
# sorting oldest first ensures that the unqualified package is returned
7676
# even if someone makes a qualified name that duplicates the last word of the base name
@@ -158,7 +158,6 @@ pre_build()
158158

159159
if [[ "$arch" == "Darwin" ]]
160160
then
161-
HAVOK=OFF
162161
SIGNING=("-DENABLE_SIGNING:BOOL=YES" \
163162
"-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.")
164163
fi
@@ -262,8 +261,8 @@ build()
262261
done
263262
fi
264263

265-
# *TODO: Make this a build extension.
266-
package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
264+
# *TODO: Make this a build extension. disabled for now
265+
# package_llphysicsextensions_tpv || fatal "failed building llphysicsextensions packages"
267266
end_section "extensions $variant"
268267

269268
else

‎indra/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llinventory)
7070
add_subdirectory(${LIBS_OPEN_PREFIX}llmath)
7171
add_subdirectory(${LIBS_OPEN_PREFIX}llmeshoptimizer)
7272
add_subdirectory(${LIBS_OPEN_PREFIX}llmessage)
73+
add_subdirectory(${LIBS_OPEN_PREFIX}llphysicsextensionsos)
7374
add_subdirectory(${LIBS_OPEN_PREFIX}llprimitive)
7475
add_subdirectory(${LIBS_OPEN_PREFIX}llrender)
7576
add_subdirectory(${LIBS_OPEN_PREFIX}llfilesystem)

‎indra/cmake/APR.cmake‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,8 @@ if(DARWIN)
3131
endif()
3232

3333
target_include_directories(ll::apr SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/apr-1)
34+
35+
# Fix erroneous check for __attribute__ definition introduced with APR 1.7.5, causing lots of "this declaration may not have extern 'C' linkage" errors in VS
36+
file(READ ${LIBS_PREBUILT_DIR}/include/apr-1/apr.h APR_HEADER_CONTENTS)
37+
string(REPLACE "#if !(defined(__attribute__) || defined(__has_attribute))" "#if !defined(__attribute__)" APR_HEADER_CONTENTS "${APR_HEADER_CONTENTS}")
38+
file(WRITE ${LIBS_PREBUILT_DIR}/include/apr-1/apr.h "${APR_HEADER_CONTENTS}")

‎indra/cmake/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ set(cmake_SOURCE_FILES
6262
UI.cmake
6363
UnixInstall.cmake
6464
Variables.cmake
65+
VHACD.cmake
6566
ViewerMiscLibs.cmake
6667
VisualLeakDetector.cmake
6768
LibVLCPlugin.cmake

‎indra/cmake/LLPhysicsExtensions.cmake‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,25 @@ if (HAVOK)
2222
include(Havok)
2323
use_prebuilt_binary(llphysicsextensions_source)
2424
set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/src)
25-
target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions)
25+
if(DARWIN)
26+
set(LLPHYSICSEXTENSIONS_STUB_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub)
27+
# can't set these library dependencies per-arch here, need to do it using XCODE_ATTRIBUTE_OTHER_LDFLAGS[arch=*] in newview/CMakeLists.txt
28+
#target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions)
29+
#target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensionsstub)
30+
else()
31+
target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions)
32+
target_compile_definitions( llphysicsextensions_impl INTERFACE LL_HAVOK=1 )
33+
endif()
34+
target_include_directories( llphysicsextensions_impl INTERFACE ${LIBS_PREBUILT_DIR}/include/llphysicsextensions)
2635
elseif (HAVOK_TPV)
2736
use_prebuilt_binary(llphysicsextensions_tpv)
28-
target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensions_tpv)
29-
else (HAVOK)
30-
use_prebuilt_binary(llphysicsextensions_stub)
31-
set(LLPHYSICSEXTENSIONS_SRC_DIR ${LIBS_PREBUILT_DIR}/llphysicsextensions/stub)
32-
target_link_libraries( llphysicsextensions_impl INTERFACE llphysicsextensionsstub)
33-
endif (HAVOK)
34-
35-
target_include_directories( llphysicsextensions_impl INTERFACE ${LIBS_PREBUILT_DIR}/include/llphysicsextensions)
37+
if (NOT DARWIN)
38+
if(WINDOWS)
39+
target_link_libraries( llphysicsextensions_impl INTERFACE ${ARCH_PREBUILT_DIRS}/llphysicsextensions_tpv.lib)
40+
elseif(LINUX)
41+
target_link_libraries( llphysicsextensions_impl INTERFACE ${ARCH_PREBUILT_DIRS}/libllphysicsextensions_tpv.a)
42+
endif()
43+
target_compile_definitions( llphysicsextensions_impl INTERFACE LL_HAVOK=1 )
44+
endif()
45+
target_include_directories( llphysicsextensions_impl INTERFACE ${LIBS_PREBUILT_DIR}/include/llphysicsextensions)
46+
endif ()

‎indra/cmake/VHACD.cmake‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# -*- cmake -*-
2+
include(Prebuilt)
3+
4+
add_library(ll::vhacd INTERFACE IMPORTED)
5+
6+
use_system_binary(vhacd)
7+
use_prebuilt_binary(vhacd)
8+
9+
target_include_directories(ll::vhacd SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/vhacd/)

0 commit comments

Comments
 (0)