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

Release (Maint YZ) -> Maint B merge #1314

Merged
merged 123 commits into from
Apr 24, 2024
Merged

Release (Maint YZ) -> Maint B merge #1314

merged 123 commits into from
Apr 24, 2024

Conversation

marchcat
Copy link
Contributor

No description provided.

callumlinden and others added 30 commits August 1, 2023 15:51
…nventory item thumbnails - both from a code and a UI perspective
…l ID (broken - all null UUID - for tomorrow)
…ms, copy a list of texture of list of folders of textures, then combine them and find matches by name - saving each match with the name, item ID and thumbnail texture ID - next is actually writing the thumbnails
… the ID i saved for the texture from the object ID to the asset ID and then it worked for 3 test items. Next up, tidy up the code, remove hacks and do a run on a local copy of the main SENRA inventory
…ries for both items and textures. Better logging output
…w version with a proper name and start worknig on it. Prototype bulky thumbs one will be removed after new version is working
…sion of the Inventory Thumbnail Helper tool - see source file for a link to Confluence page listing how to use it
…ceded by the Inventory Thumbnail Helper tool
…mbnails (as well as for clearing thumbnails) since it's also a destructive, non-undoiable operation
…ication entry - mysteriously, the Viewer still worked as expected but the TeamCity coding check policy (WTF??) got a bit sad about it..
…its own parent the viewer logs a warning and then continues the loop without incrementing the iterator. This increments the iterator so that loop processing can continue and the viewer does not get stuck on the bad object.
# Conflicts:
#	indra/newview/skins/default/xui/en/menu_viewer.xml
Copy link
Contributor

@akleshchev akleshchev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No description provided.

Please, when you merge, keep list of files with conflicts int the description, it would make it possible to actualy review the merge.

@marchcat marchcat merged commit 3c833ce into release/maint-b Apr 24, 2024
11 checks passed
@marchcat marchcat deleted the marchcat/b-merge branch April 24, 2024 16:48
@github-actions github-actions bot locked and limited conversation to collaborators Apr 24, 2024
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.