Skip to content

Commit f57219e

Browse files
committed
Merge branch 'release/2026.01' into marchcat/devlinux-2601
# Conflicts: # indra/llcommon/llprocessor.cpp # indra/llcorehttp/_refcounted.h # indra/llcorehttp/_thread.h # indra/newview/llfeaturemanager.cpp # indra/newview/llviewershadermgr.cpp
2 parents b49400e + 6b866bc commit f57219e

File tree

472 files changed

+2771
-3775
lines changed

Some content is hidden

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

472 files changed

+2771
-3775
lines changed

.github/labeler.yaml

Lines changed: 64 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,109 @@
11
llappearance:
2-
- indra/llappearance/**/*
2+
- changed-files:
3+
- any-glob-to-any-file: indra/llappearance/**
34

45
llaudio:
5-
- indra/llaudio/**/*
6+
- changed-files:
7+
- any-glob-to-any-file: indra/llaudio/**
68

79
llcharacter:
8-
- indra/llcharacter/**/*
10+
- changed-files:
11+
- any-glob-to-any-file: indra/llcharacter/**
912

1013
llcommon:
11-
- indra/llcommon/**/*
14+
- changed-files:
15+
- any-glob-to-any-file: indra/llcommon/**
1216

1317
llcorehttp:
14-
- indra/llcorehttp/**/*
18+
- changed-files:
19+
- any-glob-to-any-file: indra/llcorehttp/**
1520

1621
llcrashlogger:
17-
- indra/llcrashlogger/**/*
22+
- changed-files:
23+
- any-glob-to-any-file: indra/llcrashlogger/**
1824

1925
llfilesystem:
20-
- indra/llfilesystem/**/*
26+
- changed-files:
27+
- any-glob-to-any-file: indra/llfilesystem/**
2128

2229
llimage:
23-
- indra/llimage/**/*
30+
- changed-files:
31+
- any-glob-to-any-file: indra/llimage/**
2432

2533
llimagej2coj:
26-
- indra/llimagej2coj/**/*
34+
- changed-files:
35+
- any-glob-to-any-file: indra/llimagej2coj/**
2736

2837
llinventory:
29-
- indra/llinventory/**/*
38+
- changed-files:
39+
- any-glob-to-any-file: indra/llinventory/**
3040

3141
llkdu:
32-
- indra/llkdu/**/*
42+
- changed-files:
43+
- any-glob-to-any-file: indra/llkdu/**
3344

3445
llmath:
35-
- indra/llmath/**/*
46+
- changed-files:
47+
- any-glob-to-any-file: indra/llmath/**
3648

3749
llmeshoptimizer:
38-
- indra/llmeshoptimizer/**/*
50+
- changed-files:
51+
- any-glob-to-any-file: indra/llmeshoptimizer/**
3952

4053
llmessage:
41-
- indra/llmessage/**/*
54+
- changed-files:
55+
- any-glob-to-any-file: indra/llmessage/**
4256

4357
llplugin:
44-
- indra/llplugin/**/*
58+
- changed-files:
59+
- any-glob-to-any-file: indra/llplugin/**
4560

4661
llprimitive:
47-
- indra/llprimitive/**/*
62+
- changed-files:
63+
- any-glob-to-any-file: indra/llprimitive/**
4864

4965
llrender:
50-
- indra/llrender/**/*
66+
- changed-files:
67+
- any-glob-to-any-file: indra/llrender/**
5168

5269
llui:
53-
- indra/llui/**/*
70+
- changed-files:
71+
- any-glob-to-any-file: indra/llui/**
5472

5573
llwindow:
56-
- indra/llwindow/**/*
74+
- changed-files:
75+
- any-glob-to-any-file: indra/llwindow/**
5776

5877
llxml:
59-
- indra/llxml/**/*
78+
- changed-files:
79+
- any-glob-to-any-file: indra/llxml/**
6080

6181
cmake:
62-
- '**/*.cmake'
63-
- '**/*/cmake/*'
64-
- '**/CMakeLists.txt'
82+
- changed-files:
83+
- any-glob-to-any-file:
84+
- '**/*.cmake'
85+
- '**/*/cmake/*'
86+
- '**/CMakeLists.txt'
6587

6688
python:
67-
- '**/*.py'
89+
- changed-files:
90+
- any-glob-to-any-file: '**/*.py'
6891

6992
c/cpp:
70-
- '**/*.c'
71-
- '**/*.cpp'
72-
- '**/*.cxx'
73-
- '**/*.h'
74-
- '**/*.hpp'
75-
- '**/*.hxx'
76-
- '**/*.i'
77-
- '**/*.inl'
78-
- '**/*.y'
79-
80-
'team:viewer':
81-
- '*'
93+
- changed-files:
94+
- any-glob-to-any-file:
95+
- '**/*.c'
96+
- '**/*.cpp'
97+
- '**/*.cxx'
98+
- '**/*.h'
99+
- '**/*.hpp'
100+
- '**/*.hxx'
101+
- '**/*.i'
102+
- '**/*.inl'
103+
- '**/*.y'
104+
105+
objc:
106+
- changed-files:
107+
- any-glob-to-any-file:
108+
- '**/*.m'
109+
- '**/*.mm'

.github/workflows/build.yaml

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
df -h
106106
107107
- name: Setup python
108-
uses: actions/setup-python@v5
108+
uses: actions/setup-python@v6
109109
with:
110110
python-version: "3.11"
111111
- name: Checkout build variables
@@ -401,8 +401,9 @@ jobs:
401401

402402
post-windows-symbols:
403403
env:
404-
BUGSPLAT_USER: ${{ secrets.BUGSPLAT_USER }}
405-
BUGSPLAT_PASS: ${{ secrets.BUGSPLAT_PASS }}
404+
BUGSPLAT_DATABASE: "${{ secrets.BUGSPLAT_DATABASE }}"
405+
SYMBOL_UPLOAD_CLIENT_ID: "${{ secrets.BUGSPLAT_SYMBOL_UPLOAD_CLIENT_ID }}"
406+
SYMBOL_UPLOAD_CLIENT_SECRET: "${{ secrets.BUGSPLAT_SYMBOL_UPLOAD_CLIENT_SECRET }}"
406407
needs: build
407408
if: needs.build.outputs.configuration == 'Release'
408409
runs-on: ubuntu-latest
@@ -413,51 +414,56 @@ jobs:
413414
name: Windows-app
414415
path: _artifacts
415416
- name: Download Windows Symbols
416-
if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
417+
if: env.BUGSPLAT_DATABASE && env.SYMBOL_UPLOAD_CLIENT_ID
417418
uses: actions/download-artifact@v4
418419
with:
419420
name: Windows-symbols
420421
- name: Extract viewer pdb
421-
if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
422+
if: env.BUGSPLAT_DATABASE && env.SYMBOL_UPLOAD_CLIENT_ID
422423
shell: bash
423424
run: |
424425
tar -xJf "${{ needs.build.outputs.viewer_channel }}.sym.tar.xz" -C _artifacts
425426
- name: Post Windows symbols
426-
if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
427-
uses: secondlife-3p/symbol-upload@v10
427+
if: env.BUGSPLAT_DATABASE && env.SYMBOL_UPLOAD_CLIENT_ID
428+
uses: BugSplat-Git/symbol-upload@095d163ae9ceb006d286a731dcd35cf6a1b458c8
428429
with:
429-
username: ${{ env.BUGSPLAT_USER }}
430-
password: ${{ env.BUGSPLAT_PASS }}
431-
database: "SecondLife_Viewer_2018"
430+
clientId: "${{ env.SYMBOL_UPLOAD_CLIENT_ID }}"
431+
clientSecret: "${{ env.SYMBOL_UPLOAD_CLIENT_SECRET }}"
432+
database: "${{ env.BUGSPLAT_DATABASE }}"
432433
application: ${{ needs.build.outputs.viewer_channel }}
433434
version: ${{ needs.build.outputs.viewer_version }}
434435
directory: _artifacts
435436
files: "**/{SecondLifeViewer.exe,llwebrtc.dll,*.pdb}"
437+
node-version: "22"
438+
dumpSyms: false
436439

437440
post-mac-symbols:
438441
env:
439-
BUGSPLAT_USER: ${{ secrets.BUGSPLAT_USER }}
440-
BUGSPLAT_PASS: ${{ secrets.BUGSPLAT_PASS }}
442+
BUGSPLAT_DATABASE: "${{ secrets.BUGSPLAT_DATABASE }}"
443+
SYMBOL_UPLOAD_CLIENT_ID: "${{ secrets.BUGSPLAT_SYMBOL_UPLOAD_CLIENT_ID }}"
444+
SYMBOL_UPLOAD_CLIENT_SECRET: "${{ secrets.BUGSPLAT_SYMBOL_UPLOAD_CLIENT_SECRET }}"
441445
needs: build
442446
if: needs.build.outputs.configuration == 'Release'
443447
runs-on: ubuntu-latest
444448
steps:
445449
- name: Download Mac Symbols
446-
if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
450+
if: env.BUGSPLAT_DATABASE && env.SYMBOL_UPLOAD_CLIENT_ID
447451
uses: actions/download-artifact@v4
448452
with:
449453
name: macOS-symbols
450454
- name: Post Mac symbols
451-
if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
452-
uses: secondlife-3p/symbol-upload@v10
455+
if: env.BUGSPLAT_DATABASE && env.SYMBOL_UPLOAD_CLIENT_ID
456+
uses: BugSplat-Git/symbol-upload@095d163ae9ceb006d286a731dcd35cf6a1b458c8
453457
with:
454-
username: ${{ env.BUGSPLAT_USER }}
455-
password: ${{ env.BUGSPLAT_PASS }}
456-
database: "SecondLife_Viewer_2018"
458+
clientId: "${{ env.SYMBOL_UPLOAD_CLIENT_ID }}"
459+
clientSecret: "${{ env.SYMBOL_UPLOAD_CLIENT_SECRET }}"
460+
database: "${{ env.BUGSPLAT_DATABASE }}"
457461
application: ${{ needs.build.outputs.viewer_channel }}
458462
version: ${{ needs.build.outputs.viewer_version }} (${{ needs.build.outputs.viewer_version }})
459463
directory: .
460464
files: "**/*.xcarchive.zip"
465+
node-version: "22"
466+
dumpSyms: false
461467

462468
release:
463469
needs: [setup, build, sign-and-package-windows, sign-and-package-mac]

.github/workflows/check-pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Check PR description
15-
uses: actions/github-script@v7
15+
uses: actions/github-script@v8
1616
with:
1717
script: |
1818
const description = context.payload.pull_request.body || '';

.github/workflows/cla.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ jobs:
2323
path-to-signatures: signatures.json
2424
remote-organization-name: secondlife
2525
remote-repository-name: cla-signatures
26-
26+

.github/workflows/label.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
pull-requests: write
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/labeler@v4
12+
- uses: actions/labeler@v6
1313
with:
1414
configuration-path: .github/labeler.yaml
1515
repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/pre-commit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v5
15-
- uses: actions/setup-python@v4
15+
- uses: actions/setup-python@v6
1616
with:
1717
python-version: 3.x
1818
- uses: pre-commit/[email protected]

.github/workflows/stale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
stale:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/stale@v6
15+
- uses: actions/stale@v10
1616
id: stale
1717
with:
1818
stale-pr-message: This pull request is stale because it has been open 30 days with no activity. Remove stale label or comment or it will be closed in 7 days

.github/workflows/tag-release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
echo NIGHTLY_DATE=${NIGHTLY_DATE} >> ${GITHUB_ENV}
3636
echo TAG_ID="$(echo ${{ github.sha }} | cut -c1-8)-${{ inputs.project || '${NIGHTLY_DATE}' }}" >> ${GITHUB_ENV}
3737
- name: Update Tag
38-
uses: actions/github-script@v7.0.1
38+
uses: actions/github-script@v8
3939
with:
4040
# use a real access token instead of GITHUB_TOKEN default.
4141
# required so that the results of this tag creation can trigger the build workflow

autobuild.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,11 @@
198198
<key>archive</key>
199199
<map>
200200
<key>hash</key>
201-
<string>cd1f1d55a2488657ec2253774b3a414621f81b24</string>
201+
<string>9bcafdd7e1df6b92096fa850627d4f3437630d4a</string>
202202
<key>hash_algorithm</key>
203203
<string>sha1</string>
204204
<key>url</key>
205-
<string>https://github.com/secondlife/3p-bugsplat/releases/download/v1.1.5-71fc41e/bugsplat-1.1.1-9599607655-darwin64-9599607655.tar.zst</string>
205+
<string>https://github.com/secondlife/3p-bugsplat/releases/download/v1.2.6-a475cbb/bugsplat-1.2.6-19430122611-darwin64-19430122611.tar.zst</string>
206206
</map>
207207
<key>name</key>
208208
<string>darwin64</string>
@@ -212,11 +212,11 @@
212212
<key>archive</key>
213213
<map>
214214
<key>hash</key>
215-
<string>9fb0615d17988bd89a2e5ae6d4d19e150afb54a9</string>
215+
<string>4e9f0c1cdbc1cebf6185ecc45228ced7f9af1532</string>
216216
<key>hash_algorithm</key>
217217
<string>sha1</string>
218218
<key>url</key>
219-
<string>https://github.com/secondlife/3p-bugsplat/releases/download/v1.1.5-71fc41e/bugsplat-5.0.1.0-9599607655-windows64-9599607655.tar.zst</string>
219+
<string>https://github.com/secondlife/3p-bugsplat/releases/download/v1.2.6-a475cbb/bugsplat-6.1.1.0-19430122611-windows64-19430122611.tar.zst</string>
220220
</map>
221221
<key>name</key>
222222
<string>windows64</string>

indra/cmake/bugsplat.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,14 @@ if (USE_BUGSPLAT AND NOT LINUX)
2424
elseif (DARWIN)
2525
find_library(BUGSPLAT_LIBRARIES BugsplatMac REQUIRED
2626
NO_DEFAULT_PATH PATHS "${ARCH_PREBUILT_DIRS_RELEASE}")
27+
find_library(CRASHREPORTED_LIBRARIES CrashReporter REQUIRED
28+
NO_DEFAULT_PATH PATHS "${ARCH_PREBUILT_DIRS_RELEASE}")
29+
find_library(HOCKEYSDK_LIBRARIES HockeySDK REQUIRED
30+
NO_DEFAULT_PATH PATHS "${ARCH_PREBUILT_DIRS_RELEASE}")
2731
target_link_libraries( ll::bugsplat INTERFACE
2832
${BUGSPLAT_LIBRARIES}
33+
${CRASHREPORTED_LIBRARIES}
34+
${HOCKEYSDK_LIBRARIES}
2935
)
3036
else (WINDOWS)
3137
message(FATAL_ERROR "BugSplat is not supported; add -DUSE_BUGSPLAT=OFF")

0 commit comments

Comments
 (0)