[DO NOT MERGE] WIP Maint C #3895
Closed
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
instead of having a 10 second delay to 'confirm' activity
Default value should be selected for replacement
# 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.
Marchcat/c merge
On viewer shutdown 1. Instead of handling potential WM_* messages viewer is no longer equiped to handle drop window's pointer and expect only WM_DESTROY 2. Detach thread and let it do its own thing, thread will delete itself 3. Reverts commit 1161262 Reason for the change: window was closing too early (as son as "LLApp" status changes) without proper cleanup
1. Switched 'inspect' to thumbnails to minimalize differences 2. Reporting larger area to bump priority 3. Change scaling behavior. Old mechanics worked fine for icons that were scaled down from large images to ~32, but for thumbnails it can result in 256 image scaling down to ~200 before being scaled up to UI's scale (scale factor), causing extra loss of quality.
Standard and scaled textures couldn't share workers and if one finished a request, second one failed to start a new one.
Release (Maint YZ) -> Maint C merge
To not acuse confusion with favorites
* Restore changes from 2194777 to llwindow/llwindowwin32.cpp * Restore changes from 3758618 to newview/llinspecttexture.cpp * Fix apparent merge error in LLInventoryPanel::itemChanged * Restore changes from 1eeecfa in newview/llpaneloutfitsinventory.h * Restore changes from b9633c1 in newview/llpaneloutfitsinventory.h & newview/llpanelwearing.cpp * Restore changes from f660f1f in newview/llviewertexture.cpp * Restore changes from b9633c1 & 98f7d73 in newview/lloutfitgallery.cpp and newview/lloutfitslist.cpp * Replace changes from 2372944 with current implementation in develop branch * Fix more broken changes in LLViewerTexture::saveRawImage * Restore the changes in LLMath both from develop and maint-c * Fix all kind of other merge errors # Conflicts: # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llui/llfolderviewitem.cpp # indra/llwindow/llwindowwin32.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llvoavatar.cpp
# Conflicts: # indra/newview/llagent.cpp
# Conflicts: # indra/llui/llfolderviewitem.cpp
# Conflicts: # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
…y panel in List view; update persistence of new settings
Key improvements: 1. Better error handling for thread detachment 2. More careful sequencing of operations 3. Ensuring the window is hidden before proceeding with other shutdown steps 4. Proper checking of thread joinability before detaching
|
The crashes should be addressed now. Test build: https://github.com/secondlife/viewer/releases/tag/Second_Life_Test%231f17536-maint-c |
# Conflicts: # indra/llcommon/lldate.h # indra/newview/llappviewer.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llmaterialeditor.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llvoavatar.cpp
Draft
|
Created |
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.
Warning
Work in progress, do not merge!
Currently based on
main.Will be retargeted to
2025.04or2025.05once ready.