Skip to content
Open
Show file tree
Hide file tree
Changes from 116 commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
b0f4a14
#2888 show underwater nametags when camera is above the water
maxim-productengine Apr 13, 2026
4926a06
#5639 Initialize LLJointData support category from avatar skeleton (#…
gaiaclary Apr 13, 2026
3ca4bf1
#5639 Fix glTF collision volume bind reconstruction
gaiaclary Apr 13, 2026
933f1e8
secondlife/viewer#5634: Apply version string from janus server if ava…
cosmic-linden Apr 14, 2026
ce24df4
Bump BugSplat-Git/symbol-upload
dependabot[bot] Apr 2, 2026
b0d27d2
#2410 Update notification text to include Combat 2.0 options
maxim-productengine Apr 14, 2026
e00a2ed
Merge pull request #5641 from secondlife/cosmic/janus-set-revision
cosmic-linden Apr 15, 2026
5a8557a
Update viewer copyright year in About licenses
mayconbekkers Apr 15, 2026
8a0ada7
#5647 fix for texture Mapping fields not being updated when selecting…
maxim-productengine Apr 16, 2026
9272e04
#5489 Follow up for appearance fixes
akleshchev Apr 16, 2026
3cb70cc
#5664 remove non-ASCII7 characters from comments
maxim-productengine Apr 17, 2026
f4be102
Fix experiences search and new classifieds content rating labels show…
Hecklezz Apr 17, 2026
14ca82d
Revert "#1625 Blinding white screen when changing environments"
akleshchev Apr 19, 2026
5e38c19
Update velopack with a public build
akleshchev Apr 20, 2026
e03869c
Remove Guidebook entry points
mayconbekkers Apr 14, 2026
f0b083c
LLMuteList::isLoadedFromServer should also include MLS_SERVER_CACHE
DarlCat Apr 20, 2026
4d40048
Cleanup for PR #5269
DarlCat Apr 20, 2026
638c7f7
#5629 Velopack allows uninstall while the viewer is running (#5662)
akleshchev Apr 21, 2026
0cef181
#1355 Permit smaller values in cloud scroll rate
akleshchev Apr 21, 2026
2ea8591
p#475 Excess texture fetch shutdown logging
akleshchev Apr 22, 2026
7117240
#2965 Indicate when role members aren't loaded
akleshchev Dec 6, 2024
f9ac8f4
secondlife/viewer#5702: Ensure non-visible preloaded media has PRIORI…
cosmic-linden Apr 23, 2026
67807bc
#5676 Expand PBR planar aligment to cover all channels
akleshchev Apr 22, 2026
fca6e9f
Revert "Get rid of a duplicate notification"
Hecklezz Apr 24, 2026
72f73ff
#1681 Respect custom logfile during startup
mayconbekkers Apr 27, 2026
9b86487
#5690 fix viewer trying to fetch group chat history for p2p IM
maxim-productengine Apr 27, 2026
b0e867c
Merge pull request #5705 from secondlife/v-5672
cosmic-linden Apr 27, 2026
e0a5e8f
#5724 Crash initing a buy_currency floater
akleshchev Apr 27, 2026
a66e6c9
p#479 make sure running app is the one handling urls
akleshchev Apr 23, 2026
ae9f6a5
p#5719 Detect hybernation
akleshchev Apr 26, 2026
116e802
#5728 Update license files
akleshchev Apr 29, 2026
998c2bc
#5084 Improve watchdog's behavior
akleshchev Mar 6, 2026
e129eac
#5719 Partial detection of shutdown from task manager
akleshchev Apr 28, 2026
6fb576a
#5084 Improve watchdog's behavior #2
akleshchev Apr 29, 2026
30b897d
Bump actions/download-artifact from 4 to 8
dependabot[bot] May 2, 2026
fa7b229
Bump BugSplat-Git/symbol-upload from 10.3.0 to 10.3.2
dependabot[bot] May 2, 2026
d700478
#5682 add LEAP API to get info about web_browser widget
maxim-productengine May 4, 2026
c828dc3
#5084 Fix watchdog's cleanup
akleshchev May 4, 2026
5b5c4e5
#5756 Improve LLUICtrlFactory's performance
akleshchev May 4, 2026
281eb9b
#5756 Performance optimizations around UI
rohvani Oct 6, 2025
709dbea
Bump actions/github-script from 8 to 9
dependabot[bot] May 2, 2026
29335d2
#5232 Crash in handleMessage #2
akleshchev May 5, 2026
9f60b2b
#5742 Add LEAP API to get info about scene-level attached objects
maxim-productengine May 7, 2026
0730640
#5677 Left side of Profile's Pick's location string can be cut
akleshchev May 6, 2026
1d03b21
#4802 Handle KDU crashes
akleshchev May 5, 2026
d2a3a15
#5772 'Control not found' crash
akleshchev May 7, 2026
dfeed0c
#5777 Exception handling for an LLSD formatter
akleshchev May 8, 2026
da71b0b
fix picks from moved regions #5519
trish-sl Apr 28, 2026
6b945de
#5784 fix crash at LLViewerRegion::killInvisibleObjects
maxim-productengine May 11, 2026
a4e8f71
FIX - Prejump regressions
trish-sl Apr 28, 2026
127fe9b
fix: replace non-ASCII source comments
santoslgl01-web Apr 29, 2026
cdb9064
#5744 Prefill 'report' floater for objects' IMs
akleshchev May 8, 2026
064ee01
#5775 Update copyright date in cmake
akleshchev May 12, 2026
5ffe81b
#5801 add Mute sound menu option
maxim-productengine May 13, 2026
9cd5eb8
#5806 add option to reset environment after teleport
maxim-productengine May 13, 2026
0422a38
#5810 Improve early exit's cleanup
akleshchev May 13, 2026
b85695a
#5799 update message for no search results
maxim-productengine May 14, 2026
35b7766
#5804 Prevent group chat focus steal when opening adhoc IM
marchcat May 13, 2026
9e7d3b1
#5802 Open teleport history with a keystroke
maxim-productengine May 15, 2026
e3fa81c
Fix display of ad-hoc session type in About and display p2p instead a…
cosmic-linden May 14, 2026
ba619ac
#5810 Differentiate startup crashes from runtime crashes
akleshchev May 14, 2026
f3247dc
#5820 Add 'Set UI Size to Default' to help menu on login screen
akleshchev May 15, 2026
4cf0f55
#3430 Fix incorectly stated permissions for scripts.
akleshchev May 15, 2026
d3e12a5
#5804 Prevent focus steal when removing unselected conversation widget
marchcat May 15, 2026
a042022
#5785 fix login and world UI overlap
maxim-productengine May 18, 2026
5f046e1
Merge pull request #5824 from secondlife/cosmic/janus_set_version
cosmic-linden May 18, 2026
447f307
Fix GLTF bind matrix remapping
gaiaclary May 9, 2026
b2878ac
#5786 Fix a case of unitialized override matrix
akleshchev May 18, 2026
d4d9458
Update OpenJPEG to 2.5.4
TommyTheTerrible May 17, 2026
df84417
#5818 Fix setCursor crash
akleshchev May 18, 2026
40cd161
Merge branch 'develop' into geenz/26.3-to-develop
Geenz May 20, 2026
7a40e27
Update llappviewer.cpp
Geenz May 20, 2026
acde43c
Merge pull request #5844 from secondlife/geenz/26.3-to-develop
Geenz May 20, 2026
a1d8077
#4823 WebRTC crashes
akleshchev May 19, 2026
9a8aacf
#5794 add Voice tab and update Sound & Media tab in Preferences
maxim-productengine May 21, 2026
e88380e
#5858 Crash at LLFontFreetype::renderGlyph
akleshchev May 21, 2026
1357773
#5859 Fix a missed null category check
akleshchev May 21, 2026
71fa58c
#5809 Fix wording
akleshchev May 20, 2026
44b8fa4
#5845 Crash in LLFloaterInspect on shutdown
akleshchev May 20, 2026
ec6fd95
#5846 Fix crash on pushBatch
akleshchev May 20, 2026
e636516
#3430 Strip the 'inside an object' from message as it is not object s…
akleshchev May 22, 2026
f99e223
Log failed delivery of crucial vewer-->simulator connection UDP messa…
AndrewMeadows May 27, 2026
a1b68fb
Drop fewer packets on UDP packet flood (#5565)
AndrewMeadows May 27, 2026
0be2780
#5855 Added a way to check triangles for all lods
akleshchev May 28, 2026
e0b3b7f
#3729 Reduce inventory memory overhead
akleshchev May 25, 2026
ec82c45
#3729 Don't store tooltips for inventory
akleshchev May 26, 2026
0a7b6a8
#3729 Avoid storing inventory item names in UI outside of debug
akleshchev May 26, 2026
34540cc
#3729 Don't initialize inbox views if inbox isn't visible
akleshchev May 28, 2026
edf982b
#5719 Detect hybernation #2
akleshchev May 29, 2026
c30ad11
#5798 fix displaying outfit Search results and update default filtering
maxim-productengine Jun 1, 2026
e8e4c5f
#5877 Fix truncated Favorites bar text
akleshchev Jun 2, 2026
3e4502c
#3342 Fix "Cut" and "Copy" options for objects in notecards
akleshchev Jun 2, 2026
0797d76
Make platform specific files visible in the IDE
akleshchev May 29, 2026
1832026
#5856 An option to prevent hibernation
akleshchev May 29, 2026
5543a2a
#5856 Localize OS hibernation preference strings across locales
Copilot Jun 2, 2026
6a61d7e
p575 Unify description field
akleshchev Jun 5, 2026
2e2d978
p575 Fix wrong text field type in locales
akleshchev Jun 6, 2026
a42082f
#5900 Fix material editor lockup when saving from object to inventory
akleshchev Jun 8, 2026
31ba51b
#5905 Fix Win32 white flash on startup
primgineer Jun 10, 2026
88314fd
#5915 A missed null check in give_inventory_cb
akleshchev Jun 10, 2026
02bb6c4
#5917 Fix crash on deleted LLVoiceClient
akleshchev Jun 10, 2026
2052be7
#5874 Fix transparent highlights omitting HUDs
trish-sl Jun 11, 2026
690374c
#5924 Crash on is_water_exclusion_face
akleshchev Jun 12, 2026
dace314
#5856 Improve stats reliability on non-standard shutdown
akleshchev Jun 15, 2026
34c308e
macOS 27 build fixes + transition to UTType for file pickers (#5937)
Geenz Jun 17, 2026
f8c6343
#5934 Fix animeshes being ranked incorrectly
akleshchev Jun 17, 2026
fc2e961
p#587 Taskbar icon does not expand into app when opened
akleshchev Jun 16, 2026
2c591b1
#5928 Gesture auto-complete, similar to emojis/mentions
gwigz Jun 18, 2026
bcabe07
#5837 Fix mature group search showing zero results
akleshchev Jun 19, 2026
9f05efc
#4298 Handle OOM in loadCachedProgramBinary
akleshchev Jun 19, 2026
6d9293f
#5084 Include watchdog's state in crash report
akleshchev Jun 19, 2026
22b694d
#5837 Fix mature group search showing zero results #2
akleshchev Jun 22, 2026
134bdc8
#5945 cacheOptimize crash handling
akleshchev Jun 22, 2026
7d8e9d9
#5946 Fix excessive 'allowed to terraform' warning
akleshchev Jun 23, 2026
9aaf3e7
@5929 Add drag-n-drop reordering for clothing layers (#5918)
gwigz Jun 25, 2026
2947588
Update libwebrtc to m144 and fix audio device lifecycle/processing
roxanneskelly Jun 26, 2026
bf9edc7
Keep capture device running for the whole voice session
roxanneskelly Jun 30, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ jobs:
tar -xJf "${{ needs.build.outputs.viewer_channel }}.sym.tar.xz" -C _artifacts
- name: Post Windows symbols
if: env.BUGSPLAT_DATABASE && env.SYMBOL_UPLOAD_CLIENT_ID
uses: BugSplat-Git/symbol-upload@095d163ae9ceb006d286a731dcd35cf6a1b458c8
uses: BugSplat-Git/symbol-upload@33f604b631df9b4be22a06c52e46acccd2db596b
with:
clientId: "${{ env.SYMBOL_UPLOAD_CLIENT_ID }}"
clientSecret: "${{ env.SYMBOL_UPLOAD_CLIENT_SECRET }}"
Expand Down Expand Up @@ -462,7 +462,7 @@ jobs:
name: macOS-symbols
- name: Post Mac symbols
if: env.BUGSPLAT_DATABASE && env.SYMBOL_UPLOAD_CLIENT_ID
uses: BugSplat-Git/symbol-upload@095d163ae9ceb006d286a731dcd35cf6a1b458c8
uses: BugSplat-Git/symbol-upload@33f604b631df9b4be22a06c52e46acccd2db596b
with:
clientId: "${{ env.SYMBOL_UPLOAD_CLIENT_ID }}"
clientSecret: "${{ env.SYMBOL_UPLOAD_CLIENT_SECRET }}"
Expand All @@ -487,7 +487,7 @@ jobs:
with:
pattern: "*-metadata"

- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
pattern: "*-releases"

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@v8
uses: actions/github-script@v9
with:
script: |
const description = context.payload.pull_request.body || '';
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 @@ -37,7 +37,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: Create Tag
uses: actions/github-script@v8
uses: actions/github-script@v9
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
*~

# Specific paths and/or names
/.autobuild-installables/
/.build-variables/
/.logs/
CMakeCache.txt
cmake_install.cmake
LICENSES
Expand Down
50 changes: 23 additions & 27 deletions autobuild.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2019,11 +2019,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>94a72c6ddbfb23796ce913c55bc47c128542a582</string>
<string>8dc190451c5b7af0d72e7ab54f8fbde6dccf79c6</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-openjpeg/releases/download/v2.5.3-r1/openjpeg-2.5.3.15590356935-darwin64-15590356935.tar.zst</string>
<string>https://github.com/secondlife/3p-openjpeg/releases/download/v2.5.4-r1/openjpeg-2.5.4.18754730947-darwin64-18754730947.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -2033,11 +2033,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>751172af405f4a47a3aebb37729d62229cab6c07</string>
<string>9c89879f81ee0434e1f59c47d74a25958ae08e9e</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-openjpeg/releases/download/v2.5.3-r1/openjpeg-2.5.3.15590356935-linux64-15590356935.tar.zst</string>
<string>https://github.com/secondlife/3p-openjpeg/releases/download/v2.5.4-r1/openjpeg-2.5.4.18754730947-linux64-18754730947.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
Expand All @@ -2047,11 +2047,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>8aab9cf250dfee252386e1c79b5205e6d3b3e19e</string>
<string>b78887212f18ae59dc7961e0e1af781e568bd92c</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-openjpeg/releases/download/v2.5.3-r1/openjpeg-2.5.3.15590356935-windows64-15590356935.tar.zst</string>
<string>https://github.com/secondlife/3p-openjpeg/releases/download/v2.5.4-r1/openjpeg-2.5.4.18754730947-windows64-18754730947.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
Expand Down Expand Up @@ -2401,11 +2401,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>e88a7c97a6843d43e0093388f211299ec2892790</string>
<string>d1584b3a0011dbb741bc64d32e8bd28845ddd4da</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-viewer-fonts/releases/download/v1.1.0-r1/viewer_fonts-1.0.0.10204976553-common-10204976553.tar.zst</string>
<string>https://github.com/secondlife/3p-viewer-fonts/releases/download/v1.1.0-r2/viewer_fonts-1.0.0.25128287087-common-25128287087.tar.zst</string>
</map>
<key>name</key>
<string>common</string>
Expand All @@ -2416,9 +2416,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>license_file</key>
<string>LICENSES/fonts.txt</string>
<key>copyright</key>
<string>Copyright 2016-2022 Brad Erickson CC-BY-4.0/MIT, Copyright 2016-2022 Twitter, Inc. CC-BY-4.0, Copyright 2013 Joe Loughry and Terence Eden MIT</string>
<string>Copyright 2016-2022 Brad Erickson CC-BY-4.0/MIT, Copyright 2016-2022 Twitter, Inc. CC-BY-4.0, Copyright 2013 Joe Loughry and Terence Eden MIT, Copyright (c) 2003 by Bitstream, Inc., Copyright (c) 2006 by Tavmjong Bah.</string>
<key>version</key>
<string>1.0.0.10204976553</string>
<string>1.0.0.25128287087</string>
<key>name</key>
<string>viewer-fonts</string>
<key>description</key>
Expand Down Expand Up @@ -2607,11 +2607,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>72ed1f6d469a8ffaffd69be39b7af186d7c3b1d7</string>
<string>c70247d7683312ee81149dbae603574c0851e04c</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m137.7151.04.22/webrtc-m137.7151.04.22.21966754211-darwin64-21966754211.tar.zst</string>
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m144.7559.06.16/webrtc-m144.7559.06.16.28218655958-darwin64-28218655958.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -2621,11 +2621,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>b4d0c836d99491841c3816ff93bb2655a2817bd3</string>
<string>d187fd666eec8c14dbef959cdc9a6600a13736c7</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m137.7151.04.22/webrtc-m137.7151.04.22.21966754211-linux64-21966754211.tar.zst</string>
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m144.7559.06.16/webrtc-m144.7559.06.16.28218655958-linux64-28218655958.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
Expand All @@ -2635,11 +2635,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>ab2bddd77b1568b22b50ead13c1c33da94f4d59a</string>
<string>47ecfec6deaa775c958fc532d7a43d186ba191f1</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m137.7151.04.22/webrtc-m137.7151.04.22.21966754211-windows64-21966754211.tar.zst</string>
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m144.7559.06.16/webrtc-m144.7559.06.16.28218655958-windows64-28218655958.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
Expand All @@ -2652,7 +2652,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>copyright</key>
<string>Copyright (c) 2011, The WebRTC project authors. All rights reserved.</string>
<key>version</key>
<string>m137.7151.04.22.21966754211</string>
<string>m144.7559.06.16.28218655958</string>
<key>name</key>
<string>webrtc</string>
<key>vcs_branch</key>
Expand Down Expand Up @@ -2896,14 +2896,12 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<map>
<key>archive</key>
<map>
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>91abbc360640b5b2e0a4c001a36ad411a9a42602</string>
<string>df2260187110aa51c20101183e18a55f86e71090</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife-3p/3p-velopack/releases/assets/380583560</string>
<string>https://github.com/secondlife-3p/3p-velopack/releases/download/v0.0.1535-r2/velopack-40232ef.24685318450-windows64-24685318450.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
Expand All @@ -2912,14 +2910,12 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<map>
<key>archive</key>
<map>
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>05563a79bdeb83d66a72ac1e97587dc2a8f64511</string>
<string>ead94386d7b9a143824d7ccedc86433127028a91</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife-3p/3p-velopack/releases/assets/380583554</string>
<string>https://github.com/secondlife-3p/3p-velopack/releases/download/v0.0.1535-r2/velopack-40232ef.24685318450-darwin64-24685318450.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -2932,7 +2928,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>copyright</key>
<string>Velopack Ltd.</string>
<key>version</key>
<string>40232ef.23500976684</string>
<string>40232ef.24685318450</string>
<key>name</key>
<string>velopack</string>
<key>description</key>
Expand Down Expand Up @@ -3390,7 +3386,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>license_file</key>
<string>docs/LICENSE-source.txt</string>
<key>copyright</key>
<string>Copyright (c) 2020, Linden Research, Inc.</string>
<string>Copyright (c) 2026, Linden Research, Inc.</string>
<key>version_file</key>
<string>newview/viewer_version.txt</string>
<key>name</key>
Expand Down
11 changes: 11 additions & 0 deletions indra/cmake/00-Common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,17 @@ include(Variables)

# We go to some trouble to set LL_BUILD to the set of relevant compiler flags.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} $ENV{LL_BUILD}")

if (DARWIN)
# LL_BUILD carries a literal -mmacosx-version-min=<ver> from
# viewer-build-variables. We derive the macOS deployment target in
# Variables.cmake (clamping up to the SDK's supported minimum when needed)
# and let CMAKE_OSX_DEPLOYMENT_TARGET emit the flag to both compiler and
# linker. Strip the verbatim flag here so it can't conflict with the
# clamped deployment target.
string(REGEX REPLACE "-mmacosx-version-min=[0-9.]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
endif (DARWIN)

# Given that, all the flags you see added below are flags NOT present in
# https://bitbucket.org/lindenlab/viewer-build-variables/src/tip/variables.
# Before adding new ones here, it's important to ask: can this flag really be
Expand Down
2 changes: 2 additions & 0 deletions indra/cmake/Linking.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ else()
find_library(COREAUDIO_LIBRARY CoreAudio)
find_library(COREGRAPHICS_LIBRARY CoreGraphics)
find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
find_library(UNIFORMTYPEIDENTIFIERS_LIBRARY UniformTypeIdentifiers)

target_link_libraries( ll::oslibraries INTERFACE
${COCOA_LIBRARY}
Expand All @@ -87,6 +88,7 @@ else()
${COREAUDIO_LIBRARY}
${AUDIOTOOLBOX_LIBRARY}
${COREGRAPHICS_LIBRARY}
${UNIFORMTYPEIDENTIFIERS_LIBRARY}
)
endif()

Expand Down
33 changes: 32 additions & 1 deletion indra/cmake/Variables.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,38 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(DARWIN 1)

string(REGEX MATCH "-mmacosx-version-min=([^ ]+)" scratch "$ENV{LL_BUILD}")
set(CMAKE_OSX_DEPLOYMENT_TARGET "${CMAKE_MATCH_1}" CACHE STRING "macOS Deploy Target" FORCE)
set(LL_REQUESTED_DEPLOYMENT_TARGET "${CMAKE_MATCH_1}")

# Determine the lowest deployment target the active macOS SDK still supports.
# We aim for 11.0 in our public builds, but newer Xcode/SDK releases
# periodically raise this floor (e.g. Xcode 26 -> 13.3, Xcode 27 -> 14), and
# linking against a deployment target below the SDK's minimum fails. Read the
# supported minimum from the SDK and clamp our requested target up to it when
# necessary, so the build tracks whatever the SDK allows automatically.
set(LL_SDK_MINIMUM_DEPLOYMENT_TARGET "")
execute_process(
COMMAND xcrun --sdk macosx --show-sdk-path
OUTPUT_VARIABLE LL_MACOS_SDK_PATH
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
if (LL_MACOS_SDK_PATH AND EXISTS "${LL_MACOS_SDK_PATH}/SDKSettings.plist")
execute_process(
COMMAND /usr/libexec/PlistBuddy -c
"Print :SupportedTargets:macosx:MinimumDeploymentTarget"
"${LL_MACOS_SDK_PATH}/SDKSettings.plist"
OUTPUT_VARIABLE LL_SDK_MINIMUM_DEPLOYMENT_TARGET
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
endif ()

set(LL_EFFECTIVE_DEPLOYMENT_TARGET "${LL_REQUESTED_DEPLOYMENT_TARGET}")
if (LL_SDK_MINIMUM_DEPLOYMENT_TARGET AND
LL_REQUESTED_DEPLOYMENT_TARGET VERSION_LESS LL_SDK_MINIMUM_DEPLOYMENT_TARGET)
message(STATUS "Requested macOS deploy target ${LL_REQUESTED_DEPLOYMENT_TARGET} is below the SDK minimum ${LL_SDK_MINIMUM_DEPLOYMENT_TARGET}; clamping to ${LL_SDK_MINIMUM_DEPLOYMENT_TARGET}")
set(LL_EFFECTIVE_DEPLOYMENT_TARGET "${LL_SDK_MINIMUM_DEPLOYMENT_TARGET}")
endif ()

set(CMAKE_OSX_DEPLOYMENT_TARGET "${LL_EFFECTIVE_DEPLOYMENT_TARGET}" CACHE STRING "macOS Deploy Target" FORCE)
message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET = '${CMAKE_OSX_DEPLOYMENT_TARGET}'")

# Use dwarf symbols for most libraries for compilation speed
Expand Down
9 changes: 5 additions & 4 deletions indra/llappearance/llavatarappearance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1647,10 +1647,10 @@ glm::mat4 LLAvatarBoneInfo::getJointMatrix()
glm::mat4 mat(1.0f);
// 1. Scaling
mat = glm::scale(mat, glm::vec3(mScale[0], mScale[1], mScale[2]));
// 2. Rotation (Euler angles rad)
mat = glm::rotate(mat, mRot[0], glm::vec3(1, 0, 0));
mat = glm::rotate(mat, mRot[1], glm::vec3(0, 1, 0));
mat = glm::rotate(mat, mRot[2], glm::vec3(0, 0, 1));
// 2. Rotation (avatar_skeleton.xml stores Euler angles in degrees)
mat = glm::rotate(mat, glm::radians(mRot[0]), glm::vec3(1, 0, 0));
mat = glm::rotate(mat, glm::radians(mRot[1]), glm::vec3(0, 1, 0));
mat = glm::rotate(mat, glm::radians(mRot[2]), glm::vec3(0, 0, 1));
// 3. Position
mat = glm::translate(mat, glm::vec3(mPos[0], mPos[1], mPos[2]));
return mat;
Expand Down Expand Up @@ -1698,6 +1698,7 @@ void LLAvatarSkeletonInfo::getJointMatricesAndHierarhy(
data.mRestMatrix = parent_mat * data.mJointMatrix;
data.mIsJoint = bone_info->mIsJoint;
data.mGroup = bone_info->mGroup;
data.setSupport(bone_info->mSupport);
for (LLAvatarBoneInfo* child_info : bone_info->mChildren)
{
LLJointData& child_data = data.mChildren.emplace_back();
Expand Down
1 change: 1 addition & 0 deletions indra/llcommon/llerror.h
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@ namespace LLError
ERROR_OTHER = 0,
ERROR_BAD_ALLOC = 1,
ERROR_MISSING_FILES = 2,
ERROR_INIT_FAILED = 3,
} eLastExecEvent;

// tittle, message and error code to include in error marker file
Expand Down
Loading
Loading