summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2022-12-12 17:59:34 -0800
committerBrad Linden <brad@lindenlab.com>2022-12-12 17:59:34 -0800
commiteb526fec0aadcaf30363fdfb1e253a609bf83acc (patch)
tree6071628f41ca793007b645aa30d255044ddbfe43 /indra/newview/llinventorymodel.cpp
parentc9c611fd12f55ac6d6717ba17139ba61a6db581f (diff)
parenta0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff)
Merge remote-tracking branch 'origin/main' into DRTVWR-559
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rw-r--r--indra/newview/llinventorymodel.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index b5853ad9a3..e5c9ec927a 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1854,9 +1854,13 @@ void LLInventoryModel::addChangedMask(U32 mask, const LLUUID& referent)
mChangedItemIDs.insert(referent);
}
- // Fix me: From DD-81, probably shouldn't be here, instead
- // should be somewhere in an observer
- update_marketplace_category(referent, false);
+ if (mask != LLInventoryObserver::LABEL)
+ {
+ // Fix me: From DD-81, probably shouldn't be here, instead
+ // should be somewhere in an observer or in
+ // LLMarketplaceInventoryObserver::onIdleProcessQueue
+ update_marketplace_category(referent, false);
+ }
if (mask & LLInventoryObserver::ADD)
{