Skip to content

Merge 2025.04 into develop #4176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 112 commits into from
May 31, 2025
Merged

Merge 2025.04 into develop #4176

merged 112 commits into from
May 31, 2025

Conversation

Geenz
Copy link
Collaborator

@Geenz Geenz commented May 28, 2025

No description provided.

akleshchev and others added 30 commits March 19, 2025 00:03
@akleshchev
Merge branch 'release/2025.03' into release/2025.04
969ed53
@akleshchev
#3661 Clamp water blur multiplier
53c3176
@akleshchev
#3771 Fix unresolved HOSTIP parameter
ed6f939
@akleshchev
#3762 Remove incorrect resolution specification
28638b3 
Looks like it was added by a mistake and does not match real value
@akleshchev
viewer#2270 The "More" button does not close the "Choose emoji" floater
5608c39
@akleshchev
viewer#2894 Make PBR scale like Blinn Phong does
bf0767b
@akleshchev
vp#404 Improve URL filter
ecfe76a
@akleshchev
#3784 Increase texture scale boundaries
b1822e3
@akleshchev
#3809 Fix J2C Upload
8d5dab9
@akleshchev
#3809 Partial revert of "Fix J2C Upload"
fcc8ffd 
This partially reverts commit 8d5dab9.

Apparently viewer doesn't support some jp2 variants, so I'm leaving only
the fix for bulk upload.
@maxim-productengine
#3044 Add option to hide L$ balance for Snapshots with Interface showing
515c1f1
@LLGuru @marchcat
#912 BugSplat Crash 1412267 (missed refactoring for FindModel)
c609a45 
# Conflicts:
#	indra/newview/llmodelpreview.cpp
@marchcat
#912 Refactor FindModel()
497c309
@marchcat
Add file pattern and recursive directory processing fix_xml_indentati…
945b965 
…ons.py
@Geenz
Merge branch 'release/2025.03' into release/2025.04
ccdcbfe
@Geenz
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer …
3c9bb9b 
…into release/2025.04
@akleshchev
#3846 Crash at updateGLTFMaterials
3a03c5f
@akleshchev
#3712 CMakeFindFrameworks deprecation
8c20662
@akleshchev
#3849 Crash at LLSelectMgr::updatePointAt
939817d
@marchcat
#3597 Improve error handling at LLGLSLShader::disableTexture()
d77954e
@maxim-productengine
#3857 pick new and updated LEAP functions from develop branch
db2c45b
@akleshchev
# 3826 Physics Material Type does not update for linked objects
498b244
@maxim-productengine
#3857 second batch of new or updated LEAP functions
46fca6f
@maxim-productengine
#3857 teleport finished/failed event
dead3c1
@maxim-productengine
Merge pull request #3866 from secondlife/maxim/2025.04-3857
6ebd8a9 
#3857 pick new and updated LEAP functions from develop branch
@akleshchev
#3868 Crash in updateHoveredState
f2e7e30 
according to bugsplat mWrapperPanel is null.
@akleshchev
#3870 Crash at LLVOAvatarSelf::getJoint()
f795ad6 
A long standing one
@akleshchev
#2702 Increase hover height's limit
68f20d5
@akleshchev
#3878 Crash at LLPipeline::unlinkDrawable
2b475ad 
assertInitializedDoError() on shutdown
@akleshchev
#3876 sendLogoutRequest logging
9aea5bb 
mac's crash logs seem to get mixed with normal logs, hope is this will
help confirming the issue. Also needed for automated testing.
akleshchev and others added 17 commits May 14, 2025 00:02
@akleshchev
#4072 Fix Appearance floater not updating
888d4ae
@akleshchev
#4081 Meshes missing after teleport
0555755
@akleshchev
#4088 Fix Outfit folders changing to normal folders
b5db42e 
when parent copied and pasted
@maxim-productengine
#4091 fix speaker icon is showing all users speaking when anyone is t…
d5313e7 
…alking
@sethalves
adjust which webrtc tracks are enabled when the avatar crosses a regi…
b2b021f 
…on border
@sethalves
reuse region variable instead of multiple calls to gAgent.getRegion()
28edf9e
@marchcat
Update macos icons (#4042, #4112)
5ee83e7 
according to https://developer.apple.com/design/human-interface-guidelines/app-icons
@maxim-productengine
#p430 don't show MFA dialog twice
0296bd6
@maxim-productengine
fix test for lllogininstance.cpp
3fa7674
@maxim-productengine
Merge pull request #4126 from secondlife/maxim/2025.04-p430
a31b7ae 
#p430 don't show MFA dialog twice
@Geenz
Fix null outfit gallery observer pointer
25e6834
@sethalvesLL
Merge pull request #4100 from secondlife/viewer-1865-for-2025.04
5047a0b 
Viewer 1865 for 2025.04
@Geenz
Remove mOutfitsObserver, use mCategoriesObserver from our base.
b62e7f9
@maxim-productengine
#4132 fix name mentions sometimes not being highlighted
5b12428
@Geenz
Merge pull request #4135 from secondlife/geenz/mac-outfit-gallery-cra…
fe55c78 
…sh-fix

Fix null outfit gallery observer pointer
@Geenz
Merge pull request #3861 from secondlife/release/2025.04
de8275b 
Release/2025.04
@Geenz
Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-develop
fe4f85e
@Geenz Geenz merged commit c88f5d2 into develop May 31, 2025
13 checks passed
@Geenz Geenz deleted the geenz/2025.04-to-develop branch May 31, 2025 13:33
@github-actions github-actions bot locked and limited conversation to collaborators May 31, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

c/cpp cmake llcommon llinventory llmessage llrender llui llwindow python

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@Geenz @vldevel @Ansariel @akleshchev @maxim-productengine @LLGuru @marchcat @brad-linden @sethalves @sethalvesLL