Release (Maint W) -> Maint B merge #1178
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
before trying to create symlink.
Pull in fix to strip_deprecated_header() call.
for strip_deprecated_header(header_size) and Python llsd module fixes.
to pick up new merge from main.
for GCC-friendly tweak to llssize
There is still a chance user will try to move multiple landmarks one after another, but if it didn't update in the time user moves landmarks it's going to end up out of order either way
… and Privileged
Same thing as commit cf692c4 which was removed due to shutdown freezes. Error thread is no longer there so doesn't cause any race sonditions, was not able to repro any issues so will ask QA to test shutdown
instead of the branch that got pulled.
…e correct erms..." This reverts commit 60debe8.
Closing window correctly caused a significant amount of logout freezes with no known reproes. Temporarily returning to old behavior were thread was killes without closing window and will reenable in later maints to hopefully get a scenario or at least more data of what is causing the freeze.
This reverts commit cc43f42.
# Conflicts: # .github/workflows/build.yaml
following promotion of secondlife/viewer #690
# Conflicts: # indra/llrender/llgl.cpp # indra/newview/lloutfitslist.cpp
github-actions
bot
added
c/cpp
llwindow
llcommon
llcorehttp
llimage
llmath
llmessage
llprimitive
llrender
llui
labels
akleshchev
approved these changes
Apr 10, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.