Skip to content
Open

2026.01 #5097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
d294d56
#4411 WIP initial restoring of Legacy Search
maxim-productengine Oct 21, 2025
b4090c2
Ensure final EOF in LLProcess test (#4877)
marchcat Oct 22, 2025
ab3106d
Updated APR library and removed hotfix patch in APR cmake
Hecklezz Oct 22, 2025
6a5d4e0
#4876 Fix material not applying
akleshchev Oct 22, 2025
bb26aa3
#4652 Improve switching of webrtc devices
akleshchev Oct 21, 2025
0da96a5
p#494 Add search by agent ID to resident chooser
akleshchev Oct 22, 2025
b0c9757
#4411 WIP add Web tab to legacy Search
maxim-productengine Oct 22, 2025
0bd9e8d
#4884 Crash at resetRegionCrossingTimer
akleshchev Oct 23, 2025
d0b7731
#4886 Crash on LLTeleportRequestViaLure::toOstream
akleshchev Oct 23, 2025
b44074c
#4411 fix additional search options - category and maturity
maxim-productengine Oct 23, 2025
34dcaaa
#4887 Fix access violation in LLInventoryModelBackgroundFetch::bulkFe…
marchcat Oct 23, 2025
0e3ba50
Revert "Improve switching of webrtc devices"
akleshchev Oct 26, 2025
4100b0c
#4411 UI adjustments
maxim-productengine Oct 27, 2025
8bcbb33
Fix indentation and trailing-whitespace
maxim-productengine Oct 27, 2025
84b2861
Mac build fix and clean up
maxim-productengine Oct 27, 2025
88aa94f
#4879 An Emoji in a display name can affect text in chat
akleshchev Oct 27, 2025
fa05510
#3649 Incorrect camera aspec ratio
akleshchev Oct 29, 2025
1d42bf7
#3670 Add a sortable status column to the list of gestures
akleshchev Oct 30, 2025
bd8fe9d
#1112 Add 1024x1024 size to Snapshot to Inventory
akleshchev Oct 30, 2025
e2a741d
Merge pull request #4900 from secondlife/maxim/2025.08-legacy-search
maxim-productengine Oct 31, 2025
b22900f
SL-3609 Fix camera POV jump when avatar crosses a region boundary
akleshchev Nov 3, 2025
675ad41
#4411 fix occurrences of fake BOOL
maxim-productengine Nov 4, 2025
11daae1
Bump actions/github-script from 7 to 8 (#4865)
dependabot[bot] Nov 4, 2025
eb191cf
Bump actions/labeler from 4 to 6 (#4866)
dependabot[bot] Nov 4, 2025
7d78080
Refactor labeler.yaml to use changed-files syntax
Nov 4, 2025
3504aca
Bump actions/setup-python from 4 to 6 (#4922)
dependabot[bot] Nov 4, 2025
695203b
Add bot* to allowlist in CLA workflow
Nov 4, 2025
c8d08ee
#4931 Fix name cache callbacks not having connections
akleshchev Nov 4, 2025
5e28a5d
#4946 Crash at setShaders
akleshchev Nov 7, 2025
20eac2d
#4932 fix @mention being displayed twice if the name has a TM symbol
maxim-productengine Nov 10, 2025
dc34e8e
#4955 Crash on itemChanged
akleshchev Nov 10, 2025
a73bbcc
Check what state pipe is in for a failed test (#4877)
akleshchev Nov 10, 2025
6b7c6b1
#4932 fix @mention being displayed twice if the name has a TM symbol
maxim-productengine Nov 10, 2025
bf4cd86
Remove cpuid feature bits verification in llprocessor.cpp (#4959)
Geenz Nov 10, 2025
3b0c034
#4907 use shortcut to pan camera down
maxim-productengine Nov 11, 2025
1020b5a
Fix crash in updateImagesCreateTextures accessing potentially freed i…
Hecklezz Nov 12, 2025
6e90ff6
Restore support for wavy avatar cloth(#4963)
RyeMutt Nov 12, 2025
ba133e4
#4671 Fix impractically long am/pm labels
akleshchev Nov 11, 2025
c39b35e
Fix crash in updateDistance updating LOD on null mVObjp
Hecklezz Nov 12, 2025
516a3d0
Fix crash in handleHover accessing null parent
Hecklezz Nov 12, 2025
4b78edb
Follow-up null checks on mVObjp to prevent crashes
Hecklezz Nov 13, 2025
d6d453b
#4980 Crashes when uploading a glTF model
akleshchev Nov 14, 2025
1c89ef9
Fix error when adding a widget filename to the mFileNames stack
fmartian Nov 15, 2025
08983d6
Fix the cache from being cleared every launch if NewCacheLocation is …
Hecklezz Nov 16, 2025
c6101b3
#4948 Crash at webrtc's initializeConnection
akleshchev Nov 17, 2025
3e7c67b
#4939 Bugsplat update
akleshchev Nov 12, 2025
b64e580
#4939 Bugsplat often confuses log files on mac, try to make it more r…
akleshchev Nov 17, 2025
fc5500c
Bump actions/stale from 6 to 10
dependabot[bot] Oct 20, 2025
0f2cb6d
#5000 clear duplicate shortcut used to activate Sunrise
maxim-productengine Nov 18, 2025
3d650c4
p#505 GLTF model upload fails to pick textures
akleshchev Nov 18, 2025
260b671
#4735 Remove the word "Viewer" from application shortcut
maxim-productengine Nov 19, 2025
4ca362f
#4991 Cant set cut off mask
akleshchev Nov 19, 2025
45ac4ba
#4651 Improve session shutdown detection
akleshchev Nov 19, 2025
7baa669
SL-9502 p#476 Fix visible hidden column
akleshchev Nov 20, 2025
9d5e716
#4951 Update bugsplat symbol upload
akleshchev Nov 18, 2025
7b2c3f7
#5026 Upload To Folder feature not working
akleshchev Nov 21, 2025
63f5221
MacOS build fix
akleshchev Nov 24, 2025
f00a03b
#5035 Fix missed am/pm switch
akleshchev Nov 24, 2025
18e152e
Fixed LLWindowMacOSX::setCursorPosition scaling gl_pos when it shouldn't
Hecklezz Nov 23, 2025
5c131e4
Introduce menu option and key bind(alt+shift+t) to show/hide reflecti…
RyeMutt Nov 24, 2025
9fe788e
#1963 Restore pelvis rotation debug settings
akleshchev Nov 25, 2025
d4bee6b
#5012 Switch 'chat' from untrusted, to click only
akleshchev Nov 21, 2025
bc4492d
#5046 Remove redundant updates in outfit list #1
akleshchev Nov 25, 2025
3cab5ca
#5046 Fix accordion control's excessive rearranges #2
akleshchev Nov 25, 2025
6686fc2
#5046 Optimize outfit's onRefreshComplete #3
akleshchev Nov 26, 2025
be3810d
#1937 The "Don't show me in search" option is not visually updated
akleshchev Nov 27, 2025
449a5a1
Fix tabs in various source files introduced as part of legacy search
RyeMutt Nov 27, 2025
bae1e10
#4322 Upload>Model button is sometimes disabled on MacOS
akleshchev Nov 27, 2025
54b3f3d
#5072 Use make_shared for more efficient ref counting and allocation
RyeMutt Nov 28, 2025
57ff742
#5078 Replace boost ptr_vector<nullable> with std::vector<std::unique…
RyeMutt Nov 30, 2025
54abf68
#5078 Replace boost::hof::invocable with c++17 std::is_invocable
RyeMutt Nov 30, 2025
ec34a88
#5078 Remove dead llblowfish and llmail code plus related tests
RyeMutt Nov 30, 2025
b3a1b09
Fix occasional build failure observed when llphysicsextensionsos fail…
RyeMutt Nov 28, 2025
afb1f4d
Replace boost noncopyable and undefined function usage with modern c+…
RyeMutt Nov 28, 2025
fb3f0e1
#5078 Replace boost::function with std::function
RyeMutt Dec 1, 2025
416ab83
#5078 Replace boost::assign usage with modern c++ brace initialization
RyeMutt Dec 1, 2025
8fe23ca
Fix build failure introduced in boost::function cleanup from missing …
RyeMutt Dec 1, 2025
19d9ded
#5078 Remove dead experimental atmospherics code
RyeMutt Dec 1, 2025
906c58a
#5083 Fallback to OS open handler in external editor when no editor i…
RyeMutt Dec 1, 2025
c6f1b72
#5078 MacOS Build fix
akleshchev Dec 1, 2025
c62735a
Fix alpha debug overlay rendering in probes and breaking scene lighti…
RyeMutt Dec 1, 2025
7991ae8
#5084 Ressurect Watchdog
akleshchev Dec 1, 2025
3566186
#5086 Fix 'Copy SLURL' generating obsolete http link
akleshchev Dec 2, 2025
5e7e4df
#5084 Better labeling of uncaught events, freezes, crashes
akleshchev Dec 2, 2025
6b866bc
Merge pull request #5094 from secondlife/main
Geenz Dec 3, 2025
0b67b05
Switch version to 2026.01.0 after promotion of 2025.08
akleshchev Dec 2, 2025
3647e95
Merge pull request #5096 from secondlife/develop
Geenz Dec 3, 2025
d249e88
Build fix
marchcat Dec 3, 2025
c4ec3d8
Merge pull request #5100 from secondlife/develop
Geenz Dec 3, 2025
9f82b90
#3612 "Copy SLURL" from Favorites bar not working
akleshchev Dec 5, 2025
4f22c12
#5109 LLExperienceCache crashes on a coroutine
akleshchev Dec 5, 2025
3fd68bc
#4931 Fix missed name cache connection #2
akleshchev Dec 5, 2025
49c73ac
#3612 "Copy SLURL" from Favorites bar not working #2
akleshchev Dec 8, 2025
c551045
#4604 Tweak LLImageBase's 'out of memory' handling
akleshchev Dec 8, 2025
058ee5c
#5122 update version format
maxim-productengine Dec 10, 2025
2c69552
#5122 update version format #2
maxim-productengine Dec 11, 2025
05282cf
#1112 Fix wrong option having size controls
akleshchev Dec 16, 2025
de9a911
#5084 Improve watchdog's feedback
akleshchev Dec 17, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
100 changes: 64 additions & 36 deletions .github/labeler.yaml
Original file line number Diff line number Diff line change
@@ -1,81 +1,109 @@
llappearance:
- indra/llappearance/**/*
- changed-files:
- any-glob-to-any-file: indra/llappearance/**

llaudio:
- indra/llaudio/**/*
- changed-files:
- any-glob-to-any-file: indra/llaudio/**

llcharacter:
- indra/llcharacter/**/*
- changed-files:
- any-glob-to-any-file: indra/llcharacter/**

llcommon:
- indra/llcommon/**/*
- changed-files:
- any-glob-to-any-file: indra/llcommon/**

llcorehttp:
- indra/llcorehttp/**/*
- changed-files:
- any-glob-to-any-file: indra/llcorehttp/**

llcrashlogger:
- indra/llcrashlogger/**/*
- changed-files:
- any-glob-to-any-file: indra/llcrashlogger/**

llfilesystem:
- indra/llfilesystem/**/*
- changed-files:
- any-glob-to-any-file: indra/llfilesystem/**

llimage:
- indra/llimage/**/*
- changed-files:
- any-glob-to-any-file: indra/llimage/**

llimagej2coj:
- indra/llimagej2coj/**/*
- changed-files:
- any-glob-to-any-file: indra/llimagej2coj/**

llinventory:
- indra/llinventory/**/*
- changed-files:
- any-glob-to-any-file: indra/llinventory/**

llkdu:
- indra/llkdu/**/*
- changed-files:
- any-glob-to-any-file: indra/llkdu/**

llmath:
- indra/llmath/**/*
- changed-files:
- any-glob-to-any-file: indra/llmath/**

llmeshoptimizer:
- indra/llmeshoptimizer/**/*
- changed-files:
- any-glob-to-any-file: indra/llmeshoptimizer/**

llmessage:
- indra/llmessage/**/*
- changed-files:
- any-glob-to-any-file: indra/llmessage/**

llplugin:
- indra/llplugin/**/*
- changed-files:
- any-glob-to-any-file: indra/llplugin/**

llprimitive:
- indra/llprimitive/**/*
- changed-files:
- any-glob-to-any-file: indra/llprimitive/**

llrender:
- indra/llrender/**/*
- changed-files:
- any-glob-to-any-file: indra/llrender/**

llui:
- indra/llui/**/*
- changed-files:
- any-glob-to-any-file: indra/llui/**

llwindow:
- indra/llwindow/**/*
- changed-files:
- any-glob-to-any-file: indra/llwindow/**

llxml:
- indra/llxml/**/*
- changed-files:
- any-glob-to-any-file: indra/llxml/**

cmake:
- '**/*.cmake'
- '**/*/cmake/*'
- '**/CMakeLists.txt'
- changed-files:
- any-glob-to-any-file:
- '**/*.cmake'
- '**/*/cmake/*'
- '**/CMakeLists.txt'

python:
- '**/*.py'
- changed-files:
- any-glob-to-any-file: '**/*.py'

c/cpp:
- '**/*.c'
- '**/*.cpp'
- '**/*.cxx'
- '**/*.h'
- '**/*.hpp'
- '**/*.hxx'
- '**/*.i'
- '**/*.inl'
- '**/*.y'

'team:viewer':
- '*'
- changed-files:
- any-glob-to-any-file:
- '**/*.c'
- '**/*.cpp'
- '**/*.cxx'
- '**/*.h'
- '**/*.hpp'
- '**/*.hxx'
- '**/*.i'
- '**/*.inl'
- '**/*.y'

objc:
- changed-files:
- any-glob-to-any-file:
- '**/*.m'
- '**/*.mm'
42 changes: 24 additions & 18 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
ref: ${{ github.event.pull_request.head.sha || github.sha }}

- name: Setup python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: "3.11"
- name: Checkout build variables
Expand Down Expand Up @@ -362,8 +362,9 @@ jobs:

post-windows-symbols:
env:
BUGSPLAT_USER: ${{ secrets.BUGSPLAT_USER }}
BUGSPLAT_PASS: ${{ secrets.BUGSPLAT_PASS }}
BUGSPLAT_DATABASE: "${{ secrets.BUGSPLAT_DATABASE }}"
SYMBOL_UPLOAD_CLIENT_ID: "${{ secrets.BUGSPLAT_SYMBOL_UPLOAD_CLIENT_ID }}"
SYMBOL_UPLOAD_CLIENT_SECRET: "${{ secrets.BUGSPLAT_SYMBOL_UPLOAD_CLIENT_SECRET }}"
needs: build
if: needs.build.outputs.configuration == 'Release'
runs-on: ubuntu-latest
Expand All @@ -374,51 +375,56 @@ jobs:
name: Windows-app
path: _artifacts
- name: Download Windows Symbols
if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
if: env.BUGSPLAT_DATABASE && env.SYMBOL_UPLOAD_CLIENT_ID
uses: actions/download-artifact@v4
with:
name: Windows-symbols
- name: Extract viewer pdb
if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
if: env.BUGSPLAT_DATABASE && env.SYMBOL_UPLOAD_CLIENT_ID
shell: bash
run: |
tar -xJf "${{ needs.build.outputs.viewer_channel }}.sym.tar.xz" -C _artifacts
- name: Post Windows symbols
if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
uses: secondlife-3p/symbol-upload@v10
if: env.BUGSPLAT_DATABASE && env.SYMBOL_UPLOAD_CLIENT_ID
uses: BugSplat-Git/symbol-upload@095d163ae9ceb006d286a731dcd35cf6a1b458c8
with:
username: ${{ env.BUGSPLAT_USER }}
password: ${{ env.BUGSPLAT_PASS }}
database: "SecondLife_Viewer_2018"
clientId: "${{ env.SYMBOL_UPLOAD_CLIENT_ID }}"
clientSecret: "${{ env.SYMBOL_UPLOAD_CLIENT_SECRET }}"
database: "${{ env.BUGSPLAT_DATABASE }}"
application: ${{ needs.build.outputs.viewer_channel }}
version: ${{ needs.build.outputs.viewer_version }}
directory: _artifacts
files: "**/{SecondLifeViewer.exe,llwebrtc.dll,*.pdb}"
node-version: "22"
dumpSyms: false

post-mac-symbols:
env:
BUGSPLAT_USER: ${{ secrets.BUGSPLAT_USER }}
BUGSPLAT_PASS: ${{ secrets.BUGSPLAT_PASS }}
BUGSPLAT_DATABASE: "${{ secrets.BUGSPLAT_DATABASE }}"
SYMBOL_UPLOAD_CLIENT_ID: "${{ secrets.BUGSPLAT_SYMBOL_UPLOAD_CLIENT_ID }}"
SYMBOL_UPLOAD_CLIENT_SECRET: "${{ secrets.BUGSPLAT_SYMBOL_UPLOAD_CLIENT_SECRET }}"
needs: build
if: needs.build.outputs.configuration == 'Release'
runs-on: ubuntu-latest
steps:
- name: Download Mac Symbols
if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
if: env.BUGSPLAT_DATABASE && env.SYMBOL_UPLOAD_CLIENT_ID
uses: actions/download-artifact@v4
with:
name: macOS-symbols
- name: Post Mac symbols
if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS
uses: secondlife-3p/symbol-upload@v10
if: env.BUGSPLAT_DATABASE && env.SYMBOL_UPLOAD_CLIENT_ID
uses: BugSplat-Git/symbol-upload@095d163ae9ceb006d286a731dcd35cf6a1b458c8
with:
username: ${{ env.BUGSPLAT_USER }}
password: ${{ env.BUGSPLAT_PASS }}
database: "SecondLife_Viewer_2018"
clientId: "${{ env.SYMBOL_UPLOAD_CLIENT_ID }}"
clientSecret: "${{ env.SYMBOL_UPLOAD_CLIENT_SECRET }}"
database: "${{ env.BUGSPLAT_DATABASE }}"
application: ${{ needs.build.outputs.viewer_channel }}
version: ${{ needs.build.outputs.viewer_version }} (${{ needs.build.outputs.viewer_version }})
directory: .
files: "**/*.xcarchive.zip"
node-version: "22"
dumpSyms: false

release:
needs: [setup, build, sign-and-package-windows, sign-and-package-mac]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check PR description
uses: actions/github-script@v7
uses: actions/github-script@v8
with:
script: |
const description = context.payload.pull_request.body || '';
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cla.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ jobs:
path-to-signatures: signatures.json
remote-organization-name: secondlife
remote-repository-name: cla-signatures
allowlist: callum@mbp.localdomain,rye@lindenlab.com,rye
allowlist: callum@mbp.localdomain,rye@lindenlab.com,rye,bot*
2 changes: 1 addition & 1 deletion .github/workflows/label.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4
- uses: actions/labeler@v6
with:
configuration-path: .github/labeler.yaml
repo-token: "${{ secrets.GITHUB_TOKEN }}"
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/setup-python@v4
- uses: actions/setup-python@v6
with:
python-version: 3.x
- uses: pre-commit/action@v3.0.1
2 changes: 1 addition & 1 deletion .github/workflows/stale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v6
- uses: actions/stale@v10
id: stale
with:
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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
echo NIGHTLY_DATE=${NIGHTLY_DATE} >> ${GITHUB_ENV}
echo TAG_ID="$(echo ${{ github.sha }} | cut -c1-8)-${{ inputs.project || '${NIGHTLY_DATE}' }}" >> ${GITHUB_ENV}
- name: Update Tag
uses: actions/github-script@v7.0.1
uses: actions/github-script@v8
with:
# use a real access token instead of GITHUB_TOKEN default.
# required so that the results of this tag creation can trigger the build workflow
Expand Down
22 changes: 11 additions & 11 deletions autobuild.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>a21487f4e3a68721fd97edef117795a1b7212a77</string>
<string>3f8e58fe74e144b771858e89a5514bf354964c76</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-apr_suite/releases/download/v1.7.5-r1/apr_suite-1.7.5-12259255574-darwin64-12259255574.tar.zst</string>
<string>https://github.com/secondlife/3p-apr_suite/releases/download/v1.7.5-r2/apr_suite-1.7.5-18696779749-darwin64-18696779749.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -60,11 +60,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>45baf82d3366734e542a2a3749f495b64f5513b4</string>
<string>df36114eb8fb66fdcbb190011222a7d336791d98</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-apr_suite/releases/download/v1.7.5-r1/apr_suite-1.7.5-12259255574-linux64-12259255574.tar.zst</string>
<string>https://github.com/secondlife/3p-apr_suite/releases/download/v1.7.5-r2/apr_suite-1.7.5-18696779749-linux64-18696779749.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
Expand All @@ -74,11 +74,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>bdd35d3b9580d3cdcb98afae639936aaa40e24c4</string>
<string>164705831819d247753c9fd608c2c1ac8dca1883</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-apr_suite/releases/download/v1.7.5-r1/apr_suite-1.7.5-12259255574-windows64-12259255574.tar.zst</string>
<string>https://github.com/secondlife/3p-apr_suite/releases/download/v1.7.5-r2/apr_suite-1.7.5-18696779749-windows64-18696779749.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
Expand All @@ -91,7 +91,7 @@
<key>copyright</key>
<string>Copyright © 2012 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.</string>
<key>version</key>
<string>1.7.5-12259255574</string>
<string>1.7.5-18696779749</string>
<key>name</key>
<string>apr_suite</string>
<key>description</key>
Expand Down Expand Up @@ -166,11 +166,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>cd1f1d55a2488657ec2253774b3a414621f81b24</string>
<string>9bcafdd7e1df6b92096fa850627d4f3437630d4a</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-bugsplat/releases/download/v1.1.5-71fc41e/bugsplat-1.1.1-9599607655-darwin64-9599607655.tar.zst</string>
<string>https://github.com/secondlife/3p-bugsplat/releases/download/v1.2.6-a475cbb/bugsplat-1.2.6-19430122611-darwin64-19430122611.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -180,11 +180,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>9fb0615d17988bd89a2e5ae6d4d19e150afb54a9</string>
<string>4e9f0c1cdbc1cebf6185ecc45228ced7f9af1532</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-bugsplat/releases/download/v1.1.5-71fc41e/bugsplat-5.0.1.0-9599607655-windows64-9599607655.tar.zst</string>
<string>https://github.com/secondlife/3p-bugsplat/releases/download/v1.2.6-a475cbb/bugsplat-6.1.1.0-19430122611-windows64-19430122611.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
Expand Down
5 changes: 0 additions & 5 deletions indra/cmake/APR.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,3 @@ if(DARWIN)
endif()

target_include_directories(ll::apr SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/apr-1)

# 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
file(READ ${LIBS_PREBUILT_DIR}/include/apr-1/apr.h APR_HEADER_CONTENTS)
string(REPLACE "#if !(defined(__attribute__) || defined(__has_attribute))" "#if !defined(__attribute__)" APR_HEADER_CONTENTS "${APR_HEADER_CONTENTS}")
file(WRITE ${LIBS_PREBUILT_DIR}/include/apr-1/apr.h "${APR_HEADER_CONTENTS}")
6 changes: 6 additions & 0 deletions indra/cmake/bugsplat.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,14 @@ if (USE_BUGSPLAT)
elseif (DARWIN)
find_library(BUGSPLAT_LIBRARIES BugsplatMac REQUIRED
NO_DEFAULT_PATH PATHS "${ARCH_PREBUILT_DIRS_RELEASE}")
find_library(CRASHREPORTED_LIBRARIES CrashReporter REQUIRED
NO_DEFAULT_PATH PATHS "${ARCH_PREBUILT_DIRS_RELEASE}")
find_library(HOCKEYSDK_LIBRARIES HockeySDK REQUIRED
NO_DEFAULT_PATH PATHS "${ARCH_PREBUILT_DIRS_RELEASE}")
target_link_libraries( ll::bugsplat INTERFACE
${BUGSPLAT_LIBRARIES}
${CRASHREPORTED_LIBRARIES}
${HOCKEYSDK_LIBRARIES}
)
else (WINDOWS)
message(FATAL_ERROR "BugSplat is not supported; add -DUSE_BUGSPLAT=OFF")
Expand Down
Loading
Loading