summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2023-01-24 20:15:43 +0000
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2023-01-24 20:15:43 +0000
commit3375e1a7b518eb40eb1814ced745266ce3a54ce7 (patch)
treef2b1281ec664e72615d11c6bd35a944d8897fa50 /indra/newview/llinventorymodel.cpp
parentce5ac93883b71b6abf8cffa35204541e257c6b02 (diff)
parent111fc04e5df60e1d509b9ec80a1340bab4383cce (diff)
Merge branch 'DRTVWR-567' of ssh://github.com/secondlife/viewer into DRTVWR-567
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 b64dd431db..8b2a1a14f0 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1870,9 +1870,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)
{