diff options
| author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-04-30 17:59:53 +0300 |
|---|---|---|
| committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-04-30 17:59:53 +0300 |
| commit | 67c95d6d9238615232fd581aaedf53adfe166e5c (patch) | |
| tree | 4332afc70cd8a46ce2c390ccc0a7d583d9ea6165 /indra/llinventory | |
| parent | 2479959dd9be78a74c10484c65094bd56d1c3d9e (diff) | |
| parent | 23bd34a78163c31bc2a661acd15db63ed248af53 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llinventorytype.cpp | 4 |
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; |