Marchcat/2505 merge #4183
Merged
Marchcat/2505 merge #4183
Conversation
This file contains hidden or 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
Looks like it was added by a mistake and does not match real value
This partially reverts commit 8d5dab9. Apparently viewer doesn't support some jp2 variants, so I'm leaving only the fix for bulk upload.
# Conflicts: # indra/newview/llmodelpreview.cpp
…into release/2025.04
#3857 pick new and updated LEAP functions from develop branch
according to bugsplat mWrapperPanel is null.
A long standing one
assertInitializedDoError() on shutdown
mac's crash logs seem to get mixed with normal logs, hope is this will help confirming the issue. Also needed for automated testing.
when parent copied and pasted
#p430 don't show MFA dialog twice
Viewer 1865 for 2025.04
…sh-fix Fix null outfit gallery observer pointer
Release/2025.04
# Conflicts: # .github/workflows/qatest.yaml # indra/llcommon/llsdutil.h # indra/llui/llflatlistview.h # indra/newview/llinventorybridge.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h
github-actions
bot
added
c/cpp
cmake
python
llwindow
llcommon
llinventory
llmessage
llrender
llui
labels
akleshchev
approved these changes
May 28, 2025
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.