summaryrefslogtreecommitdiff
path: root/indra/llinventory
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-04-27 18:39:09 -0400
committerLoren Shih <seraph@lindenlab.com>2010-04-27 18:39:09 -0400
commit26d324a2dd06ebde896f7856622a55414eb75d77 (patch)
treed2deb0190f02f7a824f71a910fd1c6a083ce4fb7 /indra/llinventory
parentaa7b3312c201ccea29a0e07a38021bec764bfc64 (diff)
DEV-49349 : AIS hides broken inventory links after a relog
inventory_and_asset_types_match is always true for links (i.e. links should not have to be a certain inventory type).
Diffstat (limited to 'indra/llinventory')
-rw-r--r--indra/llinventory/llinventorytype.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llinventory/llinventorytype.cpp b/indra/llinventory/llinventorytype.cpp
index 4ef5df0b28..c050f20a9d 100644
--- a/indra/llinventory/llinventorytype.cpp
+++ b/indra/llinventory/llinventorytype.cpp
@@ -181,6 +181,10 @@ bool LLInventoryType::cannotRestrictPermissions(LLInventoryType::EType type)
bool inventory_and_asset_types_match(LLInventoryType::EType inventory_type,
LLAssetType::EType asset_type)
{
+ // Links can be of any inventory type.
+ if (LLAssetType::lookupIsLinkType(asset_type))
+ return true;
+
const InventoryEntry *entry = LLInventoryDictionary::getInstance()->lookup(inventory_type);
if (!entry) return false;