-
Notifications
You must be signed in to change notification settings - Fork 64
Release (Maint YZ) -> Maint C merge #1315
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
Merged
Merged
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
…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
SL-20109 -> Maint Y merge
akleshchev
approved these changes
Apr 24, 2024
There was a problem hiding this 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.
There were no conflicts. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
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.