Skip to content

Inventory favorites #1840

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 35 commits into from
Jun 27, 2024
Merged

Inventory favorites #1840

merged 35 commits into from
Jun 27, 2024

Conversation

akleshchev
Copy link
Contributor

No description provided.

To not acuse confusion with favorites
notecards do not need to store 'favorite' flag
getChangedIDs is only accurate in scope of observer's callback, don't
use it onIdle.
getObject call made no sense, item was warrantied to be
LLViewerInventoryItem and would only be AT_CATEGORY if it is a link,
making the following cast to a category dangerous
For now marking originals, pointless to marks links in COF, needs a
revision due to inconsistency with inventory
Search forces a refresh - can search items that don't exist yet
Always notify parent of rect changes despite visibility (alterantively -
rearrange on open)
@akleshchev akleshchev marked this pull request as ready for review June 25, 2024 16:52
Copy link
Contributor

@marchcat marchcat left a comment

Choose a reason for hiding this comment

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

Wow, this one is big.

I'd suggest building this change as a project viewer first in order to test it separately, And then, probably, just skip Maint C and merge it right into develop.

@akleshchev
Copy link
Contributor Author

It's already partially tested since QA had to use it to check server changes, and even if there are issues, impact should be minimal.
It looks big because it affects a lot of different panels, but changes are individually trivial and most do the same thing.

@@ -2042,7 +2042,7 @@ bool LLAppearanceMgr::getCanReplaceCOF(const LLUUID& outfit_cat_id)
}

// Moved from LLWearableList::ContextMenu for wider utility.
bool LLAppearanceMgr::canAddWearables(const uuid_vec_t& item_ids) const
bool LLAppearanceMgr::canAddWearables(const uuid_vec_t& item_ids, bool warn_on_type_mismarch) const
Copy link
Contributor

Choose a reason for hiding this comment

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

"mismarch" typo

void LLFloaterInventorySettings::updateColorSwatch()
{
bool val = getChild<LLUICtrl>("favorites_color")->getEnabled();
getChild<LLUICtrl>("favorites_color")->setEnabled(val);
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure what happens here.

Copy link
Contributor Author

@akleshchev akleshchev Jun 26, 2024

Choose a reason for hiding this comment

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

It should have been getvalue() then getChild("favorites_swatch")->setEnabled(val);


if (obj && obj->getIsLinkType())
{
obj = gInventory.getObject(obj_id);
Copy link
Contributor

@maxim-productengine maxim-productengine Jun 25, 2024

Choose a reason for hiding this comment

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

Should we use 'obj->getLinkedUUID()' here as id?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed.

LLInventoryObject* obj = gInventory.getObject(obj_id);
if (obj && obj->getIsLinkType())
{
obj = gInventory.getObject(obj_id);
Copy link
Contributor

Choose a reason for hiding this comment

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

Same question as above ('obj->getLinkedUUID()')

//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLFavoritesCollector
//
// Simple class that collects calling cards that are not null, and not
Copy link
Contributor

Choose a reason for hiding this comment

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

No more calling cards collectors.

@maxim-productengine maxim-productengine self-requested a review June 25, 2024 22:42
Copy link
Contributor

@maxim-productengine maxim-productengine left a comment

Choose a reason for hiding this comment

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

Mostly looks good, but probably couple minor changes are required.

@akleshchev
Copy link
Contributor Author

Thank you! Will fix those.

Copy link
Contributor

@maxim-productengine maxim-productengine left a comment

Choose a reason for hiding this comment

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

Ship it!

@akleshchev akleshchev merged commit ac0f566 into release/maint-c Jun 27, 2024
12 checks passed
@akleshchev akleshchev deleted the inventory_favorites branch June 27, 2024 15:57
@github-actions github-actions bot locked and limited conversation to collaborators Jun 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
3 participants