Skip to content
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.

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

Maintenance C #1166

Merged
160 commits merged into from
Dec 9, 2024
Merged

Maintenance C #1166

160 commits merged into from
Dec 9, 2024

Conversation

marchcat
Copy link
Contributor

@marchcat marchcat commented Apr 9, 2024

build = https://github.com/secondlife/viewer/releases/tag/Second_Life_Release%23c137e6a-c
cohort = Maintenance-C
desired = 2000
as of = 2024-06-14 for RC deploy
deployed = https://github.com/secondlife/viewer/releases/tag/Second_Life_Release%23c137e6a-c
relnotes:

Maint C: Cthulodon

Cthulodon, a completely made up fictional beast that has the tentacles characteristic of Cthulu as well as dinosaurian traits which together create something truly terrifying. Fortunately, such a creature would likely only be found in the world of Second Life and could possibly be the result of an avatar requiring their skeleton to be reset.

Previously, the magic to reset your avatar only worked locally but with this release, resetting your avatars skeleton will now reset it for others too!

Find more about other included fixes listed below.

instead of having a 10 second delay to 'confirm' activity
@marchcat marchcat added this to the Maintenance C milestone Apr 9, 2024
@marchcat marchcat self-assigned this Apr 9, 2024
@github-actions github-actions bot added the c/cpp label Apr 9, 2024
Default value should be selected for replacement
@github-actions github-actions bot added the llui label Apr 9, 2024
marchcat and others added 9 commits April 10, 2024 03:50
# Conflicts:
#	indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
Release (Maint W) -> Maint C merge
1. onClear should clear file even if in 'don't log' state.
2. When chat isn't logging, check presence of old log by checking file.
This file is no longer used.
Drop python version from matrix configuration as it's always 3.11.
Move towards packaging artifacts with xz, which offers higher compression ratios and faster decode time.
@github-actions github-actions bot added the cmake label Apr 16, 2024
@larsnaesbye
Copy link
Contributor

What prohibits this from getting merged?

@marchcat
Copy link
Contributor Author

marchcat commented Nov 3, 2024

The testing is almost finished; after that, this PR will be merged.

# Conflicts:
#	indra/newview/llvoavatar.cpp
@marchcat
Copy link
Contributor Author

This one should be good to merge into develop after merging #3067.

@marchcat marchcat closed this pull request by merging all changes into develop in 35c9d09 Dec 9, 2024
@marchcat marchcat deleted the release/maint-c branch December 9, 2024 20:49
@github-actions github-actions bot locked and limited conversation to collaborators Dec 9, 2024
@marchcat
Copy link
Contributor Author

marchcat commented Dec 9, 2024

This one was accidentally merged along with #3239 (and reverted with #3241). The new PR should be used for further integration.

@marchcat
Copy link
Contributor Author

New PR: #3243.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.