Skip to content

#4518 Dupplicates can appear in favorites #4573

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.

Sign up for GitHub

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 1 commit into from
Aug 18, 2025
Merged

#4518 Dupplicates can appear in favorites #4573

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions indra/newview/llinventorypanel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2298,6 +2298,7 @@ class LLInventoryFavoritesItemsPanel : public LLInventoryPanel

void removeItemID(const LLUUID& id) override;
bool isInRootContent(const LLUUID& id, LLFolderViewItem* view_item) override;
bool hasPredecessorsInRootContent(const LLInventoryObject* model_item) const;

protected:
LLInventoryFavoritesItemsPanel(const Params&);
Expand Down Expand Up @@ -2344,6 +2345,24 @@ bool LLInventoryFavoritesItemsPanel::isInRootContent(const LLUUID& id, LLFolderV
return found != mRootContentIDs.end();
}

bool LLInventoryFavoritesItemsPanel::hasPredecessorsInRootContent(const LLInventoryObject* obj) const
{
LLUUID parent_id = obj->getParentUUID();
while (parent_id.notNull())
{
if (mRootContentIDs.contains(parent_id))
{
return true;
}
LLViewerInventoryCategory* cat = mInventory->getCategory(parent_id);
if (cat)
{
parent_id = cat->getParentUUID();
}
}
return false;
}

void LLInventoryFavoritesItemsPanel::findAndInitRootContent(const LLUUID& id)
{
F64 curent_time = LLTimer::getTotalSeconds();
Expand Down Expand Up @@ -2495,7 +2514,8 @@ void LLInventoryFavoritesItemsPanel::itemChanged(const LLUUID& id, U32 mask, con
}

LLFolderViewItem* folder_view_item = getItemByID(cat->getUUID());
if (!folder_view_item)
if (!folder_view_item
&& !hasPredecessorsInRootContent(model_item))
{
const LLUUID& parent_id = cat->getParentUUID();
mRootContentIDs.emplace(cat->getUUID());
Expand All @@ -2507,7 +2527,9 @@ void LLInventoryFavoritesItemsPanel::itemChanged(const LLUUID& id, U32 mask, con
else
{
// New favorite item
if (model_item->getIsFavorite() && typedViewsFilter(id, model_item))
if (model_item->getIsFavorite()
&& typedViewsFilter(id, model_item)
&& !hasPredecessorsInRootContent(model_item))
{
const LLUUID& parent_id = model_item->getParentUUID();
mRootContentIDs.emplace(id);
Expand Down
Loading